From 730a1f6e95568995c68c4bdd560c89d5ab7d5637 Mon Sep 17 00:00:00 2001
From: "B. Stack" <bgstack15@gmail.com>
Date: Sun, 22 May 2022 14:31:22 -0400
Subject: nm: remove nm-gcc-11 patch in spec

---
 newmoon/debian/patches/revert-mach-file.patch | 71 ---------------------------
 newmoon/newmoon.spec                          |  8 ---
 2 files changed, 79 deletions(-)
 delete mode 100644 newmoon/debian/patches/revert-mach-file.patch

(limited to 'newmoon')

diff --git a/newmoon/debian/patches/revert-mach-file.patch b/newmoon/debian/patches/revert-mach-file.patch
deleted file mode 100644
index cda3786..0000000
--- a/newmoon/debian/patches/revert-mach-file.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: revert mach file to 29.4.2's to fix FTBFS
-Last-Update: 2021-11-12
-
---- palemoon-29.4.2.1.orig/mach
-+++ palemoon-29.4.2.1/mach
-@@ -1,63 +1,4 @@
- #!/bin/sh
- 
--MCP_MACH=./platform/mach
--MCP_GIT=`which git 2>/dev/null`
--
--if [ ! -f "$MCP_MACH" ]; then
--  printf "Error: There is no platform codebase.\n"
--  exit 1
--fi
--
--MCP_APP=palemoon
--MCP_VERSION=`cat ./$MCP_APP/config/version.txt`
--
--MCP_XZ=`which xz 2>/dev/null`
--MCP_TAR_BASEDIR="s/^./$MCP_APP-source/"
--MCP_TAR_FILENAME="$MCP_APP-$MCP_VERSION.source.tar.xz"
--MCP_TAR_COMMAND="tar cfJv ../$MCP_TAR_FILENAME . --transform $MCP_TAR_BASEDIR --exclude-vcs --warning=no-file-changed"
--MCP_TAR_EXCLUDES=(
--  "$MCP_APP/branding/beta"
--  "$MCP_APP/branding/unstable"
--  "platform/db/mork"
--  "platform/docs"
--  "platform/ldap"
--  "platform/libs/gmp-clearkey"
--  "platform/mailnews"
--  "platform/python/psutil/*.so"
--  "platform/python/psutil/*.pyd"
--  "platform/python/psutil/build"
--  "platform/xulrunner"
--  ".mozconfig"
--  ".gitattributes"
--  ".gitignore"
--  ".gitmodules"
--  "*.pyc"
--  "*.pyo"
--  "*.rej"
--  "*.orig"
--  "*.source.tar.xz"
--)
--
--if [ "$1" == "source" ]; then
--  if [ -z "$MCP_XZ" ]; then
--    printf "Error: XZ was not found on the system. NOTE: This won't work on Windows.\n"
--    exit 1
--  fi
--
--  for _value in "${MCP_TAR_EXCLUDES[@]}"; do
--    MCP_TAR_COMMAND+=" --exclude=${_value}"
--  done
--
--  if [[ -n "$MCP_GIT" && -d "./.git" && -d "./platform/.git" ]]; then
--    printf "COMM SHA1: `"${MCP_GIT}" rev-parse --short HEAD 2>/dev/null`\n"
--    printf "GRE SHA1: `cd ./platform && "${MCP_GIT}" rev-parse --short HEAD 2>/dev/null`\n"
--  fi
--
--  printf "Source Filename: $MCP_TAR_FILENAME\n\n"
--  read -r -s -p $'Press enter to continue...\n'
--  env XZ_OPTS=-9e ${MCP_TAR_COMMAND}
--else
--  # We don't know what the command is but real-mach might so just pass
--  # all the args to it
--  $MCP_MACH $@
--fi
-+MACH_CMD=./platform/mach
-+$MACH_CMD $@
diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec
index d356f29..f2e6d48 100644
--- a/newmoon/newmoon.spec
+++ b/newmoon/newmoon.spec
@@ -59,7 +59,6 @@ Source4: newmoon-mimeinfo.xml
 %if 0%{stackrpms_custom}
 Source5: bgstack15-newmoon-prefs.js
 Source6: bluemoon-icons.tgz
-Source7: nm-gcc-11.patch
 Patch0: small-icons.patch
 Patch1: pm-fedora.patch
 Patch2: pm-to-nm.patch
@@ -124,13 +123,6 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-__gccver="$( gcc --version 2>&1 | grep -oE '[0-9]*\.[0-9]\.[0-9]'| head -n1 | grep -oE '^[0-9]+' )"
-if test "${__gccver}" == "11" ; then
-   # For gcc 11
-   cd platform
-   patch -p1 < %{SOURCE7}
-   cd ..
-fi
 
 ! test -d %{badname}/branding/unofficial.unbuilt && {
    cp -pr %{badname}/branding/unofficial %{badname}/branding/unofficial.unbuilt && \
-- 
cgit