mirror of
https://abf.rosa.ru/djam/newmoon.git
synced 2025-02-23 15:12:54 +00:00
New version 28.10.0
This commit is contained in:
Andrey Bondrov
parent
e001f3811d
commit
eb9677f70b
4 changed files with 58 additions and 46 deletions
3
.abf.yml
3
.abf.yml
|
|
@ -1,3 +1,4 @@
|
|||
sources:
|
||||
UXP-PM28.8.2_Release.tar.gz: d0d69448e5aba71fd987771fadfdd265b25b29f2
|
||||
firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f
|
||||
UXP-RELBASE_20200603.tar.gz: de1bafc071446c5d410acfc46227be13140a68ee
|
||||
Pale-Moon-28.10.0_Release.tar.gz: a0971934fffe119789719f245a1c473299319a71
|
||||
|
|
|
|||
53
newmoon.spec
53
newmoon.spec
|
|
@ -1,8 +1,10 @@
|
|||
%bcond_with syshunspell
|
||||
|
||||
%define oname PM
|
||||
%define oname Pale-Moon
|
||||
%define newmoon_appid \{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4\}
|
||||
|
||||
%define uxp_version 20200603
|
||||
|
||||
# (tpg) MOZILLA_FIVE_HOME
|
||||
%define mozillalibdir %{_libdir}/%{name}-%{version}
|
||||
%define pluginsdir %{_libdir}/mozilla/plugins
|
||||
|
|
@ -15,14 +17,15 @@
|
|||
|
||||
Summary: Web browser based on Goanna engine
|
||||
Name: newmoon
|
||||
Version: 28.8.2
|
||||
Version: 28.10.0
|
||||
Release: 1
|
||||
License: MPLv2.0
|
||||
Group: Networking/WWW
|
||||
Url: http://www.palemoon.org
|
||||
Source0: https://github.com/MoonchildProductions/UXP/archive/%{oname}%{version}_Release.tar.gz?/UXP-%{oname}%{version}_Release.tar.gz
|
||||
Source1: newmoon.rpmlintrc
|
||||
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
|
||||
Source2: xulstore.json
|
||||
Source3: newmoon.rpmlintrc
|
||||
Source4: %{name}.desktop
|
||||
Source5: firefox-searchengines-yandex.xml
|
||||
Source6: firefox-searchengines-google.xml
|
||||
|
|
@ -30,8 +33,8 @@ Source9: kde.js
|
|||
# https://www.mozilla.org/en-US/firefox/all/
|
||||
Source10: firefox-dictionary-61.0.2.tar.bz2
|
||||
Patch1: palemoon-28.0.1-prefs-edit.patch
|
||||
Patch6: palemoon-27.4.0-enable-addons.patch
|
||||
Patch7: palemoon-27.4.0-user-agent-overrides.patch
|
||||
Patch5: palemoon-28.9.1-enable-addons.patch
|
||||
Patch6: palemoon-28.9.1-user-agent-overrides.patch
|
||||
|
||||
BuildRequires: autoconf2.1
|
||||
%if %{with clang}
|
||||
|
|
@ -42,7 +45,7 @@ BuildRequires: lld
|
|||
BuildRequires: doxygen
|
||||
BuildRequires: imagemagick
|
||||
BuildRequires: makedepend
|
||||
BuildRequires: python-simplejson
|
||||
BuildRequires: python3-simplejson
|
||||
BuildRequires: rootcerts
|
||||
BuildRequires: unzip
|
||||
BuildRequires: valgrind
|
||||
|
|
@ -124,12 +127,19 @@ Files and macros mainly for building New Moon extensions.
|
|||
#----------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -qn UXP-%{oname}%{version}_Release
|
||||
%patch1 -p1 -b .prefs
|
||||
%patch6 -p1 -b .addons
|
||||
%patch7 -p1 -b .ua
|
||||
%setup -qn %{oname}-%{version}_Release -a1
|
||||
if [ -d %{_builddir}/obj ]
|
||||
then
|
||||
rm -rf %{_builddir}/obj
|
||||
fi
|
||||
|
||||
pushd js/src
|
||||
rm -rf platform
|
||||
mv UXP-RELBASE_%{uxp_version} platform
|
||||
%patch1 -p2 -b .prefs
|
||||
%patch5 -p1 -b .addons
|
||||
%patch6 -p1 -b .ua
|
||||
|
||||
pushd platform/js/src
|
||||
autoconf-2.13
|
||||
popd
|
||||
autoconf-2.13
|
||||
|
|
@ -173,6 +183,7 @@ ac_add_options --target=%{_target_platform}
|
|||
ac_add_options --disable-accessibility
|
||||
ac_add_options --disable-crashreporter
|
||||
ac_add_options --disable-debug
|
||||
ac_add_options --disable-debug-symbols
|
||||
ac_add_options --disable-official-branding
|
||||
ac_add_options --disable-optimize
|
||||
ac_add_options --disable-startupcache
|
||||
|
|
@ -190,14 +201,14 @@ ac_add_options --with-pthreads
|
|||
|
||||
EOF
|
||||
|
||||
./mach build
|
||||
./mach build --verbose
|
||||
|
||||
%install
|
||||
make -C %{_builddir}/obj/application/palemoon/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
|
||||
make -C %{_builddir}/obj/palemoon/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
|
||||
|
||||
# Copy files to buildroot
|
||||
mkdir -p %{buildroot}%{mozillalibdir}
|
||||
cp -rf %{_builddir}/obj/dist/palemoon/* %{buildroot}%{mozillalibdir}
|
||||
cp -rfL %{_builddir}/obj/dist/bin/* %{buildroot}%{mozillalibdir}
|
||||
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
ln -sf %{mozillalibdir}/palemoon %{buildroot}%{_bindir}/newmoon
|
||||
|
|
@ -216,7 +227,7 @@ install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}.desktop
|
|||
# (tpg) icons
|
||||
for i in 16 22 24 32 48 128; do
|
||||
# (cg) Not all icon sizes are installed with make install, so just redo it here.
|
||||
convert %{_builddir}/obj/dist/palemoon/browser/icons/mozicon128.png -scale ${i}x${i} %{buildroot}%{mozillalibdir}/browser/chrome/icons/default/default${i}.png
|
||||
convert %{_builddir}/obj/dist/bin/browser/icons/mozicon128.png -scale ${i}x${i} %{buildroot}%{mozillalibdir}/browser/chrome/icons/default/default${i}.png
|
||||
mkdir -p %{buildroot}%{_iconsdir}/hicolor/"$i"x"$i"/apps
|
||||
ln -sf %{mozillalibdir}/browser/chrome/icons/default/default$i.png %{buildroot}%{_iconsdir}/hicolor/"$i"x"$i"/apps/%{name}.png ;
|
||||
done
|
||||
|
|
@ -226,7 +237,7 @@ rm -f %{buildroot}%{mozillalibdir}/README.txt
|
|||
rm -f %{buildroot}%{mozillalibdir}/removed-files
|
||||
rm -f %{buildroot}%{mozillalibdir}/precomplete
|
||||
|
||||
install -D -m644 application/palemoon/app/profile/prefs.js %{buildroot}%{mozillalibdir}/browser/defaults/preferences/prefs.js
|
||||
install -D -m644 palemoon/app/profile/prefs.js %{buildroot}%{mozillalibdir}/browser/defaults/preferences/prefs.js
|
||||
cat << EOF >> %{buildroot}%{mozillalibdir}/browser/defaults/preferences/prefs.js
|
||||
pref("app.update.auto", false);
|
||||
pref("app.update.autoInstallEnabled", false);
|
||||
|
|
@ -272,10 +283,10 @@ touch %{buildroot}%{mozillalibdir}/browser/defaults/preferences/bookmarks.html
|
|||
mkdir -p %{buildroot}%{mozillalibdir}/browser/searchplugins
|
||||
cp -f %{SOURCE5} %{buildroot}%{mozillalibdir}/browser/searchplugins/yandex.xml
|
||||
cp -f %{SOURCE6} %{buildroot}%{mozillalibdir}/browser/searchplugins/google.xml
|
||||
cp -f application/palemoon/locales/en-US/searchplugins/bing.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/bing.xml
|
||||
cp -f application/palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/duckduckgo-palemoon.xml
|
||||
cp -f application/palemoon/locales/en-US/searchplugins/wikipedia.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/wikipedia.xml
|
||||
cp -f application/palemoon/locales/en-US/searchplugins/yahoo.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/yahoo.xml
|
||||
cp -f palemoon/locales/en-US/searchplugins/bing.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/bing.xml
|
||||
cp -f palemoon/locales/en-US/searchplugins/duckduckgo-palemoon.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/duckduckgo-palemoon.xml
|
||||
cp -f palemoon/locales/en-US/searchplugins/wikipedia.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/wikipedia.xml
|
||||
cp -f palemoon/locales/en-US/searchplugins/yahoo.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/yahoo.xml
|
||||
|
||||
cat <<FIN >macro
|
||||
# Macros from %{name} package
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -urN Pale-Moon-27.4.0_Release/application/palemoon/app/profile/palemoon.js Pale-Moon-27.4.0_Release-patched/application/palemoon/app/profile/palemoon.js
|
||||
--- Pale-Moon-27.4.0_Release/application/palemoon/app/profile/palemoon.js 2017-07-10 22:23:16.000000000 +1000
|
||||
+++ Pale-Moon-27.4.0_Release-patched/application/palemoon/app/profile/palemoon.js 2017-07-13 00:29:16.695614989 +1000
|
||||
@@ -61,7 +61,8 @@
|
||||
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 @@
|
||||
|
||||
// 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 +11,10 @@ diff -urN Pale-Moon-27.4.0_Release/application/palemoon/app/profile/palemoon.js
|
|||
|
||||
// Dictionary download preference
|
||||
pref("browser.dictionaries.download.url", "https://@AM_DOMAIN@/dictionaries/");
|
||||
diff -urN Pale-Moon-27.4.0_Release/toolkit/mozapps/extensions/internal/XPIProvider.jsm Pale-Moon-27.4.0_Release-patched/toolkit/mozapps/extensions/internal/XPIProvider.jsm
|
||||
--- Pale-Moon-27.4.0_Release/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2017-07-10 22:23:16.000000000 +1000
|
||||
+++ Pale-Moon-27.4.0_Release-patched/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2017-07-13 00:29:16.877614988 +1000
|
||||
@@ -2125,11 +2125,9 @@
|
||||
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 @@
|
||||
|
||||
AddonManagerPrivate.markProviderSafe(this);
|
||||
|
||||
|
|
@ -1,23 +1,23 @@
|
|||
diff -Naur UXP-PM28.8.2_Release-orig/application/palemoon/branding/shared/pref/uaoverrides.inc UXP-PM28.8.2_Release/application/palemoon/branding/shared/pref/uaoverrides.inc
|
||||
--- UXP-PM28.8.2_Release-orig/application/palemoon/branding/shared/pref/uaoverrides.inc 2020-01-27 13:06:07.000000000 +0300
|
||||
+++ UXP-PM28.8.2_Release/application/palemoon/branding/shared/pref/uaoverrides.inc 2020-01-30 17:38:09.465697424 +0300
|
||||
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:52.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/52.9 @PM_SLICE@");
|
||||
+pref("@GUAO_PREF@.google.com.ua","Mozilla/5.0 (@OS_SLICE@ rv:52.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/52.9 @PM_SLICE@");
|
||||
+pref("@GUAO_PREF@.google.by","Mozilla/5.0 (@OS_SLICE@ rv:52.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/52.9 @PM_SLICE@");
|
||||
+pref("@GUAO_PREF@.google.de","Mozilla/5.0 (@OS_SLICE@ rv:52.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/52.9 @PM_SLICE@");
|
||||
+pref("@GUAO_PREF@.google.es","Mozilla/5.0 (@OS_SLICE@ rv:52.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/52.9 @PM_SLICE@");
|
||||
+pref("@GUAO_PREF@.google.fr","Mozilla/5.0 (@OS_SLICE@ rv:52.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/52.9 @PM_SLICE@");
|
||||
+pref("@GUAO_PREF@.google.it","Mozilla/5.0 (@OS_SLICE@ rv:52.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/52.9 @PM_SLICE@");
|
||||
+pref("@GUAO_PREF@.google.pl","Mozilla/5.0 (@OS_SLICE@ rv:52.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/52.9 @PM_SLICE@");
|
||||
+pref("@GUAO_PREF@.google.ru","Mozilla/5.0 (@OS_SLICE@ rv:52.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/52.9 @PM_SLICE@");
|
||||
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:31.9) @GK_SLICE@ @GRE_VERSION_SLICE@ Firefox/31.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)");
|
||||
@@ -67,6 +75,9 @@
|
||||
pref("@GUAO_PREF@.firefox.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
|
||||
@@ -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@");
|
||||
|
||||
+// Consultant doesn't work
|
||||
|
|
@ -26,7 +26,7 @@ diff -Naur UXP-PM28.8.2_Release-orig/application/palemoon/branding/shared/pref/u
|
|||
// 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");
|
||||
@@ -76,6 +87,11 @@
|
||||
@@ -78,6 +89,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");
|
||||
Loading…
Add table
Reference in a new issue