libre/iceweasel: 120.0.parabola1

Update python-zstandard patch, tested it works.

5 files changed, 70 insertions, 66 deletions

diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch
index 721c30ce4..31f4a5b36 100644
--- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch
+++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch
@@ -38,7 +38,7 @@ If necessary, missing files can be added later.
  13 files changed, 20 insertions(+), 20 deletions(-)
 
 diff --git a/browser/components/newtab/bin/import-rollouts.js b/browser/components/newtab/bin/import-rollouts.js
-index 8208c51aef..d012db2b25 100644
+index ce22d4a114..b2dc35e9d9 100644
 --- a/browser/components/newtab/bin/import-rollouts.js
 +++ b/browser/components/newtab/bin/import-rollouts.js
 @@ -36,7 +36,7 @@ const jsonschema = require("../../../../third_party/js/cfworker/json-schema.js")
@@ -50,15 +50,15 @@ index 8208c51aef..d012db2b25 100644
  const EXPERIMENTER_URL = "https://experimenter.services.mozilla.com/nimbus/";
  const OUTPUT_PATH = "./test/NimbusRolloutMessageProvider.sys.mjs";
  const LICENSE_STRING = `/* This Source Code Form is subject to the terms of the Mozilla Public
-@@ -89,7 +89,7 @@ const cli = meow(
-   }
- );
+@@ -237,7 +237,7 @@ async function main() {
+     }
+   );
+ 
+-  const RECORDS_URL = `${BASE_URL}${cli.flags.collection}/records`;
++  const RECORDS_URL = `${BASE_URL}${cli.flags.collection}.json`;
  
--const RECORDS_URL = `${BASE_URL}${cli.flags.collection}/records`;
-+const RECORDS_URL = `${BASE_URL}${cli.flags.collection}.json`;
+   console.log(`Fetching records from ${chalk.underline.yellow(RECORDS_URL)}`);
  
- function fetchJSON(url) {
-   return new Promise((resolve, reject) => {
 diff --git a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
 index 3762be9c99..1a9c5028ff 100644
 --- a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx
@@ -216,19 +216,6 @@ index b430666f68..0f640980ae 100644
  #endif
  
    REMOTE_SETTINGS_VERIFY_SIGNATURE:
-diff --git a/toolkit/mozapps/defaultagent/RemoteSettings.cpp b/toolkit/mozapps/defaultagent/RemoteSettings.cpp
-index 37a376ff90..ef73563f85 100644
---- a/toolkit/mozapps/defaultagent/RemoteSettings.cpp
-+++ b/toolkit/mozapps/defaultagent/RemoteSettings.cpp
-@@ -25,7 +25,7 @@ extern "C" {
- HRESULT IsAgentRemoteDisabledRust(const char* szUrl, DWORD* lpdwDisabled);
- }
- 
--#define PROD_ENDPOINT "https://firefox.settings.services.mozilla.com/v1"
-+#define PROD_ENDPOINT "resource://app/defaults/settings"
- #define PROD_BID "main"
- #define PROD_CID "windows-default-browser-agent"
- #define PROD_ID "state"
 diff --git a/third_party/rust/remote_settings/.cargo-checksum.json b/third_party/rust/remote_settings/.cargo-checksum.json
 index 8794c625fe..d2752e72ef 100644
 --- a/third_party/rust/remote_settings/.cargo-checksum.json
@@ -1127,4 +1114,3 @@ index 3893cdcdf2..adf85992a4 100644
      case CRLiteMode::TelemetryOnly:
 -- 
 2.42.0
-
diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch
index 30950e7a8..b13653a81 100644
--- a/libre/iceweasel/9002-FSDG-preference-defaults.patch
+++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch
@@ -134,9 +134,9 @@ Subject: [PATCH 3/5] FSDG: Remove some references to AMO
 
 [1] https://labs.parabola.nu/issues/2409#note-4
 ---
- browser/app/profile/firefox.js | 12 ++++++------
- mobile/android/app/mobile.js   |  8 ++++----
- modules/libpref/init/all.js    |  8 ++++----
+ browser/app/profile/firefox.js        | 12 ++++++------
+ mobile/android/app/geckoview-prefs.js |  8 ++++----
+ modules/libpref/init/all.js           |  8 ++++----
  3 files changed, 14 insertions(+), 14 deletions(-)
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -162,24 +162,25 @@ index 801816dc41..9c2562ff23 100644
  
  // The URL for the privacy policy related to recommended extensions.
  pref("extensions.recommendations.privacyPolicyUrl", "https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_content=privacy-policy-link#addons");
-diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
-index 7364651c6e..d18e18a95b 100644
---- a/mobile/android/app/mobile.js
-+++ b/mobile/android/app/mobile.js
-@@ -106,10 +106,10 @@ pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla
+diff --git a/mobile/android/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js
+index c1983abc2b..35c24e5d43 100644
+--- a/mobile/android/app/geckoview-prefs.js
++++ b/mobile/android/app/geckoview-prefs.js
+@@ -228,11 +228,11 @@ pref("extensions.experiments.enabled", false);
+ // Support credit cards in GV autocomplete API (bug 1691819)
+ pref("extensions.formautofill.addresses.capture.enabled", true);
  
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
 -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/collections/4757633/mob/?page=1&collection_sort=-popularity");
++pref("extensions.getAddons.browseAddons", "");
+ pref("extensions.getAddons.cache.enabled", true);
 -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v4/addons/search/?guid=%IDS%&lang=%LOCALE%");
 -pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v4/addons/language-tools/?app=android&type=language&appversion=%VERSION%");
-+pref("extensions.getAddons.search.browseURL", "");
-+pref("extensions.getAddons.browseAddons", "");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
 +pref("extensions.getAddons.get.url", "");
 +pref("extensions.getAddons.langpacks.url", "");
++pref("extensions.getAddons.search.browseURL", "");
  
- /* Don't let XPIProvider install distribution add-ons; we do our own thing on mobile. */
+ // Don't let XPIProvider install distribution add-ons; we do our own thing on mobile
  pref("extensions.installDistroAddons", false);
 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
 index c9d67004a2..e14f539172 100644
@@ -329,4 +330,29 @@ index f58075204d..a2ffbec390 100644
 2.42.0
 
 
+From e0f27816208ff4371f9de3e2a9190f1a26a4a2f8 Mon Sep 17 00:00:00 2001
+From: grizzlyuser <grizzlyuser@protonmail.com>
+Date: Fri, 17 Nov 2023 20:52:18 +0100
+Subject: [PATCH] FSDG: Put a fuse, to blow up when upstream switches to
+ search-config-v2
+
+process-json-files.py will probably need rework.
+---
+ modules/libpref/init/all.js | 2 ++
+ 1 file changed, 2 insertions(+)
 
+diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
+index 86bfe71247..af91481d2d 100644
+--- a/modules/libpref/init/all.js
++++ b/modules/libpref/init/all.js
+@@ -3462,6 +3462,8 @@ pref("browser.search.removeEngineInfobar.enabled", true);
+ // Enables a new search configuration style with no functional changes for the
+ // user. This is solely intended as a rollout button - it will go away once the
+ // new configuration has been rolled out.
++//
++// Extra comment, so the patch fails to apply as soon as the line below is changed upstream.
+ pref("browser.search.newSearchConfig.enabled", false);
+ 
+ // GMPInstallManager prefs
+-- 
+2.42.1
diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch
index ffb073f95..dbbf48426 100644
--- a/libre/iceweasel/9004-FSDG-misc.patch
+++ b/libre/iceweasel/9004-FSDG-misc.patch
@@ -342,10 +342,10 @@ index df8a1997a7..d3cafd9c7f 100644
    // toolkit/components/pdfjs/content/build/pdf.js
    "resource://pdf.js/web/images/",
 diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-index bcc02aba5f..6a36bfb797 100644
+index 49a76defeb..38407b8e4b 100644
 --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
 +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
-@@ -513,315 +513,6 @@ const BASE_MESSAGES = () => [
+@@ -505,315 +505,6 @@ const BASE_MESSAGES = () => [
        ],
      },
    },
@@ -659,7 +659,7 @@ index bcc02aba5f..6a36bfb797 100644
 -    targeting: "localeLanguageCode == 'de'",
 -  },
    {
-     id: "PB_NEWTAB_INFO_SECTION",
+     id: "PB_NEWTAB_PIN_PROMO",
      template: "pb_newtab",
 diff --git a/browser/components/newtab/lib/PanelTestProvider.sys.mjs b/browser/components/newtab/lib/PanelTestProvider.sys.mjs
 index b5ff59290a..eb5fc60451 100644
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index c05b2abd1..9c5060590 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -70,10 +70,10 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=119.0.1
+pkgver=120.0
 pkgrel=1
 pkgrel+=.parabola1
-_brandingver=119.0
+_brandingver=120.0
 _brandingrel=1
 pkgdesc="Standalone web browser derived from Mozilla Firefox"
 url=https://wiki.parabola.nu/Iceweasel
@@ -164,7 +164,7 @@ source+=(
   9004-FSDG-misc.patch
   process-json-files.py
   vendor.js.in
-  zstandard-0.21.0.diff
+  zstandard-0.22.0.diff
 )
 source_i686=(
   avoid-libxul-OOM-python-check.patch
@@ -184,37 +184,37 @@ validpgpkeys+=(
 )
 
 
-sha256sums=('48cc43cab060e97467e9a17617f511a177e7b91b7e77e408425351a2cbb07f70'
+sha256sums=('e710058701074eda53ca9f5fd52c57254858a027984f735bdcd58d6906f6b574'
             'SKIP'
             '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') # $pkgname.desktop
                                                                                 # identity-icons-brand.svg
-sha256sums+=('6af335bf59b5d5147e4883154d623826b57cbc3d9e41770a334ae2afe772ba6e'  # *.branding.tar.xz
+sha256sums+=('3fc4fcc7f471a831b2e00e3b8698b382fd6d0d0cbfc55b20ff73364be2ee5b96'  # *.branding.tar.xz
              'SKIP'
-             'b01209c5462237dff3ff7788e7bfedad7a327d9d2759dd65c77cfb71667f2fbd'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
-             '65d9a18b9b2b3f1034b427af486c82416c360c0e9254ada42d81ff2b7132b1ca'  # 9002-FSDG-preference-defaults.patch
+             '4ff07eff69343e50357c9bb571dfa6a702efb3a7915ce8ca8dcb42ee18446aac'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
+             '77ce3e4de9b4bb280a6766cea61b0fbd81f0f946aa115bfe7bf24eca370e1d17'  # 9002-FSDG-preference-defaults.patch
              '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62'  # 9003-FSDG-urihandlers.patch
-             '75c437e73c4a8007251581c957d3d36b85ba77270a72411ff5185a201cfeac6f'  # 9004-FSDG-misc.patch
+             'f999ddb5a2cde87217bb5b0ebf20b4e0aabe88657a73545c9487cddde1deab22'  # 9004-FSDG-misc.patch
              '00cb44a91b42942f17258ad165810866ff123777b667a5691ea0745ba72f4332'  # process-json-files.py
              '86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06'  # vendor.js.in
-             'aa663d899e924f4979114584cad671dad3b93dd9b0dfe28bb1cf11ddf92e6d47') # zstandard-0.21.0.diff
+             '3803336b109ab3663d227d6d16f712c33f5c55712028ee74e6e82f2ef74bf55f') # zstandard-0.22.0.diff
 sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1c0'  # avoid-libxul-OOM-python-check.patch
                  'b25d9fb901afc5447bcd87416741f705eb7188502e10097387d5b0c86417fd01'  # rust-static-disable-network-test-on-static-libraries.patch
                  'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1'  # firefox-111.0.1-fdlibm.patch
                  '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06'  # fix-i686-build-moz-1792159.patch
                  'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch
-b2sums=('b5a2ceadf05692d482dc8114634902d33c32c908e60394bf2e6b38afd8d83830d40c83afec28f7257e269595196140c0a8a1f345232f29c649a202d51ca39c68'
+b2sums=('06f11d9d6f705c13c3288f1757d68c7c910e258b3efa643f0f0168fba0d585f758082af3905c951e227894df0c092965663f52196ee1fc3477195748e0049767'
         'SKIP'
         'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635') # $pkgname.desktop
                                                                                                                                             # identity-icons-brand.svg
-b2sums+=('8946e6e2dbfca390d69d79d409f8c4dbf74522c96a038a79659869f697ba3aafc0289e4ebc5ba21508cc2ef070d2859cee07b1b8052991d4c17ed992fef8bed1'  # *.branding.tar.xz
+b2sums+=('026f09cddb198badbf6ae67dda21ac9f99cfa80cfa490732b7b3c52eb43cfc83c3ae163506bdad657beaa368c3eba17dd154fdb1c8c40ab2d4f7934004982aa8'  # *.branding.tar.xz
          'SKIP'
-         'cc79ed221206fcc4ec63f4d5e2e430a2993904077a5074d9bfa193911401199d5d8df01c392fdab0adfdce4085938855ab3098556630cc6fd377d5cf97d00b25'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
-         '2d2174819ec281314a5c736c05e647c8ba270670e92fc9a4c17496a2ac45da4514095ae57db05253cf48513e42d58eda87b28c9c62c119d5a4788fcaab01d213'  # 9002-FSDG-preference-defaults.patch
+         '9834f69d69f9ce3cee872a7e75b6848d5539b94752aa50c74612177a740319a33b02734f1d2cdde31ee50efa7a3ed85cf85efb7e6687cfe6ab7be843b4089e7b'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
+         '702f3179595ce27660e9761811369158a8102c94e77ccb28d3a58026641b055e53f9ec45a1272346eada54021d02956360e1267728fbec201c50fee42c7d677f'  # 9002-FSDG-preference-defaults.patch
          'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde'  # 9003-FSDG-urihandlers.patch
-         '878b4aa544b65dac165e329e3cbcb88d4ee8cdc41a5c47a9e1bc332c3f52912fd73836072e60da907c825a062695d34478d52886aa05a76915852e6dbd892e91'  # 9004-FSDG-misc.patch
+         '7d7c9a67ef8035f85482b37d0b7b7743f005d5e7f48d1865f21745ebd10053ed8a6c15e1e176f42d5ef738e7bb074bdad8e912983ca4614a2aab50b95824a4a6'  # 9004-FSDG-misc.patch
          '085c4631ec8cfdf5842068d882185c783e976b1fde74167bb71ef4d7db8c70c12844177b17e76f858ba3ce2a402848ac8fc19910dcbefd29887abfaf5faac5e4'  # process-json-files.py
          'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9'  # vendor.js.in
-         '2e568bb28f23f0f9225ca68a5084e3e835f6bd15046eea9d615d3462146da649c1b6b7439b4d768759bda2658d54ca73c9b3479e5e0b6d7a58822664dbe45aa2') # zstandard-0.21.0.diff
+         '6176a2e4b7a651b50b1ca2d6c8b62b1fd7557cacff50f38cb87f126590d9a2ac8d9b249c1671be0551cc81ce9a028a22e9b29ac121e480dab61cd7c10b891d50') # zstandard-0.22.0.diff
 b2sums_i686=('684559d207d33e8b83c70d79ddb8b4d7532f2440895668245856553e02b6c786cf0de776981cdcce2438c7add2d692f4afbc85255949558852bdec9800c59882'  # avoid-libxul-OOM-python-check.patch
              '32c60a9259f9ab6b950c0a3af81e4c36c14160860d3b9da70aa3fbc3676e5fd2b2705b02d7e6b6ac49f9510577de89ab2334abe3b0a126e3d70e65ac42ba62c9'  # rust-static-disable-network-test-on-static-libraries.patch
              '05c7c9727201971650df4ca2e00539767fc9e159539835c641fccab5ec9577a7294e8f62f5d0670158316e5467ea121c03a36fd4ba153e1d60f3402f0430548d'  # firefox-111.0.1-fdlibm.patch
@@ -266,9 +266,6 @@ armv7h)
 
   depends+=( libicudata.so libicui18n.so libicuuc.so ) # --with-system-icu
 
-  # zstandard<=0.21.0,>=0.11.1: Installed with unexpected version "0.22.0"
-  makedepends=( ${makedepends[*]/python-zstandard/python-zstandard<=0.21.0} ) # archived
-
   # warning: obj/dist/system_wrappers/cmath:3:15: fatal error: 'cmath' file not found
   (( _USE_ALT_COMPILER )) || makedepends=( ${makedepends[*]/llvm/llvm15} llvm15-libs )
   # still FTBS
@@ -281,10 +278,6 @@ i686)
   #       and ... nss>=3.94 is required; but it FTBS
   # still FTBS
   ;;
-x86_64)
-  # zstandard<=0.21.0,>=0.11.1: Installed with unexpected version "0.22.0"
-  makedepends=( ${makedepends[*]/python-zstandard/python-zstandard<=0.21.0} ) # archived
-  ;;
 esac
 
 
@@ -367,12 +360,11 @@ prepare() {
   mkdir mozbuild
   cd firefox-$pkgver
 
-
   ## technical patching ##
 
-  # Unbreak build with python-zstandard 0.21.0
-  echo "applying zstandard-0.21.0.diff"
-  patch -Np1 -i ../zstandard-0.21.0.diff
+  # Unbreak build with python-zstandard 0.22.0
+  echo "applying zstandard-0.22.0.diff"
+  patch -Np1 -i ../zstandard-0.22.0.diff
 
   # Use system python-typing-extensions instead of the old vendored one to avoid
   # unresolvable dependency versions. They are probably downloaded when network
diff --git a/libre/iceweasel/zstandard-0.21.0.diff b/libre/iceweasel/zstandard-0.22.0.diff
index f99ef3eb3..ed3083d9c 100644
--- a/libre/iceweasel/zstandard-0.21.0.diff
+++ b/libre/iceweasel/zstandard-0.22.0.diff
@@ -7,4 +7,4 @@ index d105723399..b10a7e42d7 100644
  # support down to the oldest locally-installed version (5.4.2).
  pypi-optional:psutil>=5.4.2,<=5.9.4:telemetry will be missing some data
 -pypi-optional:zstandard>=0.11.1,<=0.19.0:zstd archives will not be possible to extract
-+pypi-optional:zstandard>=0.11.1,<=0.21.0:zstd archives will not be possible to extract
++pypi-optional:zstandard>=0.11.1,<=0.22.0:zstd archives will not be possible to extract