From 826da0d8803ce8258ef9b1fae7329cb2323082f9 Mon Sep 17 00:00:00 2001
From: "B. Stack" <bgstack15@gmail.com>
Date: Mon, 23 May 2022 08:22:54 -0400
Subject: add back all the LW patches

---
 scripts/prep-librewolf-dpkg.sh | 81 +++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 41 deletions(-)

(limited to 'scripts')

diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh
index 1b6cc79..66c47b9 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -196,48 +196,47 @@ librewolf/stop-undesired-requests.patch -p1
 librewolf/about-dialog.patch -p1
 EOF
 else
-#   # for 99.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@' -e '/vpn-ad/d' >> "${debian_dir}"/patches/series
-#   # For 99.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
+   # the vpn-ad was disabled at v99.0 because it was broken
+   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@' -e '/vpn-ad/d' >> "${debian_dir}"/patches/series
+   # For 99.0 to fix this patch.
+   test -n "" && 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
+   sed -i -r -e '/(xmas)\.patch/s/^/#/;' "${debian_dir}"/patches/series
    # Fixes to the LibreWolf patches for version 96.0.1.
    # remove_addons.patch will be fixed when https://gitlab.com/librewolf-community/browser/source/-/merge_requests/10
    test -n "" && patch -p1 "${debian_dir}/patches/librewolf/remove_addons.patch" <<EOF
-- 
cgit