Merge branch 'newmoon-bump' into 'master'

Palemoon 28.15.0

See merge request bgstack15/stackrpms!199

2 files changed, 32 insertions, 19 deletions

diff --git a/newmoon/debian/patches/pm-to-nm.patch b/newmoon/debian/patches/pm-to-nm.patch
index ac7904b..f667644 100644
--- a/newmoon/debian/patches/pm-to-nm.patch
+++ b/newmoon/debian/patches/pm-to-nm.patch
@@ -1,5 +1,5 @@
 Date: 2020-10-01
-Upstream version: 28.14.1
+Upstream version: 28.15.0
 Purpose: Use newmoon branding instead of palemoon
 Message: Some of the changes include using ~/.config/newmoon for the profile location, using "newmoon" branding instead of "palemoon" or "browser", some bookmark tweaks to hide the old branding,
 I used newmoon itself to save a bookmark, and then export the bookmarks to an html file. Then I grabbed the relevant entries and placed them here. Also, I move the "Most Visited" link to bookmarks menu and not on the toolbar.
@@ -29,16 +29,14 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/app/application.ini Pale-Moon-28.1
 \ No newline at end of file
 +#endif
 diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/shared/locales/browserconfig.properties Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/locales/browserconfig.properties
---- Pale-Moon-28.14.1_Release/palemoon/branding/shared/locales/browserconfig.properties	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/locales/browserconfig.properties	2020-10-01 17:14:16.203289213 -0400
-@@ -3,5 +3,5 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
+--- pale-moon.orig/palemoon/branding/shared/locales/browserconfig.properties  2020-10-24 07:14:54.000000000 -0400
++++ pale-moon/palemoon/branding/shared/locales/browserconfig.properties 2020-10-27 20:35:29.301883148 -0400
+@@ -1,3 +1,3 @@
  # Do NOT localize or otherwise change these values
 -browser.startup.homepage=http://start.palemoon.org/
 -browser.startup.homepage_reset=http://start.palemoon.org/
-+browser.startup.homepage=https://start.duckduckgo.com/
-+browser.startup.homepage_reset=https://start.duckduckgo.com/
++browser.startup.homepage=http://start.duckduckgo.com/
++browser.startup.homepage_reset=http://start.duckduckgo.com/
 diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/shared/pref/preferences.inc Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/pref/preferences.inc
 --- Pale-Moon-28.14.1_Release/palemoon/branding/shared/pref/preferences.inc	2020-09-29 17:11:51.000000000 -0400
 +++ Pale-Moon-28.14.1_Release.new/palemoon/branding/shared/pref/preferences.inc	2020-10-01 17:14:16.203289213 -0400
@@ -168,21 +166,36 @@ diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/locales/en-US/
  
  syncBrandShortName=Sync
 diff -Naur Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/pref/palemoon-branding.js Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/pref/palemoon-branding.js
---- Pale-Moon-28.14.1_Release/palemoon/branding/unofficial/pref/palemoon-branding.js	2020-09-29 17:11:51.000000000 -0400
-+++ Pale-Moon-28.14.1_Release.new/palemoon/branding/unofficial/pref/palemoon-branding.js	2020-10-01 17:16:43.813154771 -0400
-@@ -3,9 +3,9 @@
- #include ../../shared/pref/preferences.inc

- #include ../../shared/pref/uaoverrides.inc

+--- pale-moon.orig/palemoon/branding/unofficial/pref/palemoon-branding.js	2020-10-24 07:14:54.000000000 -0400
++++ pale-moon/palemoon/branding/unofficial/pref/palemoon-branding.js	2020-10-27 21:06:40.837761688 -0400
+@@ -18,18 +18,18 @@
+ pref("image.mem.max_ms_before_yield", 50);

+ pref("image.mem.decode_bytes_at_a_time", 65536);

  

+-pref("services.sync.serverURL","https://pmsync.palemoon.org/sync/index.php/");

+-pref("services.sync.jpake.serverURL","https://keyserver.palemoon.org/");

+-pref("services.sync.termsURL", "http://www.palemoon.org/sync/terms.shtml");

+-pref("services.sync.privacyURL", "http://www.palemoon.org/sync/privacy.shtml");

+-pref("services.sync.statusURL", "https://pmsync.palemoon.org/status/");

+-pref("services.sync.syncKeyHelpURL", "http://www.palemoon.org/sync/help/recoverykey.shtml");

++pref("services.sync.serverURL","https://example.com/sync/index.php/");

++pref("services.sync.jpake.serverURL","https://example.com/");

++pref("services.sync.termsURL", "https://example.com/sync/terms.shtml");

++pref("services.sync.privacyURL", "https://example.com/sync/privacy.shtml");

++pref("services.sync.statusURL", "https://example.com/status/");

++pref("services.sync.syncKeyHelpURL", "https://example.com/sync/help/recoverykey.shtml");

+ pref("services.sync.APILevel", 1);

+ 

+ pref("accessibility.force_disabled", 1);

+ pref("devtools.selfxss.count", 5);

 -pref("startup.homepage_welcome_url","http://www.palemoon.org/unofficial.shtml");

 -pref("startup.homepage_override_url","http://www.palemoon.org/unofficial.shtml");

 -pref("app.releaseNotesURL", "http://www.palemoon.org/releasenotes.shtml");

-+pref("startup.homepage_welcome_url","https://start.duckduckgo.com");

-+pref("startup.homepage_override_url","http://start.duckduckgo.com");

++pref("startup.homepage_welcome_url","http://start.duckduckgo.com/unofficial.shtml");

++pref("startup.homepage_override_url","http://start.duckduckgo.com/unofficial.shtml");

 +pref("app.releaseNotesURL", "");

- 

- // Updates disabled

  pref("app.update.enabled", false);

+ pref("app.update.url", "");

 diff -Naur Pale-Moon-28.14.1_Release/palemoon/components/nsBrowserGlue.js Pale-Moon-28.14.1_Release.new/palemoon/components/nsBrowserGlue.js
 --- Pale-Moon-28.14.1_Release/palemoon/components/nsBrowserGlue.js	2020-09-29 17:11:51.000000000 -0400
 +++ Pale-Moon-28.14.1_Release.new/palemoon/components/nsBrowserGlue.js	2020-10-01 17:14:16.203289213 -0400
diff --git a/newmoon/debian/patches/series b/newmoon/debian/patches/series
index 660c64a..d8bf9aa 100644
--- a/newmoon/debian/patches/series
+++ b/newmoon/debian/patches/series
@@ -1,6 +1,6 @@
 small-icons.patch
 pm-devuan.patch
 pm-to-nm.patch
-UXP-eliminate-need-for-GTK-2.patch
-UXP-GTK-3-interface-Ensure-horizontal-scrollbars-are-not-too-tall.patch
+#UXP-GTK-3-interface-Ensure-horizontal-scrollbars-are-not-too-tall.patch
+#UXP-eliminate-need-for-GTK-2.patch
 UXP-strip-object-files-before-shared-library-linking.patch