diff -Nru thunderbird-68.5.0/debian/changelog thunderbird-68.5.0/debian/changelog --- thunderbird-68.5.0/debian/changelog 2020-02-13 16:58:44.000000000 +0000 +++ thunderbird-68.5.0/debian/changelog 2020-03-23 02:04:16.000000000 +0000 @@ -1,3 +1,19 @@ +thunderbird (1:68.5.0-1+rpi1) bullseye-staging; urgency=medium + + [changes brought over from firefox-esr 60.3.0esr-1+rpi1 by Peter Michael Green at Wed, 05 Dec 2018 06:56:52 +0000] + * Hack broken rust target selection so it produces the right target + on raspbian. + * Fix clean target. + + [changes introduced in 60.4.0-1+rpi1 by Peter Michael Green] + * Further fixes to clean target (still not completely fixed :( ). + + [changes introduced in 1:68.5.0-1~deb10u1 by Peter Michael Green] + * Disable neon (patches taken from firefox-esr package) + * Build in a chroot with arm64 binutils-arm-linux-gnueabihf + + -- Raspbian forward porter Mon, 23 Mar 2020 02:04:16 +0000 + thunderbird (1:68.5.0-1) unstable; urgency=medium * [d79bf82] New upstream version 68.5.0 diff -Nru thunderbird-68.5.0/debian/patches/raspbian-rust-triplet-hack.patch thunderbird-68.5.0/debian/patches/raspbian-rust-triplet-hack.patch --- thunderbird-68.5.0/debian/patches/raspbian-rust-triplet-hack.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-68.5.0/debian/patches/raspbian-rust-triplet-hack.patch 2020-03-23 02:04:16.000000000 +0000 @@ -0,0 +1,40 @@ +Description: Hack broken rust target selection so it produces the right target on raspbian. +Author: Peter Michael Green + +--- thunderbird-68.3.0.orig/build/moz.configure/rust.configure ++++ thunderbird-68.3.0/build/moz.configure/rust.configure +@@ -185,6 +185,8 @@ def rust_compiler(rustc_info, cargo_info + + + @depends(rustc, when=rust_compiler) ++@imports('sys') ++@imports(_from='__builtin__', _import='repr') + def rust_supported_targets(rustc): + out = check_cmd_output(rustc, '--print', 'target-list').splitlines() + # The os in the triplets used by rust may match the same OSes, in which +@@ -192,7 +194,11 @@ def rust_supported_targets(rustc): + per_os = {} + ambiguous = set() + per_raw_os = {} ++ #HACK: if there are multiple matches the algorithm uses the last one ++ #put arm-unknown-linux-gnuebihf on the end of the list so it gets preffered ++ out.append('arm-unknown-linux-gnueabihf') + for t in out: ++ traw = t + t = split_triplet(t, allow_unknown=True) + endianness = t.endianness + if t.cpu.startswith('thumb') and endianness not in ('big', 'little'): +@@ -232,11 +238,13 @@ def rust_triple_alias(host_or_target): + arm_target, when=rust_compiler) + @checking('for rust %s triplet' % host_or_target_str) + @imports('os') ++ @imports('sys') + @imports('subprocess') + @imports(_from='mozbuild.configure.util', _import='LineIO') + @imports(_from='mozbuild.shellutil', _import='quote') + @imports(_from='tempfile', _import='mkstemp') + @imports(_from='textwrap', _import='dedent') ++ @imports(_from='__builtin__', _import='repr') + def rust_target(rustc, host_or_target, compiler_info, + rust_supported_targets, arm_target): + # Rust's --target options are similar to, but not exactly the same diff -Nru thunderbird-68.5.0/debian/patches/series thunderbird-68.5.0/debian/patches/series --- thunderbird-68.5.0/debian/patches/series 2020-02-13 15:38:13.000000000 +0000 +++ thunderbird-68.5.0/debian/patches/series 2020-03-23 02:04:16.000000000 +0000 @@ -37,3 +37,6 @@ porting-arm/Reduce-memory-usage-while-linking-on-arm-el-hf-platforms.patch debian-hacks/Make-Thunderbird-build-reproducible.patch fixes/Bug-1531309-Don-t-use-__PRETTY_FUNCTION__-or-__FUNCTION__.patch +raspbian-rust-triplet-hack.patch +try-to-disable-neon.patch +try-harder-to-disable-neon.patch diff -Nru thunderbird-68.5.0/debian/patches/try-harder-to-disable-neon.patch thunderbird-68.5.0/debian/patches/try-harder-to-disable-neon.patch --- thunderbird-68.5.0/debian/patches/try-harder-to-disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-68.5.0/debian/patches/try-harder-to-disable-neon.patch 2020-03-23 02:04:16.000000000 +0000 @@ -0,0 +1,21 @@ +From: Peter Michael Green +Date: Thu, 7 Nov 2019 11:23:19 +0000 +X-Dgit-Generated: 68.2.0esr-1+rpi1 a8a34a748cbe157a1fb6bfdb2c127ff6ec8416e9 +Subject: Try harder to disable neon. + + +--- + +--- firefox-esr-68.2.0esr.orig/build/moz.configure/arm.configure ++++ firefox-esr-68.2.0esr/build/moz.configure/arm.configure +@@ -229,8 +229,8 @@ def build_arm_neon(arm_arch): + return arm_arch >= 700 + + +-set_config('BUILD_ARM_NEON', build_arm_neon) +-set_define('BUILD_ARM_NEON', build_arm_neon) ++#set_config('BUILD_ARM_NEON', build_arm_neon) ++#set_define('BUILD_ARM_NEON', build_arm_neon) + + + set_config('ARM_ARCH', depends(arm_target.arm_arch)(lambda x: str(x))) diff -Nru thunderbird-68.5.0/debian/patches/try-to-disable-neon.patch thunderbird-68.5.0/debian/patches/try-to-disable-neon.patch --- thunderbird-68.5.0/debian/patches/try-to-disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-68.5.0/debian/patches/try-to-disable-neon.patch 2020-03-23 02:04:16.000000000 +0000 @@ -0,0 +1,19 @@ +From: Peter Michael Green +Date: Thu, 7 Nov 2019 08:48:48 +0000 +X-Dgit-Generated: 68.2.0esr-1+rpi1 be4da04b831a114d84fc719b35cbf9cd4014c464 +Subject: Try to disable neon. + + +--- + +--- firefox-esr-68.2.0esr.orig/build/moz.configure/arm.configure ++++ firefox-esr-68.2.0esr/build/moz.configure/arm.configure +@@ -226,7 +226,7 @@ set_define('HAVE_ARM_NEON', have_arm_neo + # This matches media/webrtc/trunk/webrtc/build/common.gypi. + @depends(arm_target.arm_arch, when=have_arm_neon) + def build_arm_neon(arm_arch): +- return arm_arch >= 7 ++ return arm_arch >= 700 + + + set_config('BUILD_ARM_NEON', build_arm_neon) diff -Nru thunderbird-68.5.0/debian/rules thunderbird-68.5.0/debian/rules --- thunderbird-68.5.0/debian/rules 2020-02-13 15:38:13.000000000 +0000 +++ thunderbird-68.5.0/debian/rules 2020-03-23 02:04:16.000000000 +0000 @@ -97,6 +97,12 @@ rm -f configure old-configure js/src/configure js/src/old-configure mozconfig.* # needed for thunderbird-l10n rm -rf $(THUNDERBIRD_L10N_BUILDDIR) + rm -rf third_party/python/psutil/tmp/ + rm -f third_party/python/psutil/psutil/*.so + rm -rf third_party/python/psutil/build/temp* + rm -rf third_party/python/psutil/build/lib* + find . -name '*.pyc' -delete + rm -f mozconfig.* rm -rf $(CARGO_HOME) override_dh_auto_configure: