From e803678dfa1bbe839d36a898d522e62fb04c65f2 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Thu, 4 Feb 2021 17:36:51 +0100 Subject: allow an older cargo version until 0.48 is in SID --- scripts/prep-librewolf-dpkg.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh index 8240869..c8554c6 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -147,6 +147,10 @@ ac_add_options --disable-elf-hack ac_add_options --enable-optimize EOF +# workaround to allow an older cargo version until 0.48 is available in SID +sed -i 's/cargo (>= 0.48),/cargo (>= 0.46),/g' "${debian_dir}"/control.in +sed -i 's/cargo (>= 0.48),/cargo (>= 0.46),/g' "${debian_dir}"/control + # add patches to debian/patches mkdir -p "${debian_dir}"/patches/librewolf cp -pr "${git_source_dir}"/linux/megabar.patch "${git_source_dir}"/linux/remove_addons.patch \ @@ -166,6 +170,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/relax-cargo-dep.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