WIP: 97.0

   debian sid is not up to firefox 97.0 yet so this is still pending.

2 files changed, 11 insertions, 28 deletions

diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf
index 434d8dc..43f262f 100644
--- a/scripts/prep-librewolf-dpkg.conf
+++ b/scripts/prep-librewolf-dpkg.conf
@@ -4,11 +4,11 @@
 # Available options for DISTRO: ubuntu debian
 DISTRO=${DISTRO:-'debian'}
 # current version of Firefox package in target distro
-distro_firefox_version=${distro_firefox_version:-'96.0.1-1'}
+distro_firefox_version=${distro_firefox_version:-'97.0-1'}
 # current version of Firefox, as defined by name of the orig tarball.
-firefox_version=${firefox_version:-'96.0.1'}
+firefox_version=${firefox_version:-'97.0'}
 # Tag for LibreWolf linux repo
-librewolf_version=${librewolf_version:-'96.0.1-1'}
+librewolf_version=${librewolf_version:-'97.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 764fe34..f62a41a 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-96.0-1
+# Latest supported version: librewolf-97.0-1
 # Author: bgstack15
 # SPDX-License-Identifier: CC-BY-SA-4.0
 # Startdate: 2020-11-29
@@ -9,7 +9,7 @@
 # Purpose: Prepare initial assets for running "dpkg-buildpackage -b -us -uc" for LibreWolf by adapting distro Firefox assets
 # History:
 #    2021-03-10 add initial Ubuntu support
-#    2022-01-18 modified to use "source" repo instead of "common" for version 96.0.1
+#    2022-01-18 modified to use "source" repo instead of "common" for version 97.0.1
 # Usage:
 #    Can send these final assets up to Open Build Service
 # References:
@@ -211,36 +211,19 @@ diff --git a/patches/remove_addons.patch b/patches/remove_addons.patch
 index a6585ed..3487f6d 100644
 --- a/patches/remove_addons.patch
 +++ b/patches/remove_addons.patch
-@@ -13,7 +13,7 @@ index 269dcb2..ed7c31d 100644
+@@ -12,7 +12,7 @@
+ -    "webcompat",
  -    "report-site-issue",
       "pictureinpicture",
-      "proxy-failover",
-- ]
+-     "proxy-failover",
 +     "search-detection",
+  ]
  diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
  index 496379c..dd6f359 100644
- --- a/browser/locales/Makefile.in
-EOF
-   # just for the dpkg, because of dpkg changes to the moz.build
-   test -n "" && patch -p1 "${debian_dir}"/patches/librewolf/xmas.patch <<EOF
-diff --git a/patches/xmas.patch b/patches/xmas.patch
-index 8d5103c..39861c3 100644
---- a/patches/xmas.patch
-+++ b/patches/xmas.patch
-@@ -35,8 +35,8 @@ diff --git a/moz.build b/moz.build
- index 41c9ad7..046e01b 100644
- --- a/moz.build
- +++ b/moz.build
--@@ -202,3 +202,5 @@ SPHINX_TREES["metrics"] = "docs/metrics"
-- SPHINX_TREES["gtest"] = "docs/gtest"
-+@@ -205,3 +205,5 @@
-+     DIRS += ["debian/extra-stuff"]
-  
-  include("build/templates.mozbuild")
- +
 EOF
 
-   # Fixes for Debian Firefox? 96.0.1
+   # Fixes for Debian Firefox? 97.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.