diff -Nru thunderbird-91.4.1/debian/changelog thunderbird-91.4.1/debian/changelog --- thunderbird-91.4.1/debian/changelog 2021-12-22 14:16:52.000000000 +0000 +++ thunderbird-91.4.1/debian/changelog 2022-01-14 01:03:38.000000000 +0000 @@ -1,3 +1,40 @@ +thunderbird (1:91.4.1-1~deb11u1+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+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 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 + + [changes brought forward from 1:78.5.1-1+rpi2 by Peter Michael Green at Tue, 15 Dec 2020 00:33:33 +0000] + * Actually build thunderbird binary on armhf + (changelog says this was already done, but it got lost somewhere + along the way). + + [changes introduced in 1:91.3.2-1+rpi1 by Peter Michael Green] + * Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting + definitions error. + + -- Peter Michael Green Fri, 14 Jan 2022 01:03:38 +0000 + thunderbird (1:91.4.1-1~deb11u1) bullseye-security; urgency=medium * Rebuild for bullseye-security diff -Nru thunderbird-91.4.1/debian/control thunderbird-91.4.1/debian/control --- thunderbird-91.4.1/debian/control 2021-12-22 14:16:52.000000000 +0000 +++ thunderbird-91.4.1/debian/control 2022-01-14 01:03:38.000000000 +0000 @@ -62,7 +62,7 @@ Standards-Version: 4.6.0 Package: thunderbird -Architecture: amd64 arm64 i386 mips64el ppc64el s390x ppc64 +Architecture: amd64 armhf arm64 i386 mips64el ppc64el s390x ppc64 Depends: debianutils (>= 1.16), fontconfig, diff -Nru thunderbird-91.4.1/debian/patches/disable-neon-in-qcms.patch thunderbird-91.4.1/debian/patches/disable-neon-in-qcms.patch --- thunderbird-91.4.1/debian/patches/disable-neon-in-qcms.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-91.4.1/debian/patches/disable-neon-in-qcms.patch 2022-01-14 01:03:38.000000000 +0000 @@ -0,0 +1,94 @@ +From: Peter Michael Green +Date: Wed, 7 Oct 2020 19:41:49 +0000 +X-Dgit-Generated: 78.3.0esr-2+rpi1 b1f30fd7ea0b729a7bbc7dc1e804e2a0cc0c573a +Subject: Disable neon in qcms. + + +--- + +diff --git a/gfx/qcms/qcmsint.h b/gfx/qcms/qcmsint.h +index b08fc9490b..3f5ad40145 100644 +--- a/gfx/qcms/qcmsint.h ++++ b/gfx/qcms/qcmsint.h +@@ -96,18 +96,18 @@ void qcms_transform_data_bgra_out_lut_altivec(const qcms_transform *transform, + 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; +diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs +index 7987ae2f31..d432ab5e5a 100644 +--- a/gfx/qcms/src/lib.rs ++++ b/gfx/qcms/src/lib.rs +@@ -62,8 +62,8 @@ pub use transform::DataType; + pub use transform::Transform; + #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] + mod transform_avx; +-#[cfg(all(any(target_arch = "aarch64", target_arch = "arm"), feature = "neon"))] +-mod transform_neon; ++//#[cfg(all(any(target_arch = "aarch64", target_arch = "arm"), feature = "neon"))] ++//mod transform_neon; + #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] + mod transform_sse2; + mod transform_util; +diff --git a/gfx/qcms/src/transform.rs b/gfx/qcms/src/transform.rs +index f3d9e8b4c4..b5e5351837 100644 +--- a/gfx/qcms/src/transform.rs ++++ b/gfx/qcms/src/transform.rs +@@ -21,11 +21,11 @@ + // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))] ++/*#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))] + use crate::transform_neon::{ + qcms_transform_data_bgra_out_lut_neon, qcms_transform_data_rgb_out_lut_neon, + qcms_transform_data_rgba_out_lut_neon, +-}; ++};*/ + use crate::{ + chain::chain_transform, + double_to_s15Fixed16Number, +@@ -1364,7 +1364,7 @@ pub fn transform_create( + } + } + +- #[cfg(all(target_arch = "arm", feature = "neon"))] ++ /*#[cfg(all(target_arch = "arm", feature = "neon"))] + let neon_supported = is_arm_feature_detected!("neon"); + #[cfg(all(target_arch = "aarch64", feature = "neon"))] + let neon_supported = is_aarch64_feature_detected!("neon"); +@@ -1378,7 +1378,7 @@ pub fn transform_create( + } else if in_type == BGRA8 { + transform.transform_fn = Some(qcms_transform_data_bgra_out_lut_neon) + } +- } ++ }*/ + + if transform.transform_fn.is_none() { + if in_type == RGB8 { diff -Nru thunderbird-91.4.1/debian/patches/patch-out-neon-in-freebl.patch thunderbird-91.4.1/debian/patches/patch-out-neon-in-freebl.patch --- thunderbird-91.4.1/debian/patches/patch-out-neon-in-freebl.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-91.4.1/debian/patches/patch-out-neon-in-freebl.patch 2022-01-14 01:03:38.000000000 +0000 @@ -0,0 +1,248 @@ +From: Peter Michael Green +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 + + +--- + +diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile +index 0b8c6f42fa4..0e60a0631ab 100644 +--- a/security/nss/lib/freebl/Makefile ++++ b/security/nss/lib/freebl/Makefile +@@ -153,9 +153,9 @@ ifeq ($(CPU_ARCH),aarch64) + endif + 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 -DUSE_HW_SHA1 -DUSE_HW_SHA2 + EXTRA_SRCS += aes-armv8.c sha1-armv8.c sha256-armv8.c +@@ -774,9 +774,9 @@ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep _ + $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) + $(OBJDIR)/$(PROG_PREFIX)sha1-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) + $(OBJDIR)/$(PROG_PREFIX)sha256-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) +-ifndef NSS_DISABLE_ARM32_NEON +-$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) +-endif ++#ifndef NSS_DISABLE_ARM32_NEON ++#$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) ++#endif + endif + + ifeq ($(CPU_ARCH),aarch64) +diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp +index e7703baf8d..bf30643dbf 100644 +--- a/security/nss/lib/freebl/freebl.gyp ++++ b/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', +@@ -260,15 +260,15 @@ + 'dependencies': [ + '<(DEPTH)/exports.gyp:nss_exports' + ], +- 'cflags': [ +- '-march=armv7', +- '-mfpu=neon', +- '<@(softfp_cflags)', +- ], +- 'cflags_mozilla': [ +- '-mfpu=neon', +- '<@(softfp_cflags)', +- ] ++ #'cflags': [ ++ # '-march=armv7', ++ # '-mfpu=neon', ++ # '<@(softfp_cflags)', ++ #], ++ #'cflags_mozilla': [ ++ # '-mfpu=neon', ++ # '<@(softfp_cflags)', ++ #] + }, + { + 'target_name': 'gcm-aes-aarch64_c_lib', +diff --git a/security/nss/lib/freebl/gcm.c b/security/nss/lib/freebl/gcm.c +index ac461b4885..67b58fdeea 100644 +--- a/security/nss/lib/freebl/gcm.c ++++ b/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 */ +diff --git a/security/nss/lib/freebl/rijndael.c b/security/nss/lib/freebl/rijndael.c +index 82b1f419d9..e255787646 100644 +--- a/security/nss/lib/freebl/rijndael.c ++++ b/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 __powerpc64__ + #include "ppc-crypto.h" +--- thunderbird-91.4.1.orig/security/nss/lib/freebl/freebl.gyp ++++ thunderbird-91.4.1/security/nss/lib/freebl/freebl.gyp +@@ -251,25 +251,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', +@@ -525,12 +525,12 @@ + 'sha-x86_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"', { ++ #[ 'disable_arm32_neon==0 and target_arch=="arm"', { ++ # 'dependencies': [ ++ # 'gcm-aes-arm32-neon_c_lib', ++ # ], ++ #}], ++ [ 'target_arch=="arm"', { + 'defines!': [ + 'NSS_DISABLE_ARM32_NEON', + ], +@@ -612,12 +612,12 @@ + 'sha-x86_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"', { ++ #[ 'disable_arm32_neon==0 and target_arch=="arm"', { ++ # 'dependencies': [ ++ # 'gcm-aes-arm32-neon_c_lib', ++ # ], ++ #}], ++ [ 'target_arch=="arm"', { + 'defines!': [ + 'NSS_DISABLE_ARM32_NEON', + ], +--- thunderbird-91.4.1.orig/third_party/rust/nss_build_common/src/lib.rs ++++ thunderbird-91.4.1/third_party/rust/nss_build_common/src/lib.rs +@@ -109,9 +109,9 @@ fn get_nss_libs(kind: LinkingKind) -> Ve + if target_arch == "x86_64" || target_arch == "x86" { + static_libs.push("gcm-aes-x86_c_lib"); + } +- if target_arch == "arm" { +- static_libs.push("gcm-aes-arm32-neon_c_lib") +- } ++ //if target_arch == "arm" { ++ // static_libs.push("gcm-aes-arm32-neon_c_lib") ++ //} + if target_arch == "aarch64" { + static_libs.push("gcm-aes-aarch64_c_lib"); + } +diff --git a/third_party/rust/nss_build_common/.cargo-checksum.json b/third_party/rust/nss_build_common/.cargo-checksum.json +index c29a0010987..11e5f160379 100644 +--- a/third_party/rust/nss_build_common/.cargo-checksum.json ++++ b/third_party/rust/nss_build_common/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"a9077862fc7c45044178fa2675a04d0b31a27574d93a328e03df3108342dd6e4"},"package":null} +\ No newline at end of file ++{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"e66390f87683fccc863a5c847000efbe86ac27161f5e3574ba354302267f288c"},"package":null} +\ No newline at end of file diff -Nru thunderbird-91.4.1/debian/patches/raspbian-rust-triplet-hack.patch thunderbird-91.4.1/debian/patches/raspbian-rust-triplet-hack.patch --- thunderbird-91.4.1/debian/patches/raspbian-rust-triplet-hack.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-91.4.1/debian/patches/raspbian-rust-triplet-hack.patch 2022-01-14 01:03:38.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Hack broken rust target selection so it produces the right target on raspbian. +Author: Peter Michael Green +diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +index 40f017da67..07308cb6cd 100644 +--- a/build/moz.configure/rust.configure ++++ b/build/moz.configure/rust.configure +@@ -236,9 +236,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): ++ #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 = check_cmd_output(rustc, "--print", "target-list").splitlines() ++ out.append("arm-unknown-linux-gnueabihf") + data = {} + for t in out: + try: diff -Nru thunderbird-91.4.1/debian/patches/series thunderbird-91.4.1/debian/patches/series --- thunderbird-91.4.1/debian/patches/series 2021-12-22 14:16:52.000000000 +0000 +++ thunderbird-91.4.1/debian/patches/series 2022-01-14 01:03:38.000000000 +0000 @@ -28,3 +28,9 @@ debian-hacks/Make-Thunderbird-build-reproducible.patch debian-hacks/Decrease-Cargo-minimal-version-to-1.46.0.patch debian-hacks/Fix-Floating-Point-Normalization-breakage-on-32bit-Linux.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 +use-a-define-instead-of-a-typedef-for-do.patch diff -Nru thunderbird-91.4.1/debian/patches/try-harder-to-disable-neon.patch thunderbird-91.4.1/debian/patches/try-harder-to-disable-neon.patch --- thunderbird-91.4.1/debian/patches/try-harder-to-disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-91.4.1/debian/patches/try-harder-to-disable-neon.patch 2022-01-14 01:03:38.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-91.4.1/debian/patches/try-to-disable-neon.patch thunderbird-91.4.1/debian/patches/try-to-disable-neon.patch --- thunderbird-91.4.1/debian/patches/try-to-disable-neon.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-91.4.1/debian/patches/try-to-disable-neon.patch 2022-01-14 01:03:38.000000000 +0000 @@ -0,0 +1,15 @@ +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 +@@ -228,3 +228,3 @@ + def build_arm_neon(arm_arch): +- return arm_arch >= 7 ++ return arm_arch >= 700 + diff -Nru thunderbird-91.4.1/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch thunderbird-91.4.1/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch --- thunderbird-91.4.1/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch 1970-01-01 00:00:00.000000000 +0000 +++ thunderbird-91.4.1/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch 2022-01-14 01:03:38.000000000 +0000 @@ -0,0 +1,19 @@ +From: Peter Michael Green +Date: Thu, 16 Dec 2021 16:46:38 +0000 +X-Dgit-Generated: 1:91.3.2-1+rpi1 10aa006b9ea2d3980ee1e37aa18a8c8910ee2e39 +Subject: Use a #define instead of a typedef for double_t in fdlibm to prevent conflicting definitions error. + + +--- + +--- thunderbird-91.3.2.orig/modules/fdlibm/src/math_private.h ++++ thunderbird-91.3.2/modules/fdlibm/src/math_private.h +@@ -35,7 +35,7 @@ typedef double __double_t; + #else + typedef long double __double_t; + #endif +-typedef __double_t double_t; ++#define double_t __double_t + typedef float __float_t; + /* + * The original fdlibm code used statements like: diff -Nru thunderbird-91.4.1/debian/rules thunderbird-91.4.1/debian/rules --- thunderbird-91.4.1/debian/rules 2021-12-22 14:16:52.000000000 +0000 +++ thunderbird-91.4.1/debian/rules 2022-01-14 01:03:38.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