diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-01-20 18:57:53 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-01-20 18:57:53 +0000 |
| commit | 7f9d6c9f9a6c40582470f123a5466c984bae55be (patch) | |
| tree | 5e397d6dbbebca4b4122e4211a2d52eaeb34c3e0 /newmoon/debian/patches/revert-mach-file.patch | |
| parent | Merge branch 'scite-bump' into 'master' (diff) | |
| parent | check gcc ver instead of fedora ver (diff) | |
| download | stackrpms-7f9d6c9f9a6c40582470f123a5466c984bae55be.tar.gz stackrpms-7f9d6c9f9a6c40582470f123a5466c984bae55be.tar.bz2 stackrpms-7f9d6c9f9a6c40582470f123a5466c984bae55be.zip | |
Merge branch 'newmoon-bump' into 'master'
newmoon 29.4.3 with gcc11 support
See merge request bgstack15/stackrpms!280
Diffstat (limited to 'newmoon/debian/patches/revert-mach-file.patch')
| -rw-r--r-- | newmoon/debian/patches/revert-mach-file.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/newmoon/debian/patches/revert-mach-file.patch b/newmoon/debian/patches/revert-mach-file.patch new file mode 100644 index 0000000..cda3786 --- /dev/null +++ b/newmoon/debian/patches/revert-mach-file.patch @@ -0,0 +1,71 @@ +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 $@ |