sq - icecat

2 files changed, 12 insertions, 11 deletions

diff --git a/libre/icecat/9003-misc-libre.patch b/libre/icecat/9003-misc-libre.patch
index d56131725..680440575 100644
--- a/libre/icecat/9003-misc-libre.patch
+++ b/libre/icecat/9003-misc-libre.patch
@@ -1,17 +1,18 @@
-diff -rupN browser/app/profile/icecat.js browser/app/profile/icecat.js
---- browser/app/profile/icecat.js	2020-10-24 04:33:19.000000000 +0200
-+++ browser/app/profile/icecat.js	2020-12-15 13:35:02.966838162 +0100
-@@ -1303,10 +1303,6 @@ pref("browser.newtabpage.activity-stream
- pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", "{\"id\":\"cfr\",\"enabled\":true,\"type\":\"remote-settings\",\"bucket\":\"cfr\",\"frequency\":{\"custom\":[{\"period\":\"daily\",\"cap\":1}]},\"categories\":[\"cfrAddons\",\"cfrFeatures\"],\"updateCycleInMs\":3600000}");
+diff --git a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js
+index b82977b..df807c7 100644
+--- a/browser/app/profile/icecat.js
++++ b/browser/app/profile/icecat.js
+@@ -1465,10 +1465,6 @@ pref("browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts",
+ pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", "{\"id\":\"cfr\",\"enabled\":true,\"type\":\"remote-settings\",\"bucket\":\"cfr\",\"updateCycleInMs\":3600000}");
  pref("browser.newtabpage.activity-stream.asrouter.providers.whats-new-panel", "{\"id\":\"whats-new-panel\",\"enabled\":true,\"type\":\"remote-settings\",\"bucket\":\"whats-new-panel\",\"updateCycleInMs\":3600000}");
- pref("browser.newtabpage.activity-stream.asrouter.providers.message-groups", "{\"id\":\"message-groups\",\"enabled\":false,\"type\":\"remote-settings\",\"bucket\":\"message-groups\",\"updateCycleInMs\":3600000}");
+ pref("browser.newtabpage.activity-stream.asrouter.providers.message-groups", "{\"id\":\"message-groups\",\"enabled\":true,\"type\":\"remote-settings\",\"bucket\":\"message-groups\",\"updateCycleInMs\":3600000}");
 -// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
 -// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
 -// repackager of this code using an alternate snippet url, please keep your users safe
--pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "{\"id\":\"snippets\",\"enabled\":true,\"type\":\"remote\",\"url\":\"https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/\",\"updateCycleInMs\":14400000}");
- pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "{\"id\":\"messaging-experiments\",\"enabled\":true,\"type\":\"remote-experiments\",\"messageGroups\":[\"cfr\",\"whats-new-panel\",\"moments-page\",\"snippets\",\"cfr-fxa\",\"aboutwelcome\"],\"updateCycleInMs\":3600000}");
+-pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "{\"id\":\"snippets\",\"enabled\":false,\"type\":\"remote\",\"url\":\"https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/\",\"updateCycleInMs\":14400000}");
+ pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "{\"id\":\"messaging-experiments\",\"enabled\":true,\"type\":\"remote-experiments\",\"messageGroups\":[\"cfr\",\"whats-new-panel\",\"moments-page\",\"cfr-fxa\",\"aboutwelcome\",\"infobar\"],\"updateCycleInMs\":3600000}");
  
- // The pref that controls if ASRouter uses the remote fluent files.
+ // ASRouter user prefs
 diff -rupN browser/locales/en-US/chrome/browser-region/region.properties browser/locales/en-US/chrome/browser-region/region.properties
 --- browser/locales/en-US/chrome/browser-region/region.properties	2020-10-24 04:33:19.000000000 +0200
 +++ browser/locales/en-US/chrome/browser-region/region.properties	2020-12-15 13:41:00.218218564 +0100
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 1cde45b09..a80953223 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -59,7 +59,7 @@ sha256sums=('74e4cbe35c6e121d9c9059b1383717e5729bbc0b7ea877cd295f4e34a473b1ee'
             'bb9769a8fe720abea2bba5b895c70c4fba0d44bb553399d83350268edf85cdeb')
 #             'e0eaec8ddd24bbebf4956563ebc6d7a56f8dada5835975ee4d320dd3d0c9c442')
 sha256sums+=('3edb4add450f94c579f2df7c16ac4d9bd9f5c6acf3fbd8a05ce24c21c317257d'
-             '6f1c667e561440b8d6b23eba66be19605888de9af45488b155b52d70adc6b5bc')
+             'd2fad03ce7226b403129b520b698c49e545c7aa881cfc9c326de155cb4879f55')
 sha256sums_i686=('068efe37a99561490e6ec7b70a3cd4dd84e89e6bdf19f04a475d06c78fd28920')
 validpgpkeys=('318C679D94F17700CC847DE646A70073E4E50D4E') # Ruben Rodriguez
 validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger (VCS builds)
@@ -237,7 +237,7 @@ END
 
   # Remove remaining non-free bits
   echo "applying 9003-misc-libre.patch"
-  patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9003-misc-libre.patch
+  patch -Np1 -i "${srcdir}"/9003-misc-libre.patch
 }
 
 build() {