version 111.0 rc1

2 files changed, 50 insertions, 7 deletions

diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf
index 2ff0875..c3f8c56 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:-'109.0-1'}
+distro_firefox_version=${distro_firefox_version:-'111.0-3'}
 # current version of Firefox, as defined by name of the orig tarball.
-firefox_version=${firefox_version:-'109.0'}
+firefox_version=${firefox_version:-'111.0'}
 # Tag for LibreWolf linux repo
-librewolf_version=${librewolf_version:-'109.0-1'}
+librewolf_version=${librewolf_version:-'111.0-3'}
 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 ed37853..32368e0 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-109.0-1
+# Latest supported version: librewolf-111.0-3
 # Author: bgstack15
 # SPDX-License-Identifier: CC-BY-SA-4.0
 # Startdate: 2020-11-29
@@ -199,6 +199,49 @@ 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 111.0 to patch for debian 111.0 until defuzz-111.0 gets merged
+   test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/disable-pocket.patch" <<'EOF'
+diff --git a/patches/librewolf/disable-pocket.patch b/patches/librewolf/disable-pocket.patch
+--- a/debian/patches/librewolf/disable-pocket.patch	2023-03-22 10:28:09.099519405 -0400
++++ b/debian/patches/librewolf/disable-pocket.patch	2023-03-22 13:03:46.205211526 -0400
+@@ -1,20 +1,16 @@
+-diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
+-index 43c84c3..4b4aad2 100644
+ --- a/browser/base/content/browser.js
+ +++ b/browser/base/content/browser.js
+-@@ -5478,7 +5478,6 @@ var XULBrowserWindow = {
++@@ -5479,7 +5479,6 @@ var XULBrowserWindow = {
+  
+      SafeBrowsingNotificationBox.onLocationChange(aLocationURI);
+  
+ -    SaveToPocket.onLocationChange(window);
+  
+      let originalURI;
+-     if (
+-diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.sys.mjs
+-index b2479db..7670f08 100644
++     if (aRequest instanceof Ci.nsIChannel) {
+ --- a/browser/components/BrowserGlue.sys.mjs
+ +++ b/browser/components/BrowserGlue.sys.mjs
+-@@ -1274,7 +1274,6 @@ BrowserGlue.prototype = {
++@@ -1300,7 +1300,6 @@ BrowserGlue.prototype = {
+        lazy.Normandy.init();
+      }
+  
+@@ -22,11 +18,9 @@
+  
+      AboutHomeStartupCache.init();
+  
+-diff --git a/browser/components/moz.build b/browser/components/moz.build
+-index 3b2126e..32b7831 100644
+ --- a/browser/components/moz.build
+ +++ b/browser/components/moz.build
+-@@ -44,7 +44,6 @@ DIRS += [
++@@ -45,7 +45,6 @@ DIRS += [
+      "originattributes",
+      "pagedata",
+      "places",
+EOF
    # 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
@@ -220,7 +263,7 @@ index 3702402..f4a4315 100644
       option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")
 EOF
    # added 109.0 to patch for debian 109.0 until defuzz-109.0 gets merged
-   test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/librewolf-pref-pane.patch" <<'EOF'
+   test -n "" && patch -p1 "${debian_dir}/patches/librewolf/librewolf-pref-pane.patch" <<'EOF'
 diff --git a/patches/librewolf-pref-pane.patch b/patches/librewolf-pref-pane.patch
 index b1ed478..4fcf94b 100644
 --- a/patches/librewolf-pref-pane.patch
@@ -389,8 +432,8 @@ EOF
    # remove xmas because it does the same tasks as what we accomplish in this script,
    sed -i -r -e '/(xmas)\.patch/s/^/#/;' "${debian_dir}"/patches/series
 
-   # Fixes for Debian Firefox? 97.0
-   pip3 install --user psutil==5.8.0
+   # Fixes for Debian Firefox? 97.0, not necessary by 111.0
+   #pip3 install --user psutil==5.8.0
    # there's probably a better way to do this with pip, but I don't know it.
    # Basically, we are updating importlib_metadata and attrs to min needed because
    # somehow they're wrong in the orig.tar.xz.