diff --git a/.abf.yml b/.abf.yml index 1ef1c05..65693d0 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,7 @@ sources: - firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f - UXP-RELBASE_20200603.tar.gz: de1bafc071446c5d410acfc46227be13140a68ee Pale-Moon-28.10.0_Release.tar.gz: a0971934fffe119789719f245a1c473299319a71 + Pale-Moon-29.2.0_Release.tar.gz: 1318fe0b3ef7c25c8297b40cfe1d58a42d095a63 + RELBASE_20210330.tar.gz: 7ff2636c5199b7022cdeed02e04418a743317c52 + UXP-RELBASE_20200603.tar.gz: de1bafc071446c5d410acfc46227be13140a68ee + firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f + xulstore.json: 791d7e3c6c10f501fc6a53906deb5e6a319fd1f8 diff --git a/newmoon-gcc11.patch b/newmoon-gcc11.patch new file mode 100644 index 0000000..779be6c --- /dev/null +++ b/newmoon-gcc11.patch @@ -0,0 +1,30 @@ +--- a/platform/gfx/2d/BaseRect.h 2021-03-26 00:34:32.000000000 +0300 ++++ b/platform/gfx/2d/BaseRect.h 2021-05-06 06:23:09.632574472 +0300 +@@ -14,6 +14,7 @@ + #include "mozilla/FloatingPoint.h" + #include "mozilla/TypeTraits.h" + #include "Types.h" ++#include + + namespace mozilla { + namespace gfx { +--- a/platform/gfx/2d/Matrix.h 2021-03-26 00:34:32.000000000 +0300 ++++ b/platform/gfx/2d/Matrix.h 2021-05-06 06:23:09.635907804 +0300 +@@ -16,6 +16,7 @@ + #include "mozilla/Attributes.h" + #include "mozilla/DebugOnly.h" + #include "mozilla/FloatingPoint.h" ++#include + + namespace mozilla { + namespace gfx { +--- a/platform/netwerk/base/nsURLParsers.cpp 2021-03-26 00:34:32.000000000 +0300 ++++ b/platform/netwerk/base/nsURLParsers.cpp 2021-05-06 06:24:26.052576014 +0300 +@@ -11,6 +11,7 @@ + #include "nsURLHelper.h" + #include "nsString.h" + #include "nsCRT.h" ++#include + + using namespace mozilla; + diff --git a/newmoon.spec b/newmoon.spec index 9497e94..a194a99 100644 --- a/newmoon.spec +++ b/newmoon.spec @@ -8,7 +8,7 @@ %define oname Pale-Moon %define newmoon_appid \{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4\} -%define uxp_version 20200603 +%define uxp_version 20210330 # (tpg) MOZILLA_FIVE_HOME %define mozillalibdir %{_libdir}/%{name}-%{version} @@ -26,13 +26,13 @@ Summary: Web browser based on Goanna engine Name: newmoon -Version: 28.10.0 -Release: 2 +Version: 29.2.0 +Release: 1 License: MPLv2.0 Group: Networking/WWW Url: http://www.palemoon.org -Source0: https://github.com/MoonchildProductions/%{oname}/archive/%{oname}-%{version}_Release.tar.gz?/%{oname}-%{version}_Release.tar.gz -Source1: https://github.com/MoonchildProductions/UXP/archive/UXP-RELBASE_%{uxp_version}.tar.gz?/UXP-RELBASE_%{uxp_version}.tar.gz +Source0: https://repo.palemoon.org/MoonchildProductions/Pale-Moon/archive/%{version}_Release.tar.gz?/%{oname}-%{version}_Release.tar.gz +Source1: https://github.com/MoonchildProductions/UXP/archive/refs/tags/RELBASE_%{uxp_version}.tar.gz Source2: xulstore.json Source3: newmoon.rpmlintrc Source4: %{name}.desktop @@ -44,6 +44,9 @@ Source10: firefox-dictionary-61.0.2.tar.bz2 Patch1: palemoon-28.0.1-prefs-edit.patch Patch5: palemoon-28.9.1-enable-addons.patch Patch6: palemoon-28.9.1-user-agent-overrides.patch +# The following headers are used less widely in libstdc++ +# and may need to be included explicitly when compiled with GCC 11 +Patch7: newmoon-gcc11.patch BuildRequires: autoconf2.1 %if %{with clang} @@ -136,7 +139,7 @@ Files and macros mainly for building New Moon extensions. #---------------------------------------------------------------------------- %prep -%setup -qn %{oname}-%{version}_Release -a1 +%setup -qn pale-moon -a1 if [ -d %{_builddir}/obj ] then rm -rf %{_builddir}/obj @@ -144,9 +147,13 @@ fi rm -rf platform mv UXP-RELBASE_%{uxp_version} platform -%patch1 -p2 -b .prefs +%patch1 -p1 -b .prefs %patch5 -p1 -b .addons %patch6 -p1 -b .ua +%patch7 -p1 + +# delete unofficial.shtml +sed -i -e "31d" palemoon/branding/unofficial/pref/palemoon-branding.js pushd platform/js/src autoconf-2.13 @@ -311,3 +318,4 @@ cat <macro %%newmoon_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{newmoon_appid}; else echo %%{_libdir}/mozilla/extensions/%%{newmoon_appid}; fi) FIN %install_macro %{name} macro + diff --git a/palemoon-28.0.1-prefs-edit.patch b/palemoon-28.0.1-prefs-edit.patch index 0a06e4f..474ea39 100644 --- a/palemoon-28.0.1-prefs-edit.patch +++ b/palemoon-28.0.1-prefs-edit.patch @@ -1,12 +1,11 @@ -diff -Naur UXP-PM28.0.1_Release-orig/application/palemoon/components/nsBrowserContentHandler.js UXP-PM28.0.1_Release/application/palemoon/components/nsBrowserContentHandler.js ---- UXP-PM28.0.1_Release-orig/application/palemoon/components/nsBrowserContentHandler.js 2018-08-30 17:59:46.000000000 +0300 -+++ UXP-PM28.0.1_Release/application/palemoon/components/nsBrowserContentHandler.js 2018-09-01 22:49:16.157720745 +0300 -@@ -594,7 +594,7 @@ - if (overridePage && startPage && !haveUpdateSession) - return overridePage + "|" + startPage; - -- return overridePage || startPage || "about:logopage"; -+ return overridePage || startPage || "file:///usr/share/doc/HTML/index.html"; - }, - - get startPage() { +--- a/palemoon/components/nsBrowserContentHandler.js 2021-04-24 00:07:36.000000000 +0300 ++++ b/palemoon/components/nsBrowserContentHandler.js 2021-05-07 02:07:04.152579905 +0300 +@@ -592,7 +592,7 @@ + return overridePage + "|" + startPage; + } + +- return overridePage || startPage || "about:logopage"; ++ return overridePage || startPage || "file:///usr/share/doc/HTML/index.html"; + }, + + get startPage() { diff --git a/palemoon-28.9.1-enable-addons.patch b/palemoon-28.9.1-enable-addons.patch index 96580c3..d63014e 100644 --- a/palemoon-28.9.1-enable-addons.patch +++ b/palemoon-28.9.1-enable-addons.patch @@ -1,7 +1,6 @@ -diff -urN Pale-Moon-28.9.1_Release/palemoon/app/profile/palemoon.js Pale-Moon-28.9.1_Release-patched/palemoon/app/profile/palemoon.js ---- Pale-Moon-28.9.1_Release/palemoon/app/profile/palemoon.js 2020-04-08 17:06:19.000000000 +1000 -+++ Pale-Moon-28.9.1_Release-patched/palemoon/app/profile/palemoon.js 2020-04-15 16:42:23.715888312 +1000 -@@ -67,7 +67,8 @@ +--- a/palemoon/app/profile/palemoon.js 2021-04-24 00:07:36.000000000 +0300 ++++ b/palemoon/app/profile/palemoon.js 2021-05-07 02:16:18.152591146 +0300 +@@ -65,7 +65,8 @@ // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.jsm for values to use here. @@ -11,10 +10,9 @@ diff -urN Pale-Moon-28.9.1_Release/palemoon/app/profile/palemoon.js Pale-Moon-28 // Dictionary download preference pref("browser.dictionaries.download.url", "https://@AM_DOMAIN@/dictionaries/"); -diff -urN Pale-Moon-28.9.1_Release/platform/toolkit/mozapps/extensions/internal/XPIProvider.jsm Pale-Moon-28.9.1_Release-patched/platform/toolkit/mozapps/extensions/internal/XPIProvider.jsm ---- Pale-Moon-28.9.1_Release/platform/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2020-04-08 16:53:39.000000000 +1000 -+++ Pale-Moon-28.9.1_Release-patched/platform/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2020-04-15 16:43:59.427879325 +1000 -@@ -2106,11 +2106,9 @@ +--- a/platform/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2021-03-26 00:34:32.000000000 +0300 ++++ b/platform/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2021-05-07 02:16:18.155924479 +0300 +@@ -2105,11 +2105,9 @@ AddonManagerPrivate.markProviderSafe(this); diff --git a/palemoon-28.9.1-user-agent-overrides.patch b/palemoon-28.9.1-user-agent-overrides.patch index 7d916e2..c05aa1b 100644 --- a/palemoon-28.9.1-user-agent-overrides.patch +++ b/palemoon-28.9.1-user-agent-overrides.patch @@ -1,40 +1,39 @@ -diff -urN Pale-Moon-28.9.1_Release/palemoon/branding/shared/pref/uaoverrides.inc Pale-Moon-28.9.1_Release-patched/palemoon/branding/shared/pref/uaoverrides.inc ---- Pale-Moon-28.9.1_Release/palemoon/branding/shared/pref/uaoverrides.inc 2020-04-08 17:06:19.000000000 +1000 -+++ Pale-Moon-28.9.1_Release-patched/palemoon/branding/shared/pref/uaoverrides.inc 2020-04-15 17:08:08.329743283 +1000 -@@ -35,6 +35,14 @@ - pref("@GUAO_PREF@.aol.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); - pref("@GUAO_PREF@.calendar.yahoo.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); - pref("@GUAO_PREF@.google.com","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); -+pref("@GUAO_PREF@.google.com.ua","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); -+pref("@GUAO_PREF@.google.by","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); -+pref("@GUAO_PREF@.google.de","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); -+pref("@GUAO_PREF@.google.es","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); -+pref("@GUAO_PREF@.google.fr","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); -+pref("@GUAO_PREF@.google.it","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); -+pref("@GUAO_PREF@.google.pl","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); -+pref("@GUAO_PREF@.google.ru","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); - pref("@GUAO_PREF@.googlevideos.com","Mozilla/5.0 (@OS_SLICE@ rv:38.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/38.9 @PM_SLICE@"); - pref("@GUAO_PREF@.gstatic.com","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); - pref("@GUAO_PREF@.yahoo.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)"); -@@ -69,6 +77,9 @@ - pref("@GUAO_PREF@.mozilla.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@"); - pref("@GUAO_PREF@.github.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@"); +--- a/palemoon/branding/shared/pref/uaoverrides.inc 2021-04-24 00:07:36.000000000 +0300 ++++ b/palemoon/branding/shared/pref/uaoverrides.inc 2021-05-07 02:39:16.645952213 +0300 +@@ -24,6 +24,14 @@ + pref("@GUAO_PREF@.chase.com","Mozilla/5.0 (%OS_SLICE% rv:79.0) @GK_SLICE@ Firefox/79.0"); + pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (%OS_SLICE% rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)"); + pref("@GUAO_PREF@.google.com","Mozilla/5.0 (%OS_SLICE% rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); ++pref("@GUAO_PREF@.google.com.ua","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); ++pref("@GUAO_PREF@.google.by","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); ++pref("@GUAO_PREF@.google.de","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); ++pref("@GUAO_PREF@.google.es","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); ++pref("@GUAO_PREF@.google.fr","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); ++pref("@GUAO_PREF@.google.it","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); ++pref("@GUAO_PREF@.google.pl","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); ++pref("@GUAO_PREF@.google.ru","Mozilla/5.0 (@OS_SLICE@ rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); + pref("@GUAO_PREF@.googlevideos.com","Mozilla/5.0 (%OS_SLICE% rv:38.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/38.9 @PM_SLICE@"); + pref("@GUAO_PREF@.gstatic.com","Mozilla/5.0 (%OS_SLICE% rv:71.0) @GK_SLICE@ Firefox/71.0 @PM_SLICE@"); + pref("@GUAO_PREF@.kroger.com","Mozilla/5.0 (%OS_SLICE% rv:86.0) @GK_SLICE@ Firefox/86.0 (Pale Moon)"); +@@ -56,6 +64,9 @@ + pref("@GUAO_PREF@.spotify.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@"); + pref("@GUAO_PREF@.twitter.com","Mozilla/5.0 (%OS_SLICE% rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@"); +// Consultant doesn't work +pref("@GUAO_PREF@.consultant.ru","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); + // UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!) - pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); - pref("@GUAO_PREF@.privat24.ua","Mozilla/5.0 (@OS_SLICE@ rv:38.0) @GK_SLICE@ Firefox/38.0"); -@@ -78,6 +89,11 @@ + pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)"); + pref("@GUAO_PREF@.privat24.ua","Mozilla/5.0 (%OS_SLICE% rv:38.0) @GK_SLICE@ Firefox/38.0"); +@@ -65,6 +76,11 @@ // UA-sniffing domains that are "app/vendor-specific" and do not like Pale Moon pref("@GUAO_PREF@.web.whatsapp.com","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36"); -+pref("@GUAO_PREF@.avito.ru","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); -+pref("@GUAO_PREF@.citilink.ru","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); -+pref("@GUAO_PREF@.superjob.ru","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); -+pref("@GUAO_PREF@.kibergrad.fm","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); -+pref("@GUAO_PREF@.vk.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); - - // The following domains do not like the Goanna slice - pref("@GUAO_PREF@.hitbox.tv","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@"); +++pref("@GUAO_PREF@.avito.ru","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); +++pref("@GUAO_PREF@.citilink.ru","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); +++pref("@GUAO_PREF@.superjob.ru","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); +++pref("@GUAO_PREF@.kibergrad.fm","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); +++pref("@GUAO_PREF@.vk.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @GRE_VERSION_SLICE@ @FX_SLICE@ @PM_SLICE@"); + pref("@GUAO_PREF@.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:60.0) @GK_SLICE@ Firefox/60.0"); + pref("@GUAO_PREF@.studio.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:68.0) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/68.0 @PM_SLICE@"); + pref("@GUAO_PREF@.gaming.youtube.com","Mozilla/5.0 (%OS_SLICE% rv:71.0) @GK_SLICE@ Firefox/71.0");