diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-06-01 00:32:22 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-06-01 00:32:22 +0000 |
| commit | 588b8f99762caaabf5693fc08dc2bb8afe29cdd7 (patch) | |
| tree | 13caa5227c5e04a1fc6ce19f08acb9279fc94bd7 /newmoon/debian/patches | |
| parent | Merge branch 'librewolf-bump' into 'master' (diff) | |
| parent | ffs 11.21 rpm rc1 (diff) | |
| download | stackrpms-588b8f99762caaabf5693fc08dc2bb8afe29cdd7.tar.gz stackrpms-588b8f99762caaabf5693fc08dc2bb8afe29cdd7.tar.bz2 stackrpms-588b8f99762caaabf5693fc08dc2bb8afe29cdd7.zip | |
Merge branch 'newmoon-bump' into 'master'
newmoon 31.0.0
See merge request bgstack15/stackrpms!298
Diffstat (limited to 'newmoon/debian/patches')
| -rw-r--r-- | newmoon/debian/patches/revert-mach-file.patch | 71 | ||||
| -rw-r--r-- | newmoon/debian/patches/series | 2 |
2 files changed, 1 insertions, 72 deletions
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/debian/patches/series b/newmoon/debian/patches/series index fd4cf3c..85f30b8 100644 --- a/newmoon/debian/patches/series +++ b/newmoon/debian/patches/series @@ -1,5 +1,5 @@ # from stevepusser for 29.4.3: -revert-mach-file.patch +#revert-mach-file.patch # stackrpms small-icons.patch pm-devuan.patch |