v109.0 rc1

2 files changed, 22 insertions, 258 deletions

diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf
index 4528764..2ff0875 100644
--- a/scripts/prep-librewolf-dpkg.conf
+++ b/scripts/prep-librewolf-dpkg.conf
@@ -4,11 +4,11 @@
 # Available options for DISTRO: debian
 DISTRO=${DISTRO:-'debian'}
 # current version of Firefox package in target distro
-distro_firefox_version=${distro_firefox_version:-'108.0-2'}
+distro_firefox_version=${distro_firefox_version:-'109.0-1'}
 # current version of Firefox, as defined by name of the orig tarball.
-firefox_version=${firefox_version:-'108.0'}
+firefox_version=${firefox_version:-'109.0'}
 # Tag for LibreWolf linux repo
-librewolf_version=${librewolf_version:-'108.0-1'}
+librewolf_version=${librewolf_version:-'109.0-1'}
 settings_commit=${settings_commit:-'master'}
 CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
 output_dir=${CI_PROJECT_DIR}/out
diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh
index 6eb9c0e..aa53d80 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # File: prep-librewolf-dpkg.sh
 # Location: https://gitlab.com/bgstack15/librewolf-linux.git
-# Latest supported version: librewolf-107.0-1
+# Latest supported version: librewolf-109.0-1
 # Author: bgstack15
 # SPDX-License-Identifier: CC-BY-SA-4.0
 # Startdate: 2020-11-29
@@ -199,261 +199,25 @@ else
    awk -F'/' '{print "librewolf/"$NF}' "${git_source_dir}"/source/assets/patches.txt | \
       sed -r -e 's@$@ -p1@' -e '/vpn-ad/d' >> "${debian_dir}/patches/series"
    #echo "librewolf/webrender_ffi.patch -p1" >> "${debian_dir}/patches/series"
-   # added 107.0 to patch for debian 107.0 until defuzz-105.0 gets merged
-   test -n "" && patch -p1 "${debian_dir}/patches/librewolf/bootstrap-without-vcs.patch" <<'EOF'
-diff --git a/patches/bootstrap-without-vcs.patch b/patches/bootstrap-without-vcs.patch
-index d213d70..68db89f 100644
---- a/patches/bootstrap-without-vcs.patch
-+++ b/patches/bootstrap-without-vcs.patch
-@@ -1,8 +1,6 @@
--diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py
--index 0c5ecbf..d9a6d9d 100644
- --- a/python/mozboot/mozboot/bootstrap.py
- +++ b/python/mozboot/mozboot/bootstrap.py
--@@ -550,10 +550,7 @@ def current_firefox_checkout(env, hg: Optional[Path] = None):
-+@@ -619,10 +619,7 @@ def current_firefox_checkout(env, hg: Op
-              break
-          path = path.parent
+   # added 109.0 to patch for debian 109.0 until defuzz-109.0 gets merged
+   test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/disable-data-reporting-at-compile-time.patch" <<'EOF'
+diff --git a/patches/disable-data-reporting-at-compile-time.patch b/patches/disable-data-reporting-at-compile-time.patch
+index 3702402..f4a4315 100644
+--- a/patches/disable-data-reporting-at-compile-time.patch
++++ b/patches/disable-data-reporting-at-compile-time.patch
+@@ -1,5 +1,3 @@
+-diff --git a/browser/moz.configure b/browser/moz.configure
+-index 8653bcb..935af40 100644
+ --- a/browser/moz.configure
+ +++ b/browser/moz.configure
+ @@ -5,11 +5,11 @@
+@@ -14,5 +12,5 @@ index 8653bcb..935af40 100644
+ -imply_option("MOZ_NORMANDY", True)
+ +imply_option("MOZ_NORMANDY", False)
   
-@@ -14,8 +12,6 @@ index 0c5ecbf..d9a6d9d 100644
-  
-  
-  def update_git_tools(git: Optional[Path], root_state_dir: Path):
--diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/mozversioncontrol/mozversioncontrol/__init__.py
--index dd31f53..6f0087a 100644
- --- a/python/mozversioncontrol/mozversioncontrol/__init__.py
- +++ b/python/mozversioncontrol/mozversioncontrol/__init__.py
- @@ -684,6 +684,29 @@ class GitRepository(Repository):
-@@ -48,7 +44,7 @@ index dd31f53..6f0087a 100644
-  def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
-      """Get a repository object for the repository at `path`.
-      If `path` is not a known VCS repository, raise an exception.
--@@ -697,7 +720,7 @@ def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"):
-+@@ -697,7 +720,7 @@ def get_repository_object(path: Optional
-      elif (path / ".git").exists():
-          return GitRepository(path, git=git)
-      else:
-@@ -57,7 +53,7 @@ index dd31f53..6f0087a 100644
-  
-  
-  def get_repository_from_build_config(config):
--@@ -721,6 +744,8 @@ def get_repository_from_build_config(config):
-+@@ -721,6 +744,8 @@ def get_repository_from_build_config(con
-          return HgRepository(Path(config.topsrcdir), hg=config.substs["HG"])
-      elif flavor == "git":
-          return GitRepository(Path(config.topsrcdir), git=config.substs["GIT"])
-@@ -66,12 +62,10 @@ index dd31f53..6f0087a 100644
-      else:
-          raise MissingVCSInfo("unknown VCS_CHECKOUT_TYPE value: %s" % flavor)
-  
--diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
--index 016578b..7525139 100644
- --- a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
- +++ b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py
--@@ -168,6 +168,43 @@ class GitRepository(Repository):
--         self.run("checkout", ref)
-+@@ -495,6 +495,43 @@ class GitRepository(Repository):
-+             raise
-  
-  
- +class LocalRepository(Repository):
-@@ -114,7 +108,7 @@ index 016578b..7525139 100644
-  def get_repository(path):
-      """Get a repository object for the repository at `path`.
-      If `path` is not a known VCS repository, raise an exception.
--@@ -178,7 +215,7 @@ def get_repository(path):
-+@@ -505,7 +542,7 @@ def get_repository(path):
-          elif os.path.exists(os.path.join(path, ".git")):
-              return GitRepository(path)
-  
-EOF
-   # added 106.0.1 to patch for debian 106.0 until defuzz-106.0.1 gets merged
-   test -n "" && patch -p1 "${debian_dir}/patches/librewolf/website-appearance-ui-rfp.patch" <<EOF
-diff --git a/patches/ui-patches/website-appearance-ui-rfp.patch b/patches/ui-patches/website-appearance-ui-rfp.patch
-index 0de5504..7915e9c 100644
---- a/patches/ui-patches/website-appearance-ui-rfp.patch
-+++ b/patches/ui-patches/website-appearance-ui-rfp.patch
-@@ -1,22 +1,22 @@
- --- a/browser/components/preferences/main.js
- +++ b/browser/components/preferences/main.js
--@@ -3737,6 +3737,7 @@ const AppearanceChooser = {
-+@@ -3717,6 +3717,7 @@ const AppearanceChooser = {
-+ 
-      FORCED_COLORS_QUERY.addEventListener("change", this);
--     SYSTEM_DARK_MODE_QUERY.addEventListener("change", this);
-      Services.prefs.addObserver(PREF_USE_SYSTEM_COLORS, this);
- +    Services.prefs.addObserver("privacy.resistFingerprinting", this);
-      Services.obs.addObserver(this, "look-and-feel-changed");
-      this._update();
-    },
--@@ -3756,6 +3757,7 @@ const AppearanceChooser = {
-+@@ -3736,6 +3737,7 @@ const AppearanceChooser = {
-  
-    destroy() {
-      Services.prefs.removeObserver(PREF_USE_SYSTEM_COLORS, this);
- +    Services.prefs.removeObserver("privacy.resistFingerprinting", this);
-      Services.obs.removeObserver(this, "look-and-feel-changed");
-      FORCED_COLORS_QUERY.removeEventListener("change", this);
--     SYSTEM_DARK_MODE_QUERY.removeEventListener("change", this);
--@@ -3798,5 +3800,33 @@ const AppearanceChooser = {
-+   },
-+@@ -3775,5 +3777,33 @@ const AppearanceChooser = {
-        (AppConstants.platform == "win" ||
-          !Services.prefs.getBoolPref(PREF_USE_SYSTEM_COLORS));
-      this.warning.hidden = !forcingColorsAndNoColorSchemeSupport;
-EOF
-   # added 106.0.1, updated for 107.0; waiting for merge of defuzz-107.0
-   test -n "" && patch -p1 "${debian_dir}/patches/librewolf/firefox-view.patch" <<EOF
-diff --git a/patches/ui-patches/firefox-view.patch b/patches/ui-patches/firefox-view.patch
-index a6708c1..1d3391f 100644
---- a/patches/ui-patches/firefox-view.patch
-+++ b/patches/ui-patches/firefox-view.patch
-@@ -1,8 +1,6 @@
--diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
--index 30c9145..5e0eda8 100644
- --- a/browser/components/customizableui/CustomizableUI.jsm
- +++ b/browser/components/customizableui/CustomizableUI.jsm
--@@ -274,7 +274,6 @@ var CustomizableUIInternal = {
-+@@ -277,7 +277,6 @@ var CustomizableUIInternal = {
-        {
-          type: CustomizableUI.TYPE_TOOLBAR,
-          defaultPlacements: [
-@@ -10,7 +8,7 @@ index 30c9145..5e0eda8 100644
-            "tabbrowser-tabs",
-            "new-tab-button",
-            "alltabs-button",
--@@ -602,18 +601,6 @@ var CustomizableUIInternal = {
-+@@ -605,18 +604,6 @@ var CustomizableUIInternal = {
-          navbarPlacements.splice(newPosition, 0, "save-to-pocket-button");
-        }
-      }
-@@ -29,8 +27,6 @@ index 30c9145..5e0eda8 100644
-    },
-  
-    _updateForNewProtonVersion() {
--diff --git a/browser/components/firefoxview/firefoxview.html b/browser/components/firefoxview/firefoxview.html
--index 2fe5208..057481b 100644
- --- a/browser/components/firefoxview/firefoxview.html
- +++ b/browser/components/firefoxview/firefoxview.html
- @@ -113,7 +113,7 @@
-@@ -51,13 +47,11 @@ index 2fe5208..057481b 100644
-          <template id="colorways-no-collection-template">
-            <div class="content-container">
-              <div id="no-current-colorway-collection-notice" data-l10n-id="firefoxview-no-current-colorway-collection"></div>
--diff --git a/browser/components/firefoxview/firefoxview.mjs b/browser/components/firefoxview/firefoxview.mjs
--index 520c092..c0b2669 100644
- --- a/browser/components/firefoxview/firefoxview.mjs
- +++ b/browser/components/firefoxview/firefoxview.mjs
--@@ -4,7 +4,26 @@
-- 
-- "use strict";
-+@@ -28,7 +28,26 @@ const MediaQueryDOMSorting = {
-+   },
-+ };
-  
- +function onPrefChange() {
- +  document.getElementById("tab-pickup-container").hidden =
-@@ -82,15 +76,12 @@ index 520c092..c0b2669 100644
-    Services.telemetry.setEventRecordingEnabled("firefoxview", true);
-    Services.telemetry.recordEvent("firefoxview", "entered", "firefoxview", null);
-    document.getElementById("recently-closed-tabs-container").onLoad();
--diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
--index 616839d..f849f60 100644
- --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
- +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
--@@ -78,56 +78,6 @@ const BASE_MESSAGES = () => [
--     },
-+@@ -82,56 +82,6 @@ const BASE_MESSAGES = () => [
-      trigger: { id: "protectionsPanelOpen" },
-    },
---  {
-+   {
- -    id: "CFR_FIREFOX_VIEW",
- -    groups: ["cfr"],
- -    template: "cfr_doorhanger",
-@@ -140,13 +131,13 @@ index 616839d..f849f60 100644
- -    targeting:
- -      "!inMr2022Holdback && (currentDate|date - profileAgeCreated) / 86400000 >= 2 && tabsClosedCount >= 3 && 'browser.firefox-view.view-count'|preferenceValue == 0 && !'browser.newtabpage.activity-stream.asrouter.providers.cfr'|preferenceIsUserSet",
- -  },
--   {
-+-  {
-      id: "FX_MR_106_UPGRADE",
-      template: "spotlight",
--diff --git a/toolkit/components/nimbus/FeatureManifest.yaml b/toolkit/components/nimbus/FeatureManifest.yaml
-+     targeting: "true",
- --- a/toolkit/components/nimbus/FeatureManifest.yaml
- +++ b/toolkit/components/nimbus/FeatureManifest.yaml
--@@ -638,10 +638,6 @@ majorRelease2022:
-+@@ -663,10 +663,6 @@ majorRelease2022:
-        type: boolean
-        fallbackPref: "browser.theme.colorway-closet"
-        description: "Whether or not to show the colorway closet modal"
-EOF
-   # added 106.0.1 to patch for debian 106.0 until defuzz-106.0.1 gets merged
-   test -n "" && patch -p1 "${debian_dir}/patches/librewolf/disable-pocket.patch" <<EOF
-diff --git a/patches/sed-patches/disable-pocket.patch b/patches/sed-patches/disable-pocket.patch
-index 25e4056..c2f5182 100644
---- a/patches/sed-patches/disable-pocket.patch
-+++ b/patches/sed-patches/disable-pocket.patch
-@@ -1,8 +1,6 @@
--diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
--index f59f732..07a9a60 100644
- --- a/browser/base/content/browser.js
- +++ b/browser/base/content/browser.js
--@@ -5445,8 +5445,6 @@ var XULBrowserWindow = {
-+@@ -5466,8 +5466,6 @@ var XULBrowserWindow = {
-  
-      SafeBrowsingNotificationBox.onLocationChange(aLocationURI);
-  
-@@ -11,11 +9,9 @@ index f59f732..07a9a60 100644
-      UrlbarProviderSearchTips.onLocationChange(
-        window,
-        aLocationURI,
--diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
--index 64ac529..8cf69c1 100644
- --- a/browser/components/BrowserGlue.jsm
- +++ b/browser/components/BrowserGlue.jsm
--@@ -1269,7 +1269,6 @@ BrowserGlue.prototype = {
-+@@ -1286,7 +1286,6 @@ BrowserGlue.prototype = {
-        lazy.Normandy.init();
-      }
-  
-@@ -23,13 +19,11 @@ index 64ac529..8cf69c1 100644
-  
-      AboutHomeStartupCache.init();
-  
--diff --git a/browser/components/moz.build b/browser/components/moz.build
--index 71a1b85..ed3b6d1 100644
- --- a/browser/components/moz.build
- +++ b/browser/components/moz.build
--@@ -42,7 +42,6 @@ DIRS += [
-+@@ -44,7 +44,6 @@ DIRS += [
-      "originattributes",
--     "ion",
-+     "pagedata",
-      "places",
- -    "pocket",
-      "preferences",
-EOF
-   # added 103.0
-   test -n "" && patch -p1 "${debian_dir}/patches/librewolf/remove-snippets-from-home.patch" <<EOF
---- ../../git/source/patches/ui-patches/remove-snippets-from-home.patch	2022-03-22 19:01:35.323802032 -0400
-+++ debian/patches/librewolf/remove-snippets-from-home.patch	2022-07-29 15:41:22.727541444 -0400
-@@ -1,6 +1,6 @@
- --- a/browser/components/newtab/lib/AboutPreferences.jsm
- +++ b/browser/components/newtab/lib/AboutPreferences.jsm
--@@ -54,18 +54,7 @@
-+@@ -56,18 +56,7 @@ const PREFS_BEFORE_SECTIONS = () => [
-    },
-  ];
-  
-@@ -18,5 +18,5 @@
- -];
- +const PREFS_AFTER_SECTIONS = () => [];
-  
-- this.AboutPreferences = class AboutPreferences {
-+ class AboutPreferences {
-    init() {
+- with only_when(target_is_linux & compile_environment):
++ with only_when(target_has_linux_kernel & compile_environment):
+      option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")
 EOF
    # added 101.0.1
    # ref: https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch