summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2023-06-13 16:20:36 -0400
committerB. Stack <bgstack15@gmail.com>2023-06-13 16:20:36 -0400
commit1b7367b85de48719272a17776e697746dc11067b (patch)
treeeca67e73ca560bb69ffec8173441741291801968
parentversion 113.0 rc1 (diff)
downloadlibrewolf-debian-1b7367b85de48719272a17776e697746dc11067b.tar.gz
librewolf-debian-1b7367b85de48719272a17776e697746dc11067b.tar.bz2
librewolf-debian-1b7367b85de48719272a17776e697746dc11067b.zip
114.0-1 rc1
-rw-r--r--scripts/prep-librewolf-dpkg.conf6
-rwxr-xr-xscripts/prep-librewolf-dpkg.sh30
2 files changed, 32 insertions, 4 deletions
diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf
index 69cfa21..3dd9e9f 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:-'113.0-1'}
+distro_firefox_version=${distro_firefox_version:-'114.0-1'}
# current version of Firefox, as defined by name of the orig tarball.
-firefox_version=${firefox_version:-'113.0'}
+firefox_version=${firefox_version:-'114.0'}
# input git tag of source repo
-source_version=${source_version:-'113.0-3'}
+source_version=${source_version:-'114.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 965d3ea..a3ce6f9 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-112.0.1-2
+# Latest supported version: librewolf-114.0-1
# Author: bgstack15
# SPDX-License-Identifier: CC-BY-SA-4.0
# Startdate: 2020-11-29
@@ -199,6 +199,34 @@ 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 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
+--- a/patches/librewolf/hide-passwordmgr.patch 2022-05-22 11:05:00.568328784 -0400
++++ b/patches/librewolf/hide-passwordmgr.patch 2023-06-13 15:40:36.745607178 -0400
+@@ -1,6 +1,6 @@
+ --- a/browser/base/content/browser.js
+ +++ b/browser/base/content/browser.js
+-@@ -1847,6 +1847,13 @@ var gBrowserInit = {
++@@ -1780,6 +1780,13 @@ var gBrowserInit = {
+ )?.removeAttribute("key");
+ }
+
+@@ -16,9 +16,9 @@
+
+ --- a/browser/components/preferences/privacy.js
+ +++ b/browser/components/preferences/privacy.js
+-@@ -810,6 +810,10 @@ var gPrivacyPane = {
+- /* init HTTPS-Only mode */
+- this.initHttpsOnly();
++@@ -1136,6 +1136,10 @@ var gPrivacyPane = {
++
++ this.initDoH();
+
+ + if (Services.prefs.getBoolPref("librewolf.hidePasswdmgr", false)) {
+ + document.getElementById("passwordsGroup")?.remove();
+EOF
+
# added 112.0.1 until defuzz-112.0 gets merged
test -n "1" && 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
bgstack15