add revert-mach-file patch

4 files changed, 150 insertions, 2 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 $@
diff --git a/newmoon/debian/patches/series b/newmoon/debian/patches/series
index baa043e..9bee30d 100644
--- a/newmoon/debian/patches/series
+++ b/newmoon/debian/patches/series
@@ -1,3 +1,6 @@
+# from stevepusser for 29.4.3:
+revert-match-file.patch
+# stackrpms
 small-icons.patch
 pm-devuan.patch
 pm-to-nm.patch
diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec
index 096432e..31b789a 100644
--- a/newmoon/newmoon.spec
+++ b/newmoon/newmoon.spec
@@ -62,6 +62,7 @@ Source6: bluemoon-icons.tgz
 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>
 
@@ -123,6 +124,7 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 ! test -d %{badname}/branding/unofficial.unbuilt && {
    cp -pr %{badname}/branding/unofficial %{badname}/branding/unofficial.unbuilt && \
@@ -300,10 +302,11 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %doc AUTHORS LICENSE
 
 %changelog
-* Tue Jan 04 2021 B. Stack <bgstack15@gmail.com> - 29.4.3-1
+* Tue Jan 04 2022 B. Stack <bgstack15@gmail.com> - 29.4.3-1
 - update version
+- add revert-mach-file patch from stevepusser
 
-* Tue Nov 11 2021 B. Stack <bgstack15@gmail.com> - 29.4.2-1
+* Thu Nov 11 2021 B. Stack <bgstack15@gmail.com> - 29.4.2-1
 - update version
 
 * Wed Sep 15 2021 B. Stack <bgstack15@gmail.com> - 29.4.1-1
diff --git a/newmoon/revert-mach-file.patch b/newmoon/revert-mach-file.patch
new file mode 100644
index 0000000..cda3786
--- /dev/null
+++ b/newmoon/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 $@