diff options
| -rw-r--r-- | scripts/prep-librewolf-dpkg.conf | 6 | ||||
| -rwxr-xr-x | scripts/prep-librewolf-dpkg.sh | 35 |
2 files changed, 28 insertions, 13 deletions
diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf index 742d145..eee88f4 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:-'119.0-1'} +distro_firefox_version=${distro_firefox_version:-'120.0.1-1'} # current version of Firefox, as defined by name of the orig tarball. -firefox_version=${firefox_version:-'119.0'} +firefox_version=${firefox_version:-'120.0.1'} # input git tag of source repo -source_version=${source_version:-'119.0-8'} +source_version=${source_version:-'120.0.1-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 08e97b7..3919e53 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -200,6 +200,24 @@ 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 120.0.1; just defuzzing this patch + test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/rust-gentoo-musl.patch" <<'EOF' +--- a/librewolf/rust-gentoo-musl.patch 2023-12-05 09:05:23.029244795 -0500 ++++ b/librewolf/rust-gentoo-musl.patch 2023-12-05 08:02:36.499359413 -0500 +@@ -1,5 +1,3 @@ +-diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +-index 7a2fd1ae70..7abdcaa2c1 100644 + --- a/build/moz.configure/rust.configure + +++ b/build/moz.configure/rust.configure + @@ -404,11 +404,21 @@ def detect_rustc_target( +@@ -24,4 +22,4 @@ + + + return None + +- rustc_target = find_candidate(candidates) +\ No newline at end of file ++ rustc_target = find_candidate(candidates) +EOF # added 115.0.2; just defuzzing this patch test -n "" && patch -p1 "${debian_dir}/patches/librewolf/firefox-view.patch" <<'EOF' --- a/patches/librewolf/firefox-view.patch 2023-07-13 15:01:06.444375138 -0400 @@ -489,13 +507,13 @@ 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 @@ +@@ -1,29 +1,23 @@ -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 = { ++@@ -5289,7 +5289,6 @@ var XULBrowserWindow = { SafeBrowsingNotificationBox.onLocationChange(aLocationURI); @@ -509,23 +527,20 @@ diff --git a/patches/librewolf/disable-pocket.patch b/patches/librewolf/disable- --- a/browser/components/BrowserGlue.sys.mjs +++ b/browser/components/BrowserGlue.sys.mjs -@@ -1274,7 +1274,6 @@ BrowserGlue.prototype = { -+@@ -1300,7 +1300,6 @@ BrowserGlue.prototype = { ++@@ -1421,7 +1421,6 @@ BrowserGlue.prototype = { lazy.Normandy.init(); } -@@ -22,11 +18,9 @@ + - lazy.SaveToPocket.init(); - AboutHomeStartupCache.init(); +- AboutHomeStartupCache.init(); ++ lazy.ResetPBMPanel.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", + @@ -44,7 +44,6 @@ DIRS += [ 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' |