98.0 rc1

2 files changed, 48 insertions, 13 deletions

diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf
index 43f262f..b63af08 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:-'97.0-1'}
+distro_firefox_version=${distro_firefox_version:-'98.0-2'}
 # current version of Firefox, as defined by name of the orig tarball.
-firefox_version=${firefox_version:-'97.0'}
+firefox_version=${firefox_version:-'98.0'}
 # Tag for LibreWolf linux repo
-librewolf_version=${librewolf_version:-'97.0-1'}
+librewolf_version=${librewolf_version:-'98.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 f62a41a..0a7e2d5 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -58,14 +58,14 @@ mkdir -p "${work_dir}" ; cd "${work_dir}"
 test -z "${SKIP_DOWNLOAD}" && {
    case "${DISTRO}" in
       ubuntu)
-         wget --content-disposition http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_"${firefox_version}".orig.tar.xz
-         wget --content-disposition http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_"${distro_firefox_version}".debian.tar.xz
-         wget --content-disposition http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_"${distro_firefox_version}".dsc
+         wget --continue --content-disposition http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_"${firefox_version}".orig.tar.xz
+         wget --continue --content-disposition http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_"${distro_firefox_version}".debian.tar.xz
+         wget --continue --content-disposition http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_"${distro_firefox_version}".dsc
          ;;
       *) # catch-all, including for Debian
-         wget --content-disposition http://deb.debian.org/debian/pool/main/f/firefox/firefox_"${firefox_version}".orig.tar.xz
-         wget --content-disposition http://deb.debian.org/debian/pool/main/f/firefox/firefox_"${distro_firefox_version}".debian.tar.xz
-         wget --content-disposition http://deb.debian.org/debian/pool/main/f/firefox/firefox_"${distro_firefox_version}".dsc
+         wget --continue --content-disposition http://deb.debian.org/debian/pool/main/f/firefox/firefox_"${firefox_version}".orig.tar.xz
+         wget --continue --content-disposition http://deb.debian.org/debian/pool/main/f/firefox/firefox_"${distro_firefox_version}".debian.tar.xz
+         wget --continue --content-disposition http://deb.debian.org/debian/pool/main/f/firefox/firefox_"${distro_firefox_version}".dsc
          ;;
    esac
 }
@@ -173,7 +173,7 @@ mkdir -p "${debian_dir}"/patches/librewolf
 if test "${DISTRO}" = "ubuntu" ; then
    cp -pr "${git_source_dir}"/common/patches/megabar.patch \
       "${git_source_dir}"/common/patches/remove_addons.patch \
-      "${git_source_dir}"/common/patches/mozilla-vpn-ad.patch \
+      "${git_source_dir}"/common/patches/mozilla-vpn-ad2.patch \
       "${git_source_dir}"/common/patches/sed-patches/disable-pocket.patch \
       "${git_source_dir}"/common/patches/context-menu.patch \
       "${git_source_dir}"/common/patches/browser-confvars.patch \
@@ -186,7 +186,7 @@ if test "${DISTRO}" = "ubuntu" ; then
    cat <<EOF >> "${debian_dir}"/patches/series
 librewolf/remove_addons.patch -p1
 librewolf/megabar.patch -p1
-librewolf/mozilla-vpn-ad.patch -p1
+librewolf/mozilla-vpn-ad2.patch -p1
 librewolf/disable-pocket.patch -p1
 librewolf/context-menu.patch -p1
 librewolf/browser-confvars.patch -p1
@@ -197,10 +197,45 @@ librewolf/stop-undesired-requests.patch -p1
 librewolf/about-dialog.patch -p1
 EOF
 else
-   cp -pr $( sed -r "${git_source_dir}"/source/assets/patches.txt -e "s@^@/${git_source_dir}/source/@" ) \
+   # for 98.0, the vpn-ad one appears to be broken, but also unnecessary?
+   cp -pr $( sed -r "${git_source_dir}"/source/assets/patches.txt -e "s@^@/${git_source_dir}/source/@" -e '/vpn-ad/d' ) \
       "${debian_dir}"/patches/librewolf/
    awk -F'/' '{print "librewolf/"$NF}' "${git_source_dir}"/source/assets/patches.txt | \
-      sed -r -e 's@$@ -p1@' >> "${debian_dir}"/patches/series
+      sed -r -e 's@$@ -p1@' -e '/vpn-ad/d' >> "${debian_dir}"/patches/series
+   # For 98.0 to fix this patch.
+   cat <<EOF >"${debian_dir}/patches/librewolf/remove-branding-urlbar.patch"
+--- a/browser/locales/en-US/browser/browser.ftl.orig	2022-03-22 12:57:21.330016999 -0400
++++ b/browser/locales/en-US/browser/browser.ftl	2022-03-22 13:01:42.740728393 -0400
+@@ -543,7 +543,7 @@
+ # A label shown above the "Firefox Suggest" (bookmarks/history) group in the
+ # urlbar results.
+ urlbar-group-firefox-suggest =
+-  .label = { -firefox-suggest-brand-name }
++  .label = Suggestions
+ 
+ # A label shown above the search suggestions group in the urlbar results. It
+ # should use sentence case.
+EOF
+   patch -p1 "${debian_dir}/patches/librewolf/remove-organization-policy-banner.patch" <<EOF
+diff --git a/patches/ui-patches/remove-organization-policy-banner.patch b/patches/ui-patches/remove-organization-policy-banner.patch
+index 688c17c..1475de9 100644
+--- a/patches/ui-patches/remove-organization-policy-banner.patch
++++ b/patches/ui-patches/remove-organization-policy-banner.patch
+@@ -1,6 +1,6 @@
+ --- a/browser/components/preferences/preferences.js
+ +++ b/browser/components/preferences/preferences.js
+-@@ -161,8 +161,6 @@
++@@ -234,8 +234,6 @@
+      this.removeAttribute("keyboard-navigation");
+    });
+  
+@@ -8,4 +8,4 @@
+ -
+    window.addEventListener("hashchange", onHashChange);
+  
+-   gotoPref().then(() => {
++   document.getElementById("focusSearch1").addEventListener("command", () => {
+EOF
    # remove xmas because it does the same tasks as what we accomplish in this script,
    # and librewolf-pren-pane because it is experimental
    sed -i -r -e '/(xmas|librewolf-pref-pane)\.patch/s/^/#/;' "${debian_dir}"/patches/series