diff --git a/.abf.yml b/.abf.yml index 244f046..a758305 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,4 @@ sources: - Pale-Moon-27.9.4_Release.tar.gz: e82a56a342d6aa23b1a259c7e94aa517b702b746 + UXP-PM28.0.0_Release.tar.gz: 6f7ea85c8a193d7523806d99c2d6f6b18147e7a4 + firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f icons.tar.bz2: 625177825178215f8bb80f097fc3595daabece24 diff --git a/firefox-3.5.3-default-mail-handler.patch b/firefox-3.5.3-default-mail-handler.patch deleted file mode 100644 index a16aa40..0000000 --- a/firefox-3.5.3-default-mail-handler.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -p -up ./browser/locales/generic/profile/mimeTypes.rdf.orig ./browser/locales/generic/profile/mimeTypes.rdf ---- ./browser/locales/generic/profile/mimeTypes.rdf.orig 2009-10-19 15:53:21.000000000 -0200 -+++ ./browser/locales/generic/profile/mimeTypes.rdf 2009-10-19 15:54:17.000000000 -0200 -@@ -10,4 +10,28 @@ - - - -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/newmoon.rpmlintrc b/newmoon.rpmlintrc new file mode 100644 index 0000000..b62e8fa --- /dev/null +++ b/newmoon.rpmlintrc @@ -0,0 +1,3 @@ +# 376 warnings +addFilter("W: spurious-executable-perm") +addFilter("W: no-documentation") diff --git a/newmoon.spec b/newmoon.spec index f9e69ee..51de6e7 100644 --- a/newmoon.spec +++ b/newmoon.spec @@ -1,6 +1,6 @@ %bcond_with syshunspell -%define oname Pale-Moon +%define oname PM %define newmoon_appid \{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4\} # (tpg) MOZILLA_FIVE_HOME @@ -17,29 +17,25 @@ Summary: Web browser based on Goanna engine Name: newmoon -Version: 27.9.4 -Release: 1 +Version: 28.0.0 +Release: 2 License: MPLv2.0 Group: Networking/WWW Url: http://www.palemoon.org -Source0: https://github.com/MoonchildProductions/Pale-Moon/archive/%{version}_Release.tar.gz?/%{oname}-%{version}_Release.tar.gz +Source0: https://github.com/MoonchildProductions/UXP/archive/%{oname}%{version}_Release.tar.gz?/UXP-%{oname}%{version}_Release.tar.gz Source2: icons.tar.bz2 Source1: xulstore.json Source4: %{name}.desktop Source5: firefox-searchengines-yandex.xml Source6: firefox-searchengines-google.xml Source9: kde.js -Patch1: palemoon-27.4.0-lang.patch -Patch3: palemoon-27.4.0-disable-check-default-browser.patch -Patch5: firefox-3.5.3-default-mail-handler.patch +# https://www.mozilla.org/en-US/firefox/all/ +Source10: firefox-dictionary-61.0.2.tar.bz2 +Source100: newmoon.rpmlintrc + Patch6: palemoon-27.4.0-enable-addons.patch Patch7: palemoon-27.4.0-user-agent-overrides.patch -# Patches for KDE integration of New Moon -Patch11: palemoon-27.3.0-firefox-kde.patch -Patch12: palemoon-27.4.0-mozilla-kde.patch -Patch13: mozilla-kde-background.patch - BuildRequires: autoconf2.1 BuildRequires: doxygen BuildRequires: imagemagick @@ -57,12 +53,14 @@ BuildRequires: nss-static-devel BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) %if %{with syshunspell} BuildRequires: pkgconfig(hunspell) %endif @@ -72,8 +70,7 @@ BuildRequires: pkgconfig(libproxy-1.0) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(nspr) -# In fact, doesn't support system nss (as for 26.3.1) -BuildRequires: pkgconfig(nss) >= 3.21 +BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(python) @@ -89,7 +86,9 @@ Requires: indexhtml Requires: xdg-utils # fixes bug #42096 Requires: mailcap +%if %{with syshunspell} Suggests: hunspell-en +%endif Suggests: %{_lib}canberra0 Suggests: %{_lib}cups2 Provides: palemoon = %{EVRD} @@ -111,12 +110,13 @@ themes to make the browser truly your own. %{_bindir}/%{name} %{_iconsdir}/hicolor/*/apps/*.png %{_datadir}/applications/*.desktop +%{_datadir}/dict/mozilla/browser/branding/unofficial/* %{_libdir}/%{name}-%{version}* %dir %{_libdir}/mozilla %dir %{_libdir}/mozilla/extensions -%dir %{pluginsdir} %dir %{_libdir}/mozilla/extensions/%{newmoon_appid} %dir %{_datadir}/mozilla/extensions/%{newmoon_appid} +%dir %{pluginsdir} #---------------------------------------------------------------------------- @@ -133,20 +133,12 @@ Files and macros mainly for building New Moon extensions. #---------------------------------------------------------------------------- %prep -%setup -qn %{oname}-%{version}_Release +%setup -qn UXP-%{oname}%{version}_Release tar xf %{SOURCE2} -%patch1 -p1 -b .lang -%patch3 -p1 -b .disable-software-update -%patch5 -p1 -b .default-mail-handler %patch6 -p1 -b .addons %patch7 -p1 -b .ua -# KDE integration -%patch11 -p1 -b .kdepatch -%patch12 -p1 -b .kdemoz -%patch13 -p1 -b .kdebackground - pushd js/src autoconf-2.13 popd @@ -173,25 +165,21 @@ mk_add_options BUILD_OFFICIAL=0 mk_add_options MOZ_MAKE_FLAGS="%{_smp_mflags}" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj mk_add_options AUTOCLOBBER=1 +ac_add_options --enable-application=palemoon ac_add_options --host=%{_host} ac_add_options --target=%{_target_platform} ac_add_options --enable-optimize ac_add_options --prefix="%{_prefix}" ac_add_options --libdir="%{_libdir}" -ac_add_options --sysconfdir="%{_sysconfdir}" -ac_add_options --mandir="%{_mandir}" ac_add_options --includedir="%{_includedir}" ac_add_options --datadir="%{_datadir}" ac_add_options --with-system-nspr ac_add_options --without-system-nss ac_add_options --with-system-zlib ac_add_options --with-pthreads -ac_add_options --enable-webm ac_add_options --disable-webrtc -ac_add_options --enable-ogg ac_add_options --enable-jemalloc ac_add_options --enable-gio -ac_add_options --disable-gnomevfs ac_add_options --disable-updater ac_add_options --disable-tests ac_add_options --disable-debug @@ -201,20 +189,11 @@ ac_add_options --enable-libproxy ac_add_options --with-system-jpeg ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman -ac_add_options --enable-canvas -ac_add_options --enable-svg ac_add_options --enable-system-sqlite ac_add_options --enable-extensions=default ac_add_options --enable-startup-notification -ac_add_options --enable-libnotify -ac_add_options --enable-xinerama ac_add_options --with-distribution-id=org.rosa ac_add_options --disable-crashreporter -ac_add_options --enable-gstreamer -ac_add_options --with-valgrind -ac_add_options --disable-javaxpcom -ac_add_options --enable-opus -ac_add_options --enable-default-toolkit=cairo-gtk2 EOF @@ -224,7 +203,7 @@ export LDFLAGS="%{ldflags}" make -f client.mk build %install -make -C %{_builddir}/obj/browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0 +make -C %{_builddir}/obj/application/palemoon/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0 # Copy files to buildroot mkdir -p %{buildroot}%{mozillalibdir} @@ -245,7 +224,6 @@ mkdir -p %{buildroot}%{_datadir}/applications install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}.desktop # (tpg) icons -cp %{buildroot}%{mozillalibdir}/browser/chrome/icons/default/default16.png %{buildroot}/%{mozillalibdir}/browser/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 browser/branding/unofficial/mozicon128.png -scale ${i}x${i} %{buildroot}%{mozillalibdir}/browser/chrome/icons/default/default${i}.png @@ -258,56 +236,63 @@ rm -f %{buildroot}%{mozillalibdir}/README.txt rm -f %{buildroot}%{mozillalibdir}/removed-files rm -f %{buildroot}%{mozillalibdir}/precomplete -install -D -m644 browser/app/profile/prefs.js %{buildroot}%{mozillalibdir}/browser/defaults/profile/prefs.js -cat << EOF >> %{buildroot}%{mozillalibdir}/browser/defaults/profile/prefs.js -user_pref("browser.EULA.override", true); -user_pref("browser.shell.checkDefaultBrowser", false); -user_pref("browser.ctrlTab.previews", true); -user_pref("browser.tabs.insertRelatedAfterCurrent", false); -user_pref("browser.tabs.onTop", true); -user_pref("startup.homepage_welcome_url", "file:///usr/share/branding-configs/fresh/first_startup.html"); -user_pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html"); -user_pref("browser.startup.page", 1); -user_pref("browser.newtab.url", "about:newtab"); -user_pref("browser.search.openintab", true); -user_pref("browser.backspace_action", 2); -user_pref("browser.display.use_system_colors", true); -user_pref("browser.download.folderList", 1); -user_pref("browser.link.open_external", 3); -user_pref("app.update.auto", false); -user_pref("app.update.enabled", false); -user_pref("app.update.autoInstallEnabled", false); -user_pref("dom.ipc.plugins.enabled.nswrapper*", false); -user_pref("extensions.autoDisableScopes", 0); -user_pref("extensions.shownSelectionUI", true); -user_pref("network.manage-offline-status", true); +install -D -m644 application/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); +pref("app.update.enabled", false); +pref("browser.EULA.override", true); +pref("browser.backspace_action", 2); +pref("browser.ctrlTab.previews", true); +pref("browser.display.use_system_colors", true); +pref("browser.download.folderList", 1); +pref("browser.link.open_external", 3); +pref("browser.search.openintab", true); +pref("browser.shell.checkDefaultBrowser", false); +pref("browser.startup.homepage", "file:///usr/share/doc/HTML/index.html"); +pref("browser.startup.page", 1); +pref("browser.tabs.insertRelatedAfterCurrent", false); +pref("browser.tabs.onTop", true); +pref("dom.ipc.plugins.enabled.nswrapper*", false); +pref("extensions.autoDisableScopes", 0); +pref("extensions.shownSelectionUI", true); +pref("intl.locale.matchOS", true); +pref("network.manage-offline-status", true); +pref("startup.homepage_welcome_url", "file:///usr/share/branding-configs/fresh/first_startup.html"); EOF -install -m644 %{SOURCE1} %{buildroot}%{mozillalibdir}/browser/defaults/profile/xulstore.json +install -m644 %{SOURCE1} %{buildroot}%{mozillalibdir}/browser/defaults/preferences/xulstore.json # display icon for New Moon button -mkdir -p %{buildroot}%{mozillalibdir}/browser/defaults/profile/chrome -cat << EOF > %{buildroot}%{mozillalibdir}/browser/defaults/profile/chrome/userChrome.css -#appmenu-toolbar-button { - list-style-image: url("chrome://branding/content/icon16.png"); -} -EOF +#mkdir -p %{buildroot}%{mozillalibdir}/browser/defaults/preferences/chrome +#cat << EOF > %{buildroot}%{mozillalibdir}/browser/defaults/preferences/chrome/userChrome.css +# appmenu-toolbar-button { +# list-style-image: url("chrome://branding/content/icon16.png"); +#} +#EOF # use the system myspell dictionaries +%if %{with syshunspell} rm -fr %{buildroot}%{mozillalibdir}/dictionaries ln -s %{_datadir}/dict/mozilla/ %{buildroot}%{mozillalibdir}/dictionaries +%else +rm -fr %{buildroot}%{mozillalibdir}/dictionaries +mkdir -p %{buildroot}%{_datadir}/dict/mozilla +tar xjf %{SOURCE2} -C %{buildroot}%{_datadir}/dict/mozilla/ +ln -s %{_datadir}/dict/mozilla/ %{buildroot}%{mozillalibdir}/dictionaries +%endif # (lm) touch and %%ghost bookmarks.html to a proper uninstall -touch %{buildroot}%{mozillalibdir}/browser/defaults/profile/bookmarks.html +touch %{buildroot}%{mozillalibdir}/browser/defaults/preferences/bookmarks.html # search engines -rm -f %{buildroot}%{mozillalibdir}/browser/searchplugins/* +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 browser/locales/en-US/searchplugins/bing.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/bing.xml -cp -f browser/locales/en-US/searchplugins/duckduckgo-palemoon.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/duckduckgo-palemoon.xml -cp -f browser/locales/en-US/searchplugins/wikipedia.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/wikipedia.xml -cp -f browser/locales/en-US/searchplugins/yahoo.xml %{buildroot}%{mozillalibdir}/browser/searchplugins/yahoo.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 mkdir -p %{buildroot}%{_sys_macros_dir} cat <%{buildroot}%{_sys_macros_dir}/%{name}.macros diff --git a/palemoon-27.4.0-disable-check-default-browser.patch b/palemoon-27.4.0-disable-check-default-browser.patch deleted file mode 100644 index bbc7593..0000000 --- a/palemoon-27.4.0-disable-check-default-browser.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN Pale-Moon-27.4.0_Release/browser/app/profile/palemoon.js Pale-Moon-27.4.0_Release-patched/browser/app/profile/palemoon.js ---- Pale-Moon-27.4.0_Release/browser/app/profile/palemoon.js 2017-07-10 22:23:16.000000000 +1000 -+++ Pale-Moon-27.4.0_Release-patched/browser/app/profile/palemoon.js 2017-07-13 00:17:14.911617742 +1000 -@@ -232,7 +232,7 @@ - pref("general.useragent.complexOverride.moodle", false); // bug 797703 - - // At startup, check if we're the default browser and prompt user if not. --pref("browser.shell.checkDefaultBrowser", true); -+pref("browser.shell.checkDefaultBrowser", false); - pref("browser.shell.shortcutFavicons",true); - - // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session diff --git a/palemoon-27.4.0-enable-addons.patch b/palemoon-27.4.0-enable-addons.patch index f3326be..da4378b 100644 --- a/palemoon-27.4.0-enable-addons.patch +++ b/palemoon-27.4.0-enable-addons.patch @@ -1,6 +1,6 @@ -diff -urN Pale-Moon-27.4.0_Release/browser/app/profile/palemoon.js Pale-Moon-27.4.0_Release-patched/browser/app/profile/palemoon.js ---- Pale-Moon-27.4.0_Release/browser/app/profile/palemoon.js 2017-07-10 22:23:16.000000000 +1000 -+++ Pale-Moon-27.4.0_Release-patched/browser/app/profile/palemoon.js 2017-07-13 00:29:16.695614989 +1000 +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 @@ // Disable add-ons that are not installed by the user in all scopes by default. diff --git a/palemoon-27.4.0-lang.patch b/palemoon-27.4.0-lang.patch deleted file mode 100644 index 4f04c7b..0000000 --- a/palemoon-27.4.0-lang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN Pale-Moon-27.4.0_Release/browser/app/profile/palemoon.js Pale-Moon-27.4.0_Release-patched/browser/app/profile/palemoon.js ---- Pale-Moon-27.4.0_Release/browser/app/profile/palemoon.js 2017-07-10 22:23:16.000000000 +1000 -+++ Pale-Moon-27.4.0_Release-patched/browser/app/profile/palemoon.js 2017-07-13 00:11:50.435618980 +1000 -@@ -467,6 +467,9 @@ - pref("general.warnOnAboutConfig", false); - #endif - -+// Use system environment variable to choose locale -+pref("intl.locale.matchOS", true); -+ - // This is the pref to control the location bar, change this to true to - // force this - this makes the origin of popup windows more obvious to avoid - // spoofing. We would rather not do it by default because it affects UE for web diff --git a/palemoon-27.4.0-user-agent-overrides.patch b/palemoon-27.4.0-user-agent-overrides.patch index d142b5e..06bed64 100644 --- a/palemoon-27.4.0-user-agent-overrides.patch +++ b/palemoon-27.4.0-user-agent-overrides.patch @@ -1,6 +1,5 @@ -diff -Naur Pale-Moon-27.8.2_Release-orig/browser/branding/shared/pref/uaoverrides.inc Pale-Moon-27.8.2_Release/browser/branding/shared/pref/uaoverrides.inc ---- Pale-Moon-27.8.2_Release-orig/browser/branding/shared/pref/uaoverrides.inc 2018-03-19 14:23:27.000000000 +0300 -+++ Pale-Moon-27.8.2_Release/browser/branding/shared/pref/uaoverrides.inc 2018-03-22 17:01:41.999576064 +0300 +--- UXP-PM28.0.0_Release/application/palemoon/branding/shared/pref/uaoverrides.inc-orig 2018-08-07 15:20:47.000000000 +0300 ++++ UXP-PM28.0.0_Release/application/palemoon/branding/shared/pref/uaoverrides.inc 2018-08-29 13:07:31.182896089 +0300 @@ -30,6 +30,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)"); @@ -16,9 +15,9 @@ diff -Naur Pale-Moon-27.8.2_Release-orig/browser/branding/shared/pref/uaoverride 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@.yahoo.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)"); -@@ -62,6 +70,9 @@ - pref("@GUAO_PREF@.deviantart.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@"); - pref("@GUAO_PREF@.deviantart.net","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@"); +@@ -59,6 +67,9 @@ + pref("@GUAO_PREF@.altibox.dk","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@"); + pref("@GUAO_PREF@.altibox.no","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@"); @@ -26,7 +25,7 @@ diff -Naur Pale-Moon-27.8.2_Release-orig/browser/branding/shared/pref/uaoverride // 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"); -@@ -71,6 +82,11 @@ +@@ -68,6 +79,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 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2049.0 Safari/537.36");