115.0.2-2 rc1

2 files changed, 175 insertions, 5 deletions

diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf
index 3dd9e9f..7ea7550 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:-'114.0-1'}
+distro_firefox_version=${distro_firefox_version:-'115.0.2-1'}
 # current version of Firefox, as defined by name of the orig tarball.
-firefox_version=${firefox_version:-'114.0'}
+firefox_version=${firefox_version:-'115.0.2'}
 # input git tag of source repo
-source_version=${source_version:-'114.0-1'}
+source_version=${source_version:-'115.0.2-2'}
 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 a3ce6f9..c767f5d 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-114.0-1
+# Latest supported version: librewolf-115.0.2-1
 # Author: bgstack15
 # SPDX-License-Identifier: CC-BY-SA-4.0
 # Startdate: 2020-11-29
@@ -199,6 +199,176 @@ 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 115.0.2; just defuzzing this patch
+   test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/firefox-view.patch" <<'EOF'
+--- a/patches/librewolf/firefox-view.patch	2023-07-13 15:01:06.444375138 -0400
++++ b/patches/librewolf/firefox-view.patch	2023-07-13 15:36:54.116273640 -0400
+@@ -15,8 +15,10 @@
+ # The tab pickup feature is hidden if Firefox Sync is disabled. It can also
+ # be forced to always be disabled by setting `librewolf.firefoxView.hideTabPickup`
+ # to `true`.
+---- a/browser/base/content/navigator-toolbox.inc.xhtml
+-+++ b/browser/base/content/navigator-toolbox.inc.xhtml
++Index: librewolf_115.0.2/browser/base/content/navigator-toolbox.inc.xhtml
++===================================================================
++--- librewolf_115.0.2.orig/browser/base/content/navigator-toolbox.inc.xhtml
+++++ librewolf_115.0.2/browser/base/content/navigator-toolbox.inc.xhtml
+ @@ -41,16 +41,6 @@
+        <hbox flex="1" align="end" class="toolbar-items">
+          <toolbartabstop/>
+@@ -33,8 +35,8 @@
+ -
+            <tabs id="tabbrowser-tabs"
+                  is="tabbrowser-tabs"
+-                 flex="1"
+-@@ -707,6 +697,16 @@
++                 aria-multiselectable="true"
++@@ -723,6 +713,16 @@
+                     closemenu="none"
+                     cui-areatype="toolbar"
+                     data-l10n-id="navbar-library"/>
+@@ -51,9 +53,11 @@
+    </html:template>
+  </toolbox>
+  </box>
+---- a/browser/components/customizableui/CustomizableUI.sys.mjs
+-+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
+-@@ -289,7 +289,6 @@ var CustomizableUIInternal = {
++Index: librewolf_115.0.2/browser/components/customizableui/CustomizableUI.sys.mjs
++===================================================================
++--- librewolf_115.0.2.orig/browser/components/customizableui/CustomizableUI.sys.mjs
+++++ librewolf_115.0.2/browser/components/customizableui/CustomizableUI.sys.mjs
++@@ -282,7 +282,6 @@ var CustomizableUIInternal = {
+        {
+          type: CustomizableUI.TYPE_TOOLBAR,
+          defaultPlacements: [
+@@ -61,7 +65,7 @@
+            "tabbrowser-tabs",
+            "new-tab-button",
+            "alltabs-button",
+-@@ -620,18 +619,6 @@ var CustomizableUIInternal = {
++@@ -611,18 +610,6 @@ var CustomizableUIInternal = {
+        }
+      }
+  
+@@ -80,8 +84,10 @@
+      // Unified Extensions addon button migration, which puts any browser action
+      // buttons in the overflow menu into the addons panel instead.
+      if (currentVersion < 19) {
+---- a/browser/components/firefoxview/firefoxview.html
+-+++ b/browser/components/firefoxview/firefoxview.html
++Index: librewolf_115.0.2/browser/components/firefoxview/firefoxview.html
++===================================================================
++--- librewolf_115.0.2.orig/browser/components/firefoxview/firefoxview.html
+++++ librewolf_115.0.2/browser/components/firefoxview/firefoxview.html
+ @@ -62,6 +62,7 @@
+          is="tab-pickup-container"
+          id="tab-pickup-container"
+@@ -90,9 +96,11 @@
+        >
+          <summary class="page-section-header">
+            <span
+---- a/browser/components/firefoxview/firefoxview.mjs
+-+++ b/browser/components/firefoxview/firefoxview.mjs
+-@@ -41,7 +41,26 @@ const launchFeatureTour = () => {
++Index: librewolf_115.0.2/browser/components/firefoxview/firefoxview.mjs
++===================================================================
++--- librewolf_115.0.2.orig/browser/components/firefoxview/firefoxview.mjs
+++++ librewolf_115.0.2/browser/components/firefoxview/firefoxview.mjs
++@@ -16,7 +16,26 @@ const launchFeatureTour = () => {
+    callout.showFeatureCallout();
+  };
+  
+@@ -119,13 +127,14 @@
+    Services.telemetry.setEventRecordingEnabled("firefoxview", true);
+    Services.telemetry.recordEvent("firefoxview", "entered", "firefoxview", null);
+    document.getElementById("recently-closed-tabs-container").onLoad();
+---- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+-+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+-@@ -92,57 +92,6 @@ const BASE_MESSAGES = () => [
+-     },
++Index: librewolf_115.0.2/browser/components/newtab/lib/OnboardingMessageProvider.jsm
++===================================================================
++--- librewolf_115.0.2.orig/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++++ librewolf_115.0.2/browser/components/newtab/lib/OnboardingMessageProvider.jsm
++@@ -78,57 +78,6 @@ const BASE_MESSAGES = () => [
+      trigger: { id: "protectionsPanelOpen" },
+    },
+--  {
++   {
+ -    id: "CFR_FIREFOX_VIEW",
+ -    groups: ["cfr"],
+ -    template: "cfr_doorhanger",
+@@ -176,6 +185,7 @@
+ -    // Avoid breaking existing tests that close tabs for now.
+ -    targeting: `!inMr2022Holdback && fxViewButtonAreaType != null && (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",
++     targeting: "true",
+EOF
+   # added 115.0.2; just defuzzing this patch
+   test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/stop-undesired-requests.patch" <<EOF
+--- a/patches/librewolf/stop-undesired-requests.patch	2023-07-13 15:01:06.444375138 -0400
++++ b/patches/librewolf/stop-undesired-requests.patch	2023-07-13 15:35:17.271195985 -0400
+@@ -1,8 +1,8 @@
+-diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
+-index cb7c26e..b1a56e9 100644
+---- a/browser/components/newtab/data/content/activity-stream.bundle.js
+-+++ b/browser/components/newtab/data/content/activity-stream.bundle.js
+-@@ -1576,7 +1576,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
++Index: librewolf_115.0.2/browser/components/newtab/data/content/activity-stream.bundle.js
++===================================================================
++--- librewolf_115.0.2.orig/browser/components/newtab/data/content/activity-stream.bundle.js
+++++ librewolf_115.0.2/browser/components/newtab/data/content/activity-stream.bundle.js
++@@ -1783,7 +1783,7 @@ class ASRouterAdminInner extends (extern
+          label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", {
+            className: "providerUrl",
+            target: "_blank",
+@@ -11,11 +11,11 @@
+            rel: "noopener noreferrer"
+          }, "nimbus-desktop-experiments"), ")");
+        }
+-diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
+-index 23d6bf1..4affc89 100644
+---- a/services/settings/Utils.sys.mjs
+-+++ b/services/settings/Utils.sys.mjs
+-@@ -62,6 +62,9 @@ XPCOMUtils.defineLazyGetter(lazy, "isRunningTests", () => {
++Index: librewolf_115.0.2/services/settings/Utils.sys.mjs
++===================================================================
++--- librewolf_115.0.2.orig/services/settings/Utils.sys.mjs
+++++ librewolf_115.0.2/services/settings/Utils.sys.mjs
++@@ -51,6 +51,9 @@ XPCOMUtils.defineLazyGetter(lazy, "isRun
+  // Overriding the server URL is normally disabled on Beta and Release channels,
+  // except under some conditions.
+  XPCOMUtils.defineLazyGetter(lazy, "allowServerURLOverride", () => {
+@@ -25,11 +25,11 @@
+    if (!AppConstants.RELEASE_OR_BETA) {
+      // Always allow to override the server URL on Nightly/DevEdition.
+      return true;
+-diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs
+-index a3100fa..c7bf03b 100644
+---- a/toolkit/components/search/SearchUtils.sys.mjs
+-+++ b/toolkit/components/search/SearchUtils.sys.mjs
+-@@ -157,9 +157,9 @@ var SearchUtils = {
++Index: librewolf_115.0.2/toolkit/components/search/SearchUtils.sys.mjs
++===================================================================
++--- librewolf_115.0.2.orig/toolkit/components/search/SearchUtils.sys.mjs
+++++ librewolf_115.0.2/toolkit/components/search/SearchUtils.sys.mjs
++@@ -152,9 +152,9 @@ export var SearchUtils = {
+  
+    ENGINES_URLS: {
+      "prod-main":
+@@ -39,5 +39,5 @@
+ -      "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records",
+ +      "https://%.invalid",
+      "stage-main":
+-       "https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records",
++       "https://firefox.settings.services.allizom.org/v1/buckets/main/collections/search-config/records",
+      "stage-preview":
+EOF
    # added 114.0
    test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/hide-passwordmgr.patch" <<'EOF'
 diff -aur a/patches/librewolf/hide-passwordmgr.patch b/patches/librewolf/hide-passwordmgr.patch
@@ -228,7 +398,7 @@ diff -aur a/patches/librewolf/hide-passwordmgr.patch b/patches/librewolf/hide-pa
 EOF
 
    # added 112.0.1 until defuzz-112.0 gets merged
-   test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/firefox-view.patch" <<'EOF'
+   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 b32a6bf..07fd0ed 100644
 --- a/patches/ui-patches/firefox-view.patch