summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-05-22 13:10:12 -0400
committerB. Stack <bgstack15@gmail.com>2022-05-22 13:10:12 -0400
commit477bb1042ff42b7a8479fb00e65bd3f615ffc81c (patch)
tree8557e34f27f4782b61f20db11955ca1607bbd28d
parentMerge remote-tracking branch 'refs/remotes/origin/newmoon-bump' into newmoon-... (diff)
downloadstackrpms-477bb1042ff42b7a8479fb00e65bd3f615ffc81c.tar.gz
stackrpms-477bb1042ff42b7a8479fb00e65bd3f615ffc81c.tar.bz2
stackrpms-477bb1042ff42b7a8479fb00e65bd3f615ffc81c.zip
nm: remove revert-mach-file from rpm
-rw-r--r--newmoon/newmoon.spec3
-rw-r--r--newmoon/revert-mach-file.patch71
2 files changed, 1 insertions, 73 deletions
diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec
index f03a57b..d3ff2a7 100644
--- a/newmoon/newmoon.spec
+++ b/newmoon/newmoon.spec
@@ -63,7 +63,6 @@ Source7: nm-gcc-11.patch
Patch0: small-icons.patch
Patch1: pm-fedora.patch
Patch2: pm-to-nm.patch
-Patch3: revert-mach-file.patch
%endif
Packager: B. Stack <bgstack15@gmail.com>
@@ -125,7 +124,6 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -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
@@ -312,6 +310,7 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
%changelog
* Sun May 22 2022 B. Stack <bgstack15@gmail.com> - 30.0.0-1
- update version
+- remove revert-mach-file patch
* Thu Jan 20 2022 B. Stack <bgstack15@gmail.com> - 29.4.4-1
- update version
diff --git a/newmoon/revert-mach-file.patch b/newmoon/revert-mach-file.patch
deleted file mode 100644
index cda3786..0000000
--- a/newmoon/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 $@
bgstack15