diff -Nru thunderbird-78.11.0/debian/changelog thunderbird-78.11.0/debian/changelog
--- thunderbird-78.11.0/debian/changelog 2021-06-04 16:16:00.000000000 +0000
+++ thunderbird-78.11.0/debian/changelog 2021-06-10 12:57:00.000000000 +0000
@@ -1,3 +1,31 @@
+thunderbird (1:78.11.0-1~deb10u1+rpi1) buster-staging; urgency=medium
+
+ [changes brought over from firefox-esr 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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+rpi1 by Peter Michael Green]
+ * Disable neon (patches taken from firefox-esr package)
+ * Build in a chroot with arm64 binutils-arm-linux-gnueabihf
+
+ [changes brought forward from 1:68.5.0-1~deb10u1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 15 Mar 2020 16:27:21 +0000]
+ * Actually build the binary packages on armhf.
+ * Yet more clean target fixing.
+
+ [changes brought over from firefox-esr 78.3.0esr-2+rpi1 by Peter Michael Green]
+ * Clean up pycache directories.
+ * Disable neon in qcms.
+
+ [changes introduced in 1:78.4.0-1~deb10u1+rpi1 by Peter Michael Green]
+ * Add export NSS_DISABLE_ARM32_NEON=1 to hopefully disable neon in nss.
+ * Adding the define in debian/rules didn't seem to work, try to patch out neon in nss instead
+
+ -- Raspbian forward porter <root@raspbian.org> Thu, 10 Jun 2021 12:57:00 +0000
+
thunderbird (1:78.11.0-1~deb10u1) stable-security; urgency=medium
* Rebuild for buster-security
diff -Nru thunderbird-78.11.0/debian/patches/disable-neon-in-qcms.patch thunderbird-78.11.0/debian/patches/disable-neon-in-qcms.patch
--- thunderbird-78.11.0/debian/patches/disable-neon-in-qcms.patch 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.11.0/debian/patches/disable-neon-in-qcms.patch 2021-06-10 12:57:00.000000000 +0000
@@ -0,0 +1,105 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Wed, 7 Oct 2020 19:41:49 +0000
+X-Dgit-Generated: 78.3.0esr-2+rpi1 b1f30fd7ea0b729a7bbc7dc1e804e2a0cc0c573a
+Subject: Disable neon in qcms.
+
+
+---
+
+--- firefox-esr-78.3.0esr.orig/gfx/qcms/qcmsint.h
++++ firefox-esr-78.3.0esr/gfx/qcms/qcmsint.h
+@@ -344,18 +344,18 @@ void qcms_transform_data_bgra_out_lut_al
+ unsigned char *dest,
+ size_t length);
+
+-void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform,
+- const unsigned char *src,
+- unsigned char *dest,
+- size_t length);
+-void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform,
+- const unsigned char *src,
+- unsigned char *dest,
+- size_t length);
+-void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform,
+- const unsigned char *src,
+- unsigned char *dest,
+- size_t length);
++//void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform,
++// const unsigned char *src,
++// unsigned char *dest,
++// size_t length);
++//void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform,
++// const unsigned char *src,
++// unsigned char *dest,
++// size_t length);
++//void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform,
++// const unsigned char *src,
++// unsigned char *dest,
++// size_t length);
+
+ extern bool qcms_supports_iccv4;
+ extern bool qcms_supports_neon;
+--- firefox-esr-78.3.0esr.orig/gfx/qcms/transform.cpp
++++ firefox-esr-78.3.0esr/gfx/qcms/transform.cpp
+@@ -1240,7 +1240,7 @@ qcms_transform* qcms_transform_create(
+ #endif
+ } else
+ #endif
+-#if defined(__arm__) || defined(__aarch64__)
++#if 0 // defined(__arm__) || defined(__aarch64__)
+ if (qcms_supports_neon) {
+ if (in_type == QCMS_DATA_RGB_8) {
+ transform->transform_fn = qcms_transform_data_rgb_out_lut_neon;
+--- firefox-esr-78.3.0esr.orig/gfx/tests/gtest/TestQcms.cpp
++++ firefox-esr-78.3.0esr/gfx/tests/gtest/TestQcms.cpp
+@@ -493,11 +493,11 @@ void GfxQcms_ProfilePairBase::TransformP
+ EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_avx));
+ }
+ #endif
+-#ifdef MOZILLA_MAY_SUPPORT_NEON
+- if (mozilla::supports_neon()) {
+- EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon));
+- }
+-#endif
++//#ifdef MOZILLA_MAY_SUPPORT_NEON
++// if (mozilla::supports_neon()) {
++// EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgb_out_lut_neon));
++// }
++//#endif
+
+ // Verify RGBA transforms.
+ ASSERT_TRUE(SetBuffers(QCMS_DATA_RGBA_8));
+@@ -518,11 +518,11 @@ void GfxQcms_ProfilePairBase::TransformP
+ EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_avx));
+ }
+ #endif
+-#ifdef MOZILLA_MAY_SUPPORT_NEON
+- if (mozilla::supports_neon()) {
+- EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_neon));
+- }
+-#endif
++//#ifdef MOZILLA_MAY_SUPPORT_NEON
++// if (mozilla::supports_neon()) {
++// EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_rgba_out_lut_neon));
++// }
++//#endif
+
+ // Verify BGRA transforms.
+ ASSERT_TRUE(SetBuffers(QCMS_DATA_BGRA_8));
+@@ -543,11 +543,11 @@ void GfxQcms_ProfilePairBase::TransformP
+ EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_avx));
+ }
+ #endif
+-#ifdef MOZILLA_MAY_SUPPORT_NEON
+- if (mozilla::supports_neon()) {
+- EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_neon));
+- }
+-#endif
++//#ifdef MOZILLA_MAY_SUPPORT_NEON
++// if (mozilla::supports_neon()) {
++// EXPECT_TRUE(ProduceVerifyOutput(qcms_transform_data_bgra_out_lut_neon));
++// }
++//#endif
+ }
+
+ class GfxQcms_sRGB_To_sRGB : public GfxQcms_ProfilePairBase {
diff -Nru thunderbird-78.11.0/debian/patches/patch-out-neon-in-freebl.patch thunderbird-78.11.0/debian/patches/patch-out-neon-in-freebl.patch
--- thunderbird-78.11.0/debian/patches/patch-out-neon-in-freebl.patch 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.11.0/debian/patches/patch-out-neon-in-freebl.patch 2021-06-10 12:57:00.000000000 +0000
@@ -0,0 +1,281 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Thu, 29 Oct 2020 03:19:17 +0000
+X-Dgit-Generated: 1:78.4.0-1~deb10u1+rpi1 1d0bbfdae9ecd6b3ad6b08bddb57439bb12dac5e
+Subject: Patch out neon in freebl
+
+
+---
+
+--- thunderbird-78.4.0.orig/security/nss/lib/freebl/Makefile
++++ thunderbird-78.4.0/security/nss/lib/freebl/Makefile
+@@ -124,9 +124,9 @@ ifeq ($(CPU_ARCH),aarch64)
+ EXTRA_SRCS += aes-armv8.c gcm-aarch64.c
+ endif
+ ifeq ($(CPU_ARCH),arm)
+-ifndef NSS_DISABLE_ARM32_NEON
+- EXTRA_SRCS += gcm-arm32-neon.c
+-endif
++#ifndef NSS_DISABLE_ARM32_NEON
++# EXTRA_SRCS += gcm-arm32-neon.c
++#endif
+ ifdef CC_IS_CLANG
+ DEFINES += -DUSE_HW_AES
+ EXTRA_SRCS += aes-armv8.c
+--- thunderbird-78.4.0.orig/security/nss/lib/freebl/freebl.gyp
++++ thunderbird-78.4.0/security/nss/lib/freebl/freebl.gyp
+@@ -103,13 +103,13 @@
+ ],
+ },
+ }],
+- [ 'target_arch=="arm"', {
+- # Gecko doesn't support non-NEON platform on Android, but tier-3
+- # platform such as Linux/arm will need it
+- 'cflags_mozilla': [
+- '-mfpu=neon'
+- ],
+- }],
++ #[ 'target_arch=="arm"', {
++ # # Gecko doesn't support non-NEON platform on Android, but tier-3
++ # # platform such as Linux/arm will need it
++ # 'cflags_mozilla': [
++ # '-mfpu=neon'
++ # ],
++ #}],
+ [ 'target_arch=="x64"', {
+ 'sources': [
+ 'verified/Hacl_Poly1305_128.c',
+@@ -172,13 +172,13 @@
+ ],
+ },
+ }],
+- [ 'target_arch=="arm"', {
+- # Gecko doesn't support non-NEON platform on Android, but tier-3
+- # platform such as Linux/arm will need it
+- 'cflags_mozilla': [
+- '-mfpu=neon'
+- ],
+- }],
++ #[ 'target_arch=="arm"', {
++ # # Gecko doesn't support non-NEON platform on Android, but tier-3
++ # # platform such as Linux/arm will need it
++ # 'cflags_mozilla': [
++ # '-mfpu=neon'
++ # ],
++ #}],
+ [ 'target_arch=="x64"', {
+ 'sources': [
+ 'verified/Hacl_Poly1305_256.c',
+@@ -219,25 +219,25 @@
+ }]
+ ]
+ },
+- {
+- 'target_name': 'gcm-aes-arm32-neon_c_lib',
+- 'type': 'static_library',
+- 'sources': [
+- 'gcm-arm32-neon.c'
+- ],
+- 'dependencies': [
+- '<(DEPTH)/exports.gyp:nss_exports'
+- ],
+- 'cflags': [
+- '-march=armv7',
+- '-mfpu=neon',
+- '<@(softfp_cflags)',
+- ],
+- 'cflags_mozilla': [
+- '-mfpu=neon',
+- '<@(softfp_cflags)',
+- ]
+- },
++ #{
++ # 'target_name': 'gcm-aes-arm32-neon_c_lib',
++ # 'type': 'static_library',
++ # 'sources': [
++ # 'gcm-arm32-neon.c'
++ # ],
++ # 'dependencies': [
++ # '<(DEPTH)/exports.gyp:nss_exports'
++ # ],
++ # 'cflags': [
++ # '-march=armv7',
++ # '-mfpu=neon',
++ # '<@(softfp_cflags)',
++ # ],
++ # 'cflags_mozilla': [
++ # '-mfpu=neon',
++ # '<@(softfp_cflags)',
++ # ]
++ #},
+ {
+ 'target_name': 'gcm-aes-aarch64_c_lib',
+ 'type': 'static_library',
+@@ -324,37 +324,37 @@
+ 'FREEBL_NO_DEPEND',
+ ],
+ },
+- {
+- 'target_name': 'armv8_c_lib',
+- 'type': 'static_library',
+- 'sources': [
+- 'aes-armv8.c',
+- ],
+- 'dependencies': [
+- '<(DEPTH)/exports.gyp:nss_exports'
+- ],
+- 'conditions': [
+- [ 'target_arch=="arm"', {
+- 'cflags': [
+- '-march=armv8-a',
+- '-mfpu=crypto-neon-fp-armv8',
+- '<@(softfp_cflags)',
+- ],
+- 'cflags_mozilla': [
+- '-march=armv8-a',
+- '-mfpu=crypto-neon-fp-armv8',
+- '<@(softfp_cflags)',
+- ],
+- }, 'target_arch=="arm64" or target_arch=="aarch64"', {
+- 'cflags': [
+- '-march=armv8-a+crypto'
+- ],
+- 'cflags_mozilla': [
+- '-march=armv8-a+crypto'
+- ],
+- }]
+- ]
+- },
++ #{
++ # 'target_name': 'armv8_c_lib',
++ # 'type': 'static_library',
++ # 'sources': [
++ # 'aes-armv8.c',
++ # ],
++ # 'dependencies': [
++ # '<(DEPTH)/exports.gyp:nss_exports'
++ # ],
++ # 'conditions': [
++ # [ 'target_arch=="arm"', {
++ # 'cflags': [
++ # '-march=armv8-a',
++ # '-mfpu=crypto-neon-fp-armv8',
++ # '<@(softfp_cflags)',
++ # ],
++ # 'cflags_mozilla': [
++ # '-march=armv8-a',
++ # '-mfpu=crypto-neon-fp-armv8',
++ # '<@(softfp_cflags)',
++ # ],
++ # }, 'target_arch=="arm64" or target_arch=="aarch64"', {
++ # 'cflags': [
++ # '-march=armv8-a+crypto'
++ # ],
++ # 'cflags_mozilla': [
++ # '-march=armv8-a+crypto'
++ # ],
++ # }]
++ # ]
++ #},
+ {
+ 'target_name': 'freebl',
+ 'type': 'static_library',
+@@ -380,21 +380,21 @@
+ 'hw-acc-crypto-avx2',
+ ],
+ 'conditions': [
+- [ 'target_arch=="ia32" or target_arch=="x64"', {
+- 'dependencies': [
+- 'gcm-aes-x86_c_lib',
+- ],
+- }, 'disable_arm_hw_aes==0 and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', {
+- 'dependencies': [
+- 'armv8_c_lib'
+- ],
+- }],
+- [ 'disable_arm32_neon==0 and target_arch=="arm"', {
+- 'dependencies': [
+- 'gcm-aes-arm32-neon_c_lib',
+- ],
+- }],
+- [ 'disable_arm32_neon==1 and target_arch=="arm"', {
++ #[ 'target_arch=="ia32" or target_arch=="x64"', {
++ # 'dependencies': [
++ # 'gcm-aes-x86_c_lib',
++ # ],
++ #}, 'disable_arm_hw_aes==0 and (target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64")', {
++ # 'dependencies': [
++ # 'armv8_c_lib'
++ # ],
++ #}],
++ #[ 'disable_arm32_neon==0 and target_arch=="arm"', {
++ # 'dependencies': [
++ # 'gcm-aes-arm32-neon_c_lib',
++ # ],
++ #}],
++ [ 'target_arch=="arm"', {
+ 'defines!': [
+ 'NSS_DISABLE_ARM32_NEON',
+ ],
+@@ -448,21 +448,21 @@
+ 'hw-acc-crypto-avx2',
+ ],
+ 'conditions': [
+- [ 'target_arch=="ia32" or target_arch=="x64"', {
+- 'dependencies': [
+- 'gcm-aes-x86_c_lib',
+- ]
+- }, 'target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64"', {
+- 'dependencies': [
+- 'armv8_c_lib',
+- ],
+- }],
+- [ 'disable_arm32_neon==0 and target_arch=="arm"', {
+- 'dependencies': [
+- 'gcm-aes-arm32-neon_c_lib',
+- ],
+- }],
+- [ 'disable_arm32_neon==1 and target_arch=="arm"', {
++ #[ 'target_arch=="ia32" or target_arch=="x64"', {
++ # 'dependencies': [
++ # 'gcm-aes-x86_c_lib',
++ # ]
++ #}, 'target_arch=="arm" or target_arch=="arm64" or target_arch=="aarch64"', {
++ # 'dependencies': [
++ # 'armv8_c_lib',
++ # ],
++ #}],
++ #[ 'disable_arm32_neon==0 and target_arch=="arm"', {
++ # 'dependencies': [
++ # 'gcm-aes-arm32-neon_c_lib',
++ # ],
++ #}],
++ [ 'target_arch=="arm"', {
+ 'defines!': [
+ 'NSS_DISABLE_ARM32_NEON',
+ ],
+--- thunderbird-78.4.0.orig/security/nss/lib/freebl/gcm.c
++++ thunderbird-78.4.0/security/nss/lib/freebl/gcm.c
+@@ -25,7 +25,7 @@
+ #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
+ !defined(NSS_DISABLE_ARM32_NEON)
+ /* We don't test on big endian platform, so disable this on big endian. */
+-#define USE_ARM_GCM
++//#define USE_ARM_GCM
+ #endif
+
+ /* Forward declarations */
+--- thunderbird-78.4.0.orig/security/nss/lib/freebl/rijndael.c
++++ thunderbird-78.4.0/security/nss/lib/freebl/rijndael.c
+@@ -20,10 +20,10 @@
+ #include "gcm.h"
+ #include "mpi.h"
+
+-#if !defined(IS_LITTLE_ENDIAN) && !defined(NSS_X86_OR_X64)
++//#if !defined(IS_LITTLE_ENDIAN) && !defined(NSS_X86_OR_X64)
+ // not test yet on big endian platform of arm
+ #undef USE_HW_AES
+-#endif
++//#endif
+
+ #ifdef USE_HW_AES
+ #ifdef NSS_X86_OR_X64
diff -Nru thunderbird-78.11.0/debian/patches/raspbian-rust-triplet-hack.patch thunderbird-78.11.0/debian/patches/raspbian-rust-triplet-hack.patch
--- thunderbird-78.11.0/debian/patches/raspbian-rust-triplet-hack.patch 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.11.0/debian/patches/raspbian-rust-triplet-hack.patch 2021-06-10 12:57:00.000000000 +0000
@@ -0,0 +1,33 @@
+Description: Hack broken rust target selection so it produces the right target on raspbian.
+Author: Peter Michael Green <plugwash@raspbian.org>
+--- firefox-esr-78.3.0esr.orig/build/moz.configure/rust.configure
++++ firefox-esr-78.3.0esr/build/moz.configure/rust.configure
+@@ -192,9 +192,14 @@ def rust_compiler(rustc_info, cargo_info
+
+
+ @depends(rustc, when=rust_compiler)
++@imports('sys')
++@imports(_from='__builtin__', _import='repr')
+ @imports(_from='__builtin__', _import='ValueError')
+ def rust_supported_targets(rustc):
+ out = check_cmd_output(rustc, '--print', 'target-list').splitlines()
++ #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')
+ data = {}
+ for t in out:
+ try:
+@@ -232,11 +237,13 @@ def rust_triple_alias(host_or_target, ho
+ rust_supported_targets, arm_target, when=rust_compiler)
+ @checking('for rust %s triplet' % host_or_target_str)
+ @imports('os')
++ @imports('sys')
+ @imports(_from='mozbuild.configure.util', _import='LineIO')
+ @imports(_from='mozbuild.shellutil', _import='quote')
+ @imports(_from='six', _import='ensure_binary')
+ @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-78.11.0/debian/patches/series thunderbird-78.11.0/debian/patches/series
--- thunderbird-78.11.0/debian/patches/series 2021-06-03 18:38:14.000000000 +0000
+++ thunderbird-78.11.0/debian/patches/series 2021-06-10 12:57:00.000000000 +0000
@@ -37,3 +37,8 @@
fixes/reduce-the-rust-debuginfo-level-on-selected-architectures.patch
fixes/Bug-1650299-Unify-the-inclusion-of-the-ICU-data-file.-r-f.patch
fixes/Don-t-build-ICU-in-parallel.patch
+raspbian-rust-triplet-hack.patch
+try-to-disable-neon.patch
+try-harder-to-disable-neon.patch
+disable-neon-in-qcms.patch
+patch-out-neon-in-freebl.patch
diff -Nru thunderbird-78.11.0/debian/patches/try-harder-to-disable-neon.patch thunderbird-78.11.0/debian/patches/try-harder-to-disable-neon.patch
--- thunderbird-78.11.0/debian/patches/try-harder-to-disable-neon.patch 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.11.0/debian/patches/try-harder-to-disable-neon.patch 2021-06-10 12:57:00.000000000 +0000
@@ -0,0 +1,21 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+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-78.11.0/debian/patches/try-to-disable-neon.patch thunderbird-78.11.0/debian/patches/try-to-disable-neon.patch
--- thunderbird-78.11.0/debian/patches/try-to-disable-neon.patch 1970-01-01 00:00:00.000000000 +0000
+++ thunderbird-78.11.0/debian/patches/try-to-disable-neon.patch 2021-06-10 12:57:00.000000000 +0000
@@ -0,0 +1,19 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+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-78.11.0/debian/rules thunderbird-78.11.0/debian/rules
--- thunderbird-78.11.0/debian/rules 2021-06-04 16:14:12.000000000 +0000
+++ thunderbird-78.11.0/debian/rules 2021-06-10 12:57:00.000000000 +0000
@@ -77,6 +77,8 @@
# Work around https://github.com/rust-lang/cargo/issues/7147
export CARGO_HOME=$(CURDIR)/debian/.cargo
+export NSS_DISABLE_ARM32_NEON=1
+
%:
dh $@
@@ -90,7 +92,16 @@
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)
+ rm -rf debian/thunderbird-l10n-uz debian/thunderbird-l10n-cak debian/thunderbird-l10n-ka
+ rm -f config/external/icu/data/icudt64l.dat
+ find . -name __pycache__ -delete
override_dh_auto_configure:
# run autoconf for all configure files