From 8ff623b249cd2ea53079cc0894a96db2a65a5a72 Mon Sep 17 00:00:00 2001 From: ptrcnull Date: Tue, 3 Mar 2026 11:49:29 +0100 Subject: [PATCH] community/thunderbird: upgrade to 148.0 --- community/thunderbird/APKBUILD | 22 ++++++---- community/thunderbird/fix-lp64.patch | 43 +++++++++++++++++++ .../thunderbird/fix-webrtc-glibcisms.patch | 20 --------- community/thunderbird/icu-78.patch | 16 ------- .../thunderbird/musl-no-linux-prctl.patch | 19 ++++++++ community/thunderbird/webrtc-cstdint.patch | 10 +++++ 6 files changed, 86 insertions(+), 44 deletions(-) create mode 100644 community/thunderbird/fix-lp64.patch delete mode 100644 community/thunderbird/fix-webrtc-glibcisms.patch delete mode 100644 community/thunderbird/icu-78.patch create mode 100644 community/thunderbird/musl-no-linux-prctl.patch create mode 100644 community/thunderbird/webrtc-cstdint.patch diff --git a/community/thunderbird/APKBUILD b/community/thunderbird/APKBUILD index 386f2170ed0..fbc2304f909 100644 --- a/community/thunderbird/APKBUILD +++ b/community/thunderbird/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Joseph Benden # Maintainer: Patrycja Rosa pkgname=thunderbird -pkgver=145.0 -pkgrel=2 +pkgver=148.0 +pkgrel=0 pkgdesc="Thunderbird email client" url="https://www.thunderbird.net/" # armhf: blocked by openmp and broken rust neon code @@ -65,16 +65,17 @@ source="https://ftp.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderb bmo-1988166-no-single_threaded-h.patch fix-fortify-system-wrappers.patch fix-libresolv-path.patch + fix-lp64.patch fix-rust-target.patch - fix-webrtc-glibcisms.patch lfs64.patch metainfo.patch + musl-no-linux-prctl.patch no-ccache-stats.patch rust-lto-thin.patch rust1.90-ppc.patch sandbox-sched_setscheduler.patch sqlite-ppc.patch - icu-78.patch + webrtc-cstdint.patch loong0001-Enable-WebRTC-for-loongarch64.patch loong0003-Define-HWCAP_LOONGARCH_LSX_and_LASX.patch @@ -386,6 +387,11 @@ prepare() { _clear_vendor_checksums libc _clear_vendor_checksums cc + # packaging error? missing .gitmodules file in tarball + for crate in cubeb-sys glslopt minimal-lexical sfv wasi yaml-rust2; do + _clear_vendor_checksums "$crate" + done + base64 -d "$srcdir"/mozilla-location.keys > "$builddir"/mozilla-api-key # XXX: fix transparency in icon @@ -508,24 +514,24 @@ package() { rm "$pkgdir"/$_mozappdir/thunderbird-bin ln -sfv /usr/bin/thunderbird "$pkgdir"/$_mozappdir/thunderbird-bin } - sha512sums=" -f33835e4d740b32d072ac915124d988ef9d4cbe55d7c972c817991d19b64e8bc95b75b503ad3cb9abf4fd1d220fc7cb61720ea84dc49482faa13da1690d7d80e thunderbird-145.0.source.tar.xz +ec5e586206ef217f37eb6985356994e7e7c9db6090f57d5b4c43a3a5dc0e1f5a56c0e7080d86fb895446845f9c9b948284f7417afebcf6e6120eca0e1ed238f3 thunderbird-148.0.source.tar.xz 616169325dc7715d3ff558c1846394d992f1a0a9427af5339e84abf3d9e7d85a5f9f6bae218ee3416ef39769a56150ac35881435ac09b976876fd556fddeac38 abseil-cpp.patch 32c566a1529d36b4816cef80bb56f0723d0ec2e407e5e4a61cd278d40dafa3a3032d5a77497f191989f4954fa3ee539845dd170a596e0b22c6ef5b337405a72e bmo-1952657-no-execinfo.patch 8775931ad403f8a6545ecbedf139b7e7e152a2d6638f70d8feb457ea33e6e86147cd3c882e8059732ae946045b4918b412d0d6ba4dfdaeb2878a2277c6671676 bmo-1988166-no-single_threaded-h.patch 19eea840aa9c1c21e7bd1f832ec078989fe6f08fca40baa271be7e74f1cffeb5ab8d3218a93e664b8d90a41506dede524e2a5174cd47580866109bc6711ea969 fix-fortify-system-wrappers.patch 0b9f44c3c2c4efaf073d2021357f7ad61f7e8ca316494c35f785723f43e0e9b29712cd22abe02260df43a5c57cf394e8a1e308cab5a001620ed8a458a563fceb fix-libresolv-path.patch +8350f0440476c3d3d9bb44d305eeb9224674f6977677b2b32abba4939b458f66d00f49a18c613563ddbb3431c77fc7b448098fce6dd39386961392e004990a3f fix-lp64.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch -49e21f0dbfe12ec12082c599e9b7d04b5f0f0a68308d1dbc7c8e9f4297803b54df47efaa7c405798c09cfb2a77e6b3b907805f21aed0f82f005e328b2d28c29d fix-webrtc-glibcisms.patch e75daab5573ec6e28d3940a9bb98304d572dfb26ce7c1709e99fdd75dfa58abce170c96de683f8dc2224ea2e118aa7d78affbd54f99c4e328a4641685d64bd7d lfs64.patch 79948c0670e4ff1d9dac3b11b64937e58fb73dd9ea405cbebc6777ec96243ac3d8ac820b2ac67c1b39aaa286267da156b00ff28abc40a5071e189637046b9834 metainfo.patch +188ed701631a4034450d2ec2bf60acc4f0e6d7654cc9d8d5ea19bde2df16d22c288e21c90aa41e4ace6c806d1653be31db9232c980673d6a41e9717bceaa2e3d musl-no-linux-prctl.patch c0437a6753f3f350968fa12d250efdfe1bea77baf0e4c06b072b5cc9e78c774dbf4506bc536337030d349fb3ba4460097b75b0c7c5b8fb2d39d8b0a392948936 no-ccache-stats.patch 5518b7fa131f1a75a24ebd62288d826f9c977113df86b6f36651047d8dd941952b34c8c5fcbac8eff6656ccfa34f86c0c03304db5ff9331f9627897391ccbf0f rust-lto-thin.patch 459ab49620e8446e502a256bde8ce5254289b893a618c7e71e8fcf93a3f49a5848eaef872b464e0d09b7417c089ce83dfba24e8d95b5e773126011d9a81246a0 rust1.90-ppc.patch f8c3555ef6207933cbffbf4fc101a9b4c0d2990c0063162f0f0bde70ef0b46f86bfac42e7110695183424a87948de593f3927b2d8509ede3e4fc7bd8a1fad1ce sandbox-sched_setscheduler.patch 67bc0be3da973e6859256bf9be4df7100837430e6076fc0bd623f504c35e02e6c191e9c5a3a1d202e5ad4d89f874f254a09e164e39c7bfd97bbc8d4c8d0632a5 sqlite-ppc.patch -69afe760bc35ff4767b4264a484b9d2a5d54ef7e4bd3fe49f97c33a962dbfb4464d5763e8e319cbf7cd9505235c26f2dac69b157d108f94b2aab4cb41de9d6a1 icu-78.patch +1717793c2a8ffdbdb0845d1eb46d2e43da688f74e0fb74679f4c78a1bd18faaf729faf41a404e094dbd7d49d9254955b366cce8923483acfd7a0d05331e617d7 webrtc-cstdint.patch 10190908796ea681cb9c7726e5f000d010dc438560f1c9574ad52f91b984c92634291453d4f7cdb3a5b5e54c1968513bf78d4dc44f5befa39d58065d0e9c3326 loong0001-Enable-WebRTC-for-loongarch64.patch bcc6987568082e5471962fed98110c13f9a81de7bba11cd961c2ac6c1240e677dc141d6834bf5755d2d85fc8251e522920dd3d9afae20ed9d9896b632ee9336f loong0003-Define-HWCAP_LOONGARCH_LSX_and_LASX.patch f95b3a8338b34c98ae028278fcec3a1ae48d8de9fa9eed54544151ae994b57b8d0ff0e6363632257d3cbe9452bcd93ade5c139cf728d0a149a038a179a0b4016 loong0004-Fix-ycbcr-chromium_types-warning.patch diff --git a/community/thunderbird/fix-lp64.patch b/community/thunderbird/fix-lp64.patch new file mode 100644 index 00000000000..269d0c8bee5 --- /dev/null +++ b/community/thunderbird/fix-lp64.patch @@ -0,0 +1,43 @@ +Patch-Source: https://github.com/google/brotli/commit/e230f474b87134e8c6c85b630084c612057f253e +From e230f474b87134e8c6c85b630084c612057f253e Mon Sep 17 00:00:00 2001 +From: Evgenii Kliuchnikov +Date: Mon, 3 Nov 2025 07:20:19 -0800 +Subject: [PATCH] disable BROTLI_MODEL macro for some targets + +PiperOrigin-RevId: 827486322 +--- + c/common/platform.h | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/c/common/platform.h b/c/common/platform.h +index b59f9b809..e1254d5ca 100644 +--- a/modules/brotli/common/platform.h ++++ b/modules/brotli/common/platform.h +@@ -213,6 +213,10 @@ To apply compiler hint, enclose the branching condition into macros, like this: + #define BROTLI_TARGET_MIPS64 + #endif + ++#if defined(__ia64__) || defined(_M_IA64) ++#define BROTLI_TARGET_IA64 ++#endif ++ + #if defined(BROTLI_TARGET_X64) || defined(BROTLI_TARGET_ARMV8_64) || \ + defined(BROTLI_TARGET_POWERPC64) || defined(BROTLI_TARGET_RISCV64) || \ + defined(BROTLI_TARGET_LOONGARCH64) || defined(BROTLI_TARGET_MIPS64) +@@ -665,13 +669,14 @@ BROTLI_UNUSED_FUNCTION void BrotliSuppressUnusedFunctions(void) { + #undef BROTLI_TEST + #endif + +-#if BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3) ++#if !defined(BROTLI_MODEL) && BROTLI_GNUC_HAS_ATTRIBUTE(model, 3, 0, 3) && \ ++ !defined(BROTLI_TARGET_IA64) && !defined(BROTLI_TARGET_LOONGARCH64) + #define BROTLI_MODEL(M) __attribute__((model(M))) + #else + #define BROTLI_MODEL(M) /* M */ + #endif + +-#if BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0) ++#if !defined(BROTLI_COLD) && BROTLI_GNUC_HAS_ATTRIBUTE(cold, 4, 3, 0) + #define BROTLI_COLD __attribute__((cold)) + #else + #define BROTLI_COLD /* cold */ diff --git a/community/thunderbird/fix-webrtc-glibcisms.patch b/community/thunderbird/fix-webrtc-glibcisms.patch deleted file mode 100644 index a702b56d68c..00000000000 --- a/community/thunderbird/fix-webrtc-glibcisms.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/third_party/libwebrtc/rtc_base/cpu_info.cc -+++ b/third_party/libwebrtc/rtc_base/cpu_info.cc -@@ -37,7 +37,7 @@ - #define WEBRTC_GLIBC_PREREQ(a, b) 0 - #endif - --#if WEBRTC_GLIBC_PREREQ(2, 16) -+#if !__GLIBC__ || WEBRTC_GLIBC_PREREQ(2, 16) - #include // IWYU pragma: keep - #else - #include -@@ -205,7 +205,7 @@ - return false; - #elif defined(WEBRTC_LINUX) - uint64_t hwcap = 0; --#if WEBRTC_GLIBC_PREREQ(2, 16) -+#if !__GLIBC__ || WEBRTC_GLIBC_PREREQ(2, 16) - hwcap = getauxval(AT_HWCAP); - #else - ElfW(auxv_t) auxv; diff --git a/community/thunderbird/icu-78.patch b/community/thunderbird/icu-78.patch deleted file mode 100644 index c6c9e0530e0..00000000000 --- a/community/thunderbird/icu-78.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp ---- a/intl/lwbrk/LineBreaker.cpp -+++ b/intl/lwbrk/LineBreaker.cpp -@@ -451,10 +451,11 @@ - /* AKSARA = 43, [AK] */ CLASS_CHARACTER, - /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER, - /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER, - /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER, - /* VIRAMA = 47, [VI] */ CLASS_CHARACTER, -+ /* UNAMBIGUOUS_HYPHEN = 48 [HH] */ CLASS_BREAKABLE, - }; - - static_assert(U_LB_COUNT == std::size(sUnicodeLineBreakToClass), - "Gecko vs ICU LineBreak class mismatch"); - - diff --git a/community/thunderbird/musl-no-linux-prctl.patch b/community/thunderbird/musl-no-linux-prctl.patch new file mode 100644 index 00000000000..a8f692e00b6 --- /dev/null +++ b/community/thunderbird/musl-no-linux-prctl.patch @@ -0,0 +1,19 @@ +see https://www.openwall.com/lists/musl/2025/06/12/11 + + /usr/include/sys/prctl.h:88:8: error: redefinition of 'prctl_mm_map' + 88 | struct prctl_mm_map { + | ^ + /usr/include/linux/prctl.h:134:8: note: previous definition is here + 134 | struct prctl_mm_map { + | ^ + +--- a/third_party/libwebrtc/rtc_base/platform_thread_types.cc ++++ b/third_party/libwebrtc/rtc_base/platform_thread_types.cc +@@ -12,7 +12,6 @@ + + // IWYU pragma: begin_keep + #if defined(WEBRTC_LINUX) +-#include + #include + #include + diff --git a/community/thunderbird/webrtc-cstdint.patch b/community/thunderbird/webrtc-cstdint.patch new file mode 100644 index 00000000000..9b2d8754ff4 --- /dev/null +++ b/community/thunderbird/webrtc-cstdint.patch @@ -0,0 +1,10 @@ +--- a/dom/media/webrtc/libwebrtc_overrides/call/call_basic_stats.h ++++ b/dom/media/webrtc/libwebrtc_overrides/call/call_basic_stats.h +@@ -9,6 +9,7 @@ + + #include + #include ++#include + + namespace webrtc { +