From fae51273a5b1afa544852cfb68022796539730b2 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 11:26:46 -0400 Subject: 31.0.0 dpkg rc1 --- newmoon/debian/changelog | 54 +++++++++++++++++++++++++++++++++++++++ newmoon/debian/control | 7 ++--- newmoon/debian/mozconfig | 30 ++++++++++++---------- newmoon/debian/newmoon+devuan.dsc | 4 +-- 4 files changed, 77 insertions(+), 18 deletions(-) (limited to 'newmoon') diff --git a/newmoon/debian/changelog b/newmoon/debian/changelog index c421410..59054dc 100644 --- a/newmoon/debian/changelog +++ b/newmoon/debian/changelog @@ -1,3 +1,57 @@ +newmoon (31.0.0-1) obs; urgency=medium + + * Major milestone release: + - Once again accepts the installation of legacy Firefox extensions alongside + own Pale Moon exclusive extensions. As always, please note that using + extensions for an old version of a different browser is entirely at your + own risk and we obviously cannot and will not provide much (if any) + support for their use. Firefox extensions will be indicated with an + orange dot in the Add-ons Manager in the browser. This will include the + converted extensions for the few of you who are coming from recalled + versions with -fxguid suffixes. + - Implemented Global Privacy Control, taking the place of the unenforceable + "DNT" (Do Not Track) signal. Through GPC, you indicate to websites that + you do not want them to share or sell your data. + - Implemented "optional chaining" (thanks, FranklinDM!). + - Implemented setBaseAndExtent for text selections. + - Implemented queueMicroTask() "pseudo-promise" callbacks. + - Implemented accepting unit-less values for rootMargin in Intersection + observers for web compatibility, making it act more like CSS margin as one + would expect. + - Improvements to CSS grid and flexbox rendering and display following spec + changes and improving web compatibility. + - Improved performance of parallel web workers in JavaScript. + - Improved display of cursive scripts (on Windows). Good-bye Comic Sans! + - Updated various in-tree libraries. + - "Default browser" controls in preferences has been moved to "General". + - Added support for extended VPx codec strings in media delivery via + MSE (RFC-6381). + - Fixed a long-time regression where the browser would no longer honor + old-style body and iframe body margins when indicated in the HTML tags + directly instead of CSS. This improves compatibility with particularly old and/or archived websites. + - Fixed several crashes and stability issues. + - Added a licensing screen to the Windows installer to clarify the browser's + licensing. In other installations, you may find this licensing statement + in the added license.txt file in the browser installation location. + - Removed all Google SafeBrowsing/URLClassifier service code. + - Restored Mac OS X code and buildability in the platform. + - Removed the non-standard ArchiveReader DOM API that was only ever a + prototype implementation from the platform. This potentially improves + performance on some systems. + - Removed leftover Electrolysis controls that could sometimes trick parts of + the browser into starting in a (very broken) multi-process mode due to + some plumbing for it still being present, if users would try to force the + issue with preferences. Obviously, this was a footgun for power users. + - Removed more Android/Fennec code (on-going effort to clean up our code). + - Removed the Marionette automated testing framework. + - Security issues addressed: CVE-2022-29915, CVE-2022-29911, and several + issues that do not have a CVE number. + - UXP Mozilla security patch summary: 4 fixed, 1 DiD, 19 not applicable. + + * Disable all patches. + + -- B. Stack Sun, 22 May 2022 11:04:46 -0400 + newmoon (29.4.4-1+devuan) obs; urgency=medium - This is a security update. diff --git a/newmoon/debian/control b/newmoon/debian/control index 29a09a3..4e55668 100644 --- a/newmoon/debian/control +++ b/newmoon/debian/control @@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 12), libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), - libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, @@ -21,6 +20,7 @@ Build-Depends: debhelper (>= 12), yasm (>= 1.1), zip, # libffi-dev, +# libssl-dev, # libpixman-1-dev | libpixman-dev, # libbz2-dev, # zlib1g-dev, @@ -34,8 +34,9 @@ Homepage: http://www.palemoon.org/ Package: newmoon Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - libavcodec54 | libavcodec-extra54 | libavcodec55 | libavcodec-extra55 | libavcodec56 | libavcodec-extra56 | libavcodec57 | libavcodec-extra57 | libavcodec58 | libavcodec-extra58 | libavcodec-ffmpeg56 | libavcodec-ffmpeg-extra56 +Depends: libavcodec54 | libavcodec-extra54 | libavcodec55 | libavcodec-extra55 | libavcodec56 | libavcodec-extra56 | libavcodec57 | libavcodec-extra57 | libavcodec58 | libavcodec-extra58 | libavcodec-ffmpeg56 | libavcodec-ffmpeg-extra56, + ${shlibs:Depends}, + ${misc:Depends} Provides: gnome-www-browser, www-browser, x-www-browser Conflicts: palemoon-nonsse2 Replaces: palemoon-nonsse2 diff --git a/newmoon/debian/mozconfig b/newmoon/debian/mozconfig index 47cd6ec..4e7c1e5 100644 --- a/newmoon/debian/mozconfig +++ b/newmoon/debian/mozconfig @@ -3,18 +3,20 @@ export BUILDING_RELEASE=1 export MC_OFFICIAL=1 export MOZILLA_OFFICIAL=1 export MC_PALEMOON=1 +export MOZ_NOSPAM=1 +# If you want to control where the built objects go #mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/pmbuild ac_add_options --enable-application=palemoon ac_add_options --disable-official-branding ac_add_options --enable-official-vendor -# Disable add-ons signing -# Disable checking that add-ons are signed by the trusted root -MOZ_ADDON_SIGNING= -# Disable enforcing that add-ons are signed by the trusted root -MOZ_REQUIRE_SIGNING= +## Disable add-ons signing +## Disable checking that add-ons are signed by the trusted root +#MOZ_ADDON_SIGNING= +## Disable enforcing that add-ons are signed by the trusted root +#MOZ_REQUIRE_SIGNING= # Standard # Enables @@ -26,24 +28,29 @@ ac_add_options --enable-devtools ac_add_options --enable-jemalloc ac_add_options --with-pthreads ac_add_options --enable-strip -#ac_add_options --enable-phoenix-extensions + # Disables +# disable-debug-symbols removes the ability to do a stack trace. I do not do any stack traces anyways. ?f=5&t=28254 +ac_add_options --disable-debug-symbols +ac_add_options --disable-debug ac_add_options --disable-debug ac_add_options --disable-eme ac_add_options --disable-gamepad ac_add_options --disable-necko-wifi ac_add_options --disable-tests ac_add_options --disable-updater -# unfortunately newmoon does not have the client-side bits for webrtc so enabling it does nothing, per upstream -#ac_add_options --enable-webrtc -# Disable temeletry -export MOZ_TELEMETRY_REPORTING= ac_add_options --disable-crashreporter ac_add_options --disable-parental-controls ac_add_options --disable-accessibility +ac_add_options --disable-webrtc + +# Disable temeletry +export MOZ_TELEMETRY_REPORTING= # Debian style ac_add_options --prefix=/usr +# primarily for 32-bit but tolerated for 64-bit +ac_add_options --x-libraries=/usr/lib # Devuan style ac_add_options --disable-dbus ac_add_options --disable-pulseaudio @@ -65,9 +72,6 @@ ac_add_options --disable-personas #ac_add_options --with-system-hunspell #ac_add_options --with-system-extension-dirs -# primarily for 32-bit but tolerated for 64-bit -ac_add_options --x-libraries=/usr/lib - # limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread) # Debian Sid/Devuan Ceres; 2020-07 only -j1 works due to a bug. mk_add_options MOZ_MAKE_FLAGS="-j1" diff --git a/newmoon/debian/newmoon+devuan.dsc b/newmoon/debian/newmoon+devuan.dsc index 53f3d03..a72960c 100644 --- a/newmoon/debian/newmoon+devuan.dsc +++ b/newmoon/debian/newmoon+devuan.dsc @@ -2,11 +2,11 @@ Format: 3.0 (quilt) Source: newmoon Binary: newmoon Architecture: any -Version: 29.4.3-1+devuan +Version: 31.0.0-1+devuan Maintainer: B. Stack Homepage: http://www.palemoon.org/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12), gcc (<< 11) | gcc-10, g++ (<< 11) | g++-10, autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7), unzip, yasm (>= 1.1), zip +Build-Depends: debhelper (>= 12), gcc (<< 11) | gcc-10, g++ (<< 11) | g++-10, autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7), unzip, yasm (>= 1.1), zip Package-List: newmoon deb web optional arch=any Files: -- cgit From 418c394117b2b75cf41d379f83987d959b57e688 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 11:39:41 -0400 Subject: nm 31.0.0 rpm rc1 --- newmoon/newmoon-mozconfig | 14 +++++++------- newmoon/newmoon.spec | 13 ++++++++----- 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'newmoon') diff --git a/newmoon/newmoon-mozconfig b/newmoon/newmoon-mozconfig index 39c9feb..feb1e68 100644 --- a/newmoon/newmoon-mozconfig +++ b/newmoon/newmoon-mozconfig @@ -13,20 +13,20 @@ export BUILDING_RELEASE=1 export MC_OFFICIAL=1 export MOZILLA_OFFICIAL=1 export MC_PALEMOON=1 +export MOZ_NOSPAM=1 -# Disable add-ons signing -# Disable checking that add-ons are signed by the trusted root -MOZ_ADDON_SIGNING= -# Disable enforcing that add-ons are signed by the trusted root -MOZ_REQUIRE_SIGNING= +# Disabled for testing, v31.0.0 +## Disable add-ons signing +## Disable checking that add-ons are signed by the trusted root +#MOZ_ADDON_SIGNING= +## Disable enforcing that add-ons are signed by the trusted root +#MOZ_REQUIRE_SIGNING= ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --enable-jemalloc ac_add_options --enable-av1 -#ac_add_options --enable-shared-js ac_add_options --enable-strip ac_add_options --with-pthreads -#ac_add_options --enable-phoenix-extensions ac_add_options --disable-tests ac_add_options --disable-debug diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index 7bd8079..f03a57b 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -7,7 +7,7 @@ #%%global submodule_platform_tag RELBASE_20210817 %global badname palemoon %global git_commit db5ee3c1968212742b4ed8b9883069ea7b03f0e1 -%global tarballdir %{badname}-%{git_commit} +%global tarballdir pale-moon # additional repos to get python27 and devtoolset-7 # for el6 and el7: Software Collection;, for x86_64 only @@ -32,7 +32,7 @@ %define scl_buildreq devtoolset-7-toolchain %endif -# suppress binary strippping on el6 which fails for some reason +# suppress binary stripping on el6 which fails for some reason %if 0%{?el6} %global __os_install_post %{nil} %endif @@ -44,14 +44,14 @@ Name: newmoon Name: newmoon %endif Summary: Newmoon web browser -Version: 29.4.4 +Version: 31.0.0 Release: 1 Group: Networking/Web License: MPLv2.0 URL: http://linux.palemoon.org/ -#Source0: https://repo.palemoon.org/MoonChildProductions/Pale-Moon/archive/%%{version}_Release.tar.gz -Source0: https://gitlab.com/opensource-tracking/palemoon/-/archive/%{git_commit}/palemoon-%{git_commit}.tar.gz +Source0: https://repo.palemoon.org/MoonChildProductions/Pale-Moon/archive/%{version}_Release.tar.gz +#Source0: https://gitlab.com/opensource-tracking/palemoon/-/archive/%%{git_commit}/palemoon-%%{git_commit}.tar.gz #Source1: https://repo.palemoon.org/MoonchildProductions/UXP/archive/%%{submodule_platform_tag}.tar.gz Source2: newmoon-mozconfig Source3: newmoon.desktop @@ -310,6 +310,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %doc AUTHORS LICENSE %changelog +* Sun May 22 2022 B. Stack - 30.0.0-1 +- update version + * Thu Jan 20 2022 B. Stack - 29.4.4-1 - update version -- cgit From 5ab4ade3181f611319880bdd3f0964593b573c25 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 12:49:56 -0400 Subject: disable revert-mach-file.patch --- newmoon/debian/patches/series | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'newmoon') 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 -- cgit From 477bb1042ff42b7a8479fb00e65bd3f615ffc81c Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 13:10:12 -0400 Subject: nm: remove revert-mach-file from rpm --- newmoon/newmoon.spec | 3 +- newmoon/revert-mach-file.patch | 71 ------------------------------------------ 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 newmoon/revert-mach-file.patch (limited to 'newmoon') 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 @@ -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 - 30.0.0-1 - update version +- remove revert-mach-file patch * Thu Jan 20 2022 B. Stack - 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 $@ -- cgit From 5390fe959b7062cb74497b680edbd10335bd028c Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 14:14:16 -0400 Subject: nm: re-add the submodule to rpm spec --- newmoon/newmoon.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'newmoon') diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index d3ff2a7..7e7311c 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -4,7 +4,7 @@ %global stackrpms_custom 1 # derive from inside the source tree or from https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases # git submodule | awk -v "name=platform" '$2 == name {gsub("-","",$1); print $1}' -#%%global submodule_platform_tag RELBASE_20210817 +%global submodule_platform_tag RB_20220510 %global badname palemoon %global git_commit db5ee3c1968212742b4ed8b9883069ea7b03f0e1 %global tarballdir pale-moon @@ -52,7 +52,7 @@ License: MPLv2.0 URL: http://linux.palemoon.org/ Source0: https://repo.palemoon.org/MoonChildProductions/Pale-Moon/archive/%{version}_Release.tar.gz #Source0: https://gitlab.com/opensource-tracking/palemoon/-/archive/%%{git_commit}/palemoon-%%{git_commit}.tar.gz -#Source1: https://repo.palemoon.org/MoonchildProductions/UXP/archive/%%{submodule_platform_tag}.tar.gz +Source1: https://repo.palemoon.org/MoonchildProductions/UXP/archive/%{submodule_platform_tag}.tar.gz Source2: newmoon-mozconfig Source3: newmoon.desktop Source4: newmoon-mimeinfo.xml @@ -114,7 +114,7 @@ and themes to make the browser truly your own. %prep %setup -q -n %{tarballdir} -#tar -C platform --strip-components=1 -zxf %%{SOURCE1} # git submodule +tar -C platform --strip-components=1 -zxf %%{SOURCE1} # git submodule %{__cp} %{SOURCE2} ./.mozconfig %if 0%{?fedora} >= 30 sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig -- cgit From 8ae46801f52de9b9ef2a21b42246d3e3f4a87e97 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Sun, 22 May 2022 14:19:51 -0400 Subject: fix typo --- newmoon/newmoon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'newmoon') diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index 7e7311c..d356f29 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -114,7 +114,7 @@ and themes to make the browser truly your own. %prep %setup -q -n %{tarballdir} -tar -C platform --strip-components=1 -zxf %%{SOURCE1} # git submodule +tar -C platform --strip-components=1 -zxf %{SOURCE1} # git submodule %{__cp} %{SOURCE2} ./.mozconfig %if 0%{?fedora} >= 30 sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig -- cgit From 730a1f6e95568995c68c4bdd560c89d5ab7d5637 Mon Sep 17 00:00:00 2001 From: "B. Stack" 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