From: Peter Michael Green Date: Thu, 25 Jul 2024 20:35:56 +0000 (+0000) Subject: Update patches for new upstream. X-Git-Tag: archive/raspbian/1%115.12.0-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=baab2da167d4027c97a0d27d00003e5c88f823b5;p=thunderbird.git Update patches for new upstream. --- diff --git a/debian/patches/disable-more-armv7neon-stuff.patch b/debian/patches/disable-more-armv7neon-stuff.patch index 972dac1a6b..6b20c23a98 100644 --- a/debian/patches/disable-more-armv7neon-stuff.patch +++ b/debian/patches/disable-more-armv7neon-stuff.patch @@ -1,13 +1,7 @@ -From: Peter Michael Green -Date: Sat, 27 Aug 2022 08:00:25 +0000 -X-Dgit-Generated: 1:102.1.1-1+rpi1 70b656c7d4dc4ae5fbef1dc3870a3931474445f4 -Subject: Disable more armv7/neon stuff. - - ---- - ---- thunderbird-102.1.1.orig/gfx/ycbcr/moz.build -+++ thunderbird-102.1.1/gfx/ycbcr/moz.build +diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build +index c643fbaf406..e715f1a94fc 100644 +--- a/gfx/ycbcr/moz.build ++++ b/gfx/ycbcr/moz.build @@ -53,13 +53,13 @@ else: 'yuv_row_other.cpp', ] @@ -29,8 +23,10 @@ Subject: Disable more armv7/neon stuff. LOCAL_INCLUDES += ['/media/libyuv/libyuv/include'] ---- thunderbird-102.1.1.orig/media/libaom/moz.build -+++ thunderbird-102.1.1/media/libaom/moz.build +diff --git a/media/libaom/moz.build b/media/libaom/moz.build +index db3f9ca6eca..8396b55851f 100644 +--- a/media/libaom/moz.build ++++ b/media/libaom/moz.build @@ -42,26 +42,6 @@ elif CONFIG['CPU_ARCH'] == 'x86': ASFLAGS += [ '-I%s/media/libaom/config/linux/ia32/' % TOPSRCDIR ] LOCAL_INCLUDES += [ '/media/libaom/config/linux/ia32/' ] @@ -48,7 +44,7 @@ Subject: Disable more armv7/neon stuff. - - for f in SOURCES: - if f.endswith('neon.c'): -- SOURCES[f].flags += CONFIG['VPX_ASFLAGS'] +- SOURCES[f].flags += CONFIG['NEON_FLAGS'] - - if CONFIG['OS_TARGET'] == 'Android': - # For cpu-features.h @@ -58,8 +54,10 @@ Subject: Disable more armv7/neon stuff. else: # Generic C-only configuration EXPORTS.aom += files['GENERIC_EXPORTS'] ---- thunderbird-102.1.1.orig/media/libaom/sources.mozbuild -+++ thunderbird-102.1.1/media/libaom/sources.mozbuild +diff --git a/media/libaom/sources.mozbuild b/media/libaom/sources.mozbuild +index 672d48bf24d..9caf5295726 100644 +--- a/media/libaom/sources.mozbuild ++++ b/media/libaom/sources.mozbuild @@ -1,118 +1,6 @@ # This file is generated. Do not edit. @@ -179,12 +177,15 @@ Subject: Disable more armv7/neon stuff. 'GENERIC_EXPORTS': [ '../../third_party/aom/aom/aom.h', '../../third_party/aom/aom/aom_codec.h', ---- thunderbird-102.1.1.orig/media/libvpx/sources.mozbuild -+++ thunderbird-102.1.1/media/libvpx/sources.mozbuild -@@ -537,249 +537,6 @@ files = { +diff --git a/media/libvpx/sources.mozbuild b/media/libvpx/sources.mozbuild +index 31b1c021e96..55f84b7e863 100644 +--- a/media/libvpx/sources.mozbuild ++++ b/media/libvpx/sources.mozbuild +@@ -539,252 +539,6 @@ files = { + 'libvpx/vpx_scale/vpx_scale_rtcd.c', 'libvpx/vpx_util/vpx_thread.c', 'libvpx/vpx_util/vpx_write_yuv_frame.c', - ], +-], - 'ARM_EXPORTS': [ - 'libvpx/vpx/vp8.h', - 'libvpx/vpx/vp8cx.h', @@ -313,6 +314,8 @@ Subject: Disable more armv7/neon stuff. - 'libvpx/vp9/decoder/vp9_detokenize.c', - 'libvpx/vp9/decoder/vp9_dsubexp.c', - 'libvpx/vp9/decoder/vp9_job_queue.c', +- 'libvpx/vp9/encoder/arm/neon/vp9_dct_neon.c', +- 'libvpx/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c', - 'libvpx/vp9/encoder/arm/neon/vp9_error_neon.c', - 'libvpx/vp9/encoder/arm/neon/vp9_frame_scale_neon.c', - 'libvpx/vp9/encoder/arm/neon/vp9_quantize_neon.c', @@ -346,6 +349,7 @@ Subject: Disable more armv7/neon stuff. - 'libvpx/vp9/encoder/vp9_subexp.c', - 'libvpx/vp9/encoder/vp9_svc_layercontext.c', - 'libvpx/vp9/encoder/vp9_tokenize.c', +- 'libvpx/vp9/encoder/vp9_tpl_model.c', - 'libvpx/vp9/encoder/vp9_treewriter.c', - 'libvpx/vp9/vp9_cx_iface.c', - 'libvpx/vp9/vp9_dx_iface.c', @@ -358,9 +362,9 @@ Subject: Disable more armv7/neon stuff. - 'libvpx/vpx_dsp/arm/avg_pred_neon.c', - 'libvpx/vpx_dsp/arm/fdct16x16_neon.c', - 'libvpx/vpx_dsp/arm/fdct32x32_neon.c', -- 'libvpx/vpx_dsp/arm/fdct_neon.c', +- 'libvpx/vpx_dsp/arm/fdct4x4_neon.c', +- 'libvpx/vpx_dsp/arm/fdct8x8_neon.c', - 'libvpx/vpx_dsp/arm/fdct_partial_neon.c', -- 'libvpx/vpx_dsp/arm/fwd_txfm_neon.c', - 'libvpx/vpx_dsp/arm/hadamard_neon.c', - 'libvpx/vpx_dsp/arm/idct16x16_1_add_neon.c', - 'libvpx/vpx_dsp/arm/idct16x16_add_neon.c', @@ -427,12 +431,13 @@ Subject: Disable more armv7/neon stuff. - 'libvpx/vpx_scale/vpx_scale_rtcd.c', - 'libvpx/vpx_util/vpx_thread.c', - 'libvpx/vpx_util/vpx_write_yuv_frame.c', --], + ], 'ARM64_EXPORTS': [ 'libvpx/vpx/vp8.h', - 'libvpx/vpx/vp8cx.h', ---- thunderbird-102.1.1.orig/mozglue/build/arm.h -+++ thunderbird-102.1.1/mozglue/build/arm.h +diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h +index 8600329931e..be4791dd846 100644 +--- a/mozglue/build/arm.h ++++ b/mozglue/build/arm.h @@ -59,13 +59,13 @@ # define MOZILLA_MAY_SUPPORT_ARMV6 1 # endif @@ -453,8 +458,10 @@ Subject: Disable more armv7/neon stuff. # endif // Currently we only have CPU detection for Linux via /proc/cpuinfo ---- thunderbird-102.1.1.orig/third_party/aom/aom_dsp/aom_dsp.cmake -+++ thunderbird-102.1.1/third_party/aom/aom_dsp/aom_dsp.cmake +diff --git a/third_party/aom/aom_dsp/aom_dsp.cmake b/third_party/aom/aom_dsp/aom_dsp.cmake +index 11ff73756b7..b13500417ce 100644 +--- a/third_party/aom/aom_dsp/aom_dsp.cmake ++++ b/third_party/aom/aom_dsp/aom_dsp.cmake @@ -96,12 +96,12 @@ list(APPEND AOM_DSP_COMMON_INTRIN_AVX2 "${AOM_ROOT}/aom_dsp/x86/intrapred_avx2.c" "${AOM_ROOT}/aom_dsp/x86/blend_a64_mask_avx2.c") diff --git a/debian/patches/dont-build-rust-code-with-clto-to-avoid-.patch b/debian/patches/dont-build-rust-code-with-clto-to-avoid-.patch index c245c9fe52..8a38e00212 100644 --- a/debian/patches/dont-build-rust-code-with-clto-to-avoid-.patch +++ b/debian/patches/dont-build-rust-code-with-clto-to-avoid-.patch @@ -1,19 +1,13 @@ -From: Peter Michael Green -Date: Sat, 27 Aug 2022 07:58:37 +0000 -X-Dgit-Generated: 1:102.1.1-1+rpi1 a0abbcf457e1e18e8fdf656950505c94453e00b9 -Subject: Don't build rust code with Clto to avoid out of memory errors. - - ---- - ---- thunderbird-102.1.1.orig/config/makefiles/rust.mk -+++ thunderbird-102.1.1/config/makefiles/rust.mk -@@ -90,7 +90,7 @@ ifndef rustflags_sancov +diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk +index 894e2b341a5..ac6a6f093f4 100644 +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -92,7 +92,7 @@ ifndef rustflags_sancov # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. ifndef MOZ_CODE_COVERAGE ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) --cargo_rustc_flags += -Clto -+#cargo_rustc_flags += -Clto +-cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat) ++#cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat) endif # We need -Cembed-bitcode=yes for all crates when using -Clto. RUSTFLAGS += -Cembed-bitcode=yes diff --git a/debian/patches/patch-out-neon-in-freebl.patch b/debian/patches/patch-out-neon-in-freebl.patch index 69cbb65b2a..710a1767cd 100644 --- a/debian/patches/patch-out-neon-in-freebl.patch +++ b/debian/patches/patch-out-neon-in-freebl.patch @@ -182,17 +182,21 @@ Subject: Patch out neon in freebl #ifdef __powerpc64__ #include "ppc-crypto.h" ---- thunderbird-102.1.1.orig/third_party/rust/nss_build_common/.cargo-checksum.json -+++ thunderbird-102.1.1/third_party/rust/nss_build_common/.cargo-checksum.json +diff --git a/third_party/rust/nss_build_common/.cargo-checksum.json b/third_party/rust/nss_build_common/.cargo-checksum.json +index 35980b1aa5e..2af74e05520 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":"1cbfa62f63ce62078b51105c28bd4783c0045a4059175a1644ac0cc79837bf00"},"package":null} +-{"files":{"Cargo.toml":"6597b6d5217376ab747534364a58958ddbb23ffda52045e68b610cd8f2dcdfd1","src/lib.rs":"16da98eba3da05784442815d1ead70bbe0cce8440913ee367e72711ee4874d60"},"package":null} \ No newline at end of file -+{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"e1b529d6facc6f16a234a81d4b39904002ee023539a73bd29fae75e9a433fef3"},"package":null} ---- thunderbird-102.1.1.orig/third_party/rust/nss_build_common/src/lib.rs -+++ thunderbird-102.1.1/third_party/rust/nss_build_common/src/lib.rs -@@ -117,9 +117,9 @@ fn get_nss_libs(kind: LinkingKind) -> Ve - if target_arch == "x86_64" || target_arch == "x86" { ++{"files":{"Cargo.toml":"6597b6d5217376ab747534364a58958ddbb23ffda52045e68b610cd8f2dcdfd1","src/lib.rs":"8ac135cf95f98473ee216a33d963d6ae2ef71f76f0dbf7036bcbb1ee174a981a"},"package":null} +diff --git a/third_party/rust/nss_build_common/src/lib.rs b/third_party/rust/nss_build_common/src/lib.rs +index 9dc85bdb9a0..4c9220c4a72 100644 +--- a/third_party/rust/nss_build_common/src/lib.rs ++++ b/third_party/rust/nss_build_common/src/lib.rs +@@ -122,9 +122,9 @@ fn get_nss_libs(kind: LinkingKind) -> Vec<&'static str> { static_libs.push("gcm-aes-x86_c_lib"); + static_libs.push("sha-x86_c_lib"); } - if target_arch == "arm" { - static_libs.push("gcm-aes-arm32-neon_c_lib") diff --git a/debian/patches/series b/debian/patches/series index 43b8fb2b1f..8a94c3b479 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,7 +21,6 @@ debian-hacks/rnp-Fix-include-for-format-specifiers-for-uint32_t.patch porting-mips64el/skia-Disable-musttail-on-mips64.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 --git a/debian/patches/try-harder-to-disable-neon.patch b/debian/patches/try-harder-to-disable-neon.patch deleted file mode 100644 index 414ed27369..0000000000 --- a/debian/patches/try-harder-to-disable-neon.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 --git a/debian/patches/try-to-disable-neon.patch b/debian/patches/try-to-disable-neon.patch index 6229b5a6c2..b4b8ddd3c5 100644 --- a/debian/patches/try-to-disable-neon.patch +++ b/debian/patches/try-to-disable-neon.patch @@ -1,15 +1,20 @@ -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 @@ +diff --git a/build/moz.configure/arm.configure b/build/moz.configure/arm.configure +index 5d26f4d7323..e0862669c53 100644 +--- a/build/moz.configure/arm.configure ++++ b/build/moz.configure/arm.configure +@@ -271,12 +271,11 @@ set_define("HAVE_ARM_NEON", have_arm_neon) + # 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", True, when=build_arm_neon) +-set_define("BUILD_ARM_NEON", True, when=build_arm_neon) +- ++#set_config("BUILD_ARM_NEON", True, when=build_arm_neon) ++#set_define("BUILD_ARM_NEON", True, when=build_arm_neon) + + set_config("ARM_ARCH", depends(arm_target.arm_arch)(lambda x: str(x))) + set_config("MOZ_FPU", arm_target.fpu) diff --git a/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch b/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch index 8aaaa4c3ae..c763d343be 100644 --- a/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch +++ b/debian/patches/use-a-define-instead-of-a-typedef-for-do.patch @@ -1,19 +1,13 @@ -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; +diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h +index 632d2c4c619..b7fecb02e58 100644 +--- a/modules/fdlibm/src/math_private.h ++++ b/modules/fdlibm/src/math_private.h +@@ -35,7 +35,7 @@ typedef long double __double_t; #else - typedef long double __double_t; + typedef double __double_t; #endif -typedef __double_t double_t; +#define double_t __double_t - typedef float __float_t; + typedef float __float_t; + /* - * The original fdlibm code used statements like: