From 805a1725af02c53400e8d8456e050391545109cc Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Sun, 14 Feb 2021 01:24:13 +0100 Subject: prepare v85.0.2-1. still needs upstream debian xz for this version --- scripts/build-librewolf-dpkg.conf | 6 +++--- scripts/prep-librewolf-dpkg.conf | 4 ++-- scripts/prep-librewolf-dpkg.sh | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/build-librewolf-dpkg.conf b/scripts/build-librewolf-dpkg.conf index f628ce1..8e84b53 100644 --- a/scripts/build-librewolf-dpkg.conf +++ b/scripts/build-librewolf-dpkg.conf @@ -1,10 +1,10 @@ # Config file for prep-librewolf-dpkg.sh # Configure these settings before running that script. -debian_firefox_version=${debian_firefox_version:-'85.0.1-1'} # current version of Firefox package in Debian sid -pkgver=${pkgver:-'85.0.1'} +debian_firefox_version=${debian_firefox_version:-'85.0.2-1'} # current version of Firefox package in Debian sid +pkgver=${pkgver:-'85.0.2'} pkgrel=${pkgrel:-'1'} -firefox_version=${pkgver:-'85.0.1'} # current version of Firefox +firefox_version=${pkgver:-'85.0.2'} # current version of Firefox 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.conf b/scripts/prep-librewolf-dpkg.conf index cdbeeb3..05fa4f5 100644 --- a/scripts/prep-librewolf-dpkg.conf +++ b/scripts/prep-librewolf-dpkg.conf @@ -1,8 +1,8 @@ # Config file for prep-librewolf-dpkg.sh # Configure these settings before running that script. -debian_firefox_version=${debian_firefox_version:-'85.0.1-1'} # current version of Firefox package in Debian sid -firefox_version=${pkgver:-'85.0.1'} # current version of Firefox +debian_firefox_version=${debian_firefox_version:-'85.0.2-1'} # current version of Firefox package in Debian sid +firefox_version=${pkgver:-'85.0.2'} # current version of Firefox 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 fc69f86..f667d86 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -172,6 +172,7 @@ librewolf/sandbox-update-arm-syscall-numbers.patch -p1 librewolf/remove_addons.patch -p1 librewolf/megabar.patch -p1 librewolf/reduce-rust-debuginfo.patch -p1 +librewolf/rust_build_fix.patch -p1 EOF # observe that build-with-libstdc++-7 is disabled for this dpkg. Debian builds Firefox with gcc, not clang. # fix some fuzz in remove_addons.patch. The space is important! -- cgit