From c9a8538517b114857a9392c7d421b1c4708a9777 Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com> Date: Fri, 28 Aug 2020 20:46:09 +0100 Subject: [PATCH 1/2] thunderbird-i18n: update to 78.2.0 --- srcpkgs/thunderbird-i18n/template | 114 +++++++++++++++--------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index fd9c9580559..a739b08e539 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=68.11.0 +version=78.2.0 revision=1 build_style=meta short_desc="Thunderbird language packs" @@ -79,7 +79,7 @@ for _lang in "${_languages[@]}"; do _pkgname=thunderbird-i18n-${_locale} depends+=" ${_pkgname}>=${version}" - distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-i686/xpi/${_locale}.xpi" + distfiles+=" ${MOZILLA_SITE}/thunderbird/releases/${version}/linux-x86_64/xpi/${_locale}.xpi" eval "${_pkgname}_package() { _pkgtmpl $_lang @@ -96,58 +96,58 @@ _pkgtmpl() { } } -checksum="29ebac8c1596b508a1a19977524bcb9b9d357b8b422274c03f085bc2a1e5d11b - b36fc2bc7ee070202ec3caa6ffe3bc24f527d8c076e33f0f3ac7c2bb34678264 - c425d737792ab8a4793e4c9ac094027c9ecfabe5bdc56c205e1b57b999626fd2 - 344962eb54d66b925d1e9d2139e92bec9d3f7c273d2735ab4933004efb2cc300 - ff8f1460b1c3dec628985fb047c62d75847a8ab1fdef553324dcd1b1c7a058e5 - bd531fa67ef6b4406e778cb5b0e09dc38e6de2f08d48c2fe87bfb13ba62eebac - 9690c8600e36c138954bc2848d71872346c1e747b97a2bc180783779af589c15 - 52afdc19898b244a0a751ec5e89f223922554931c6a5cfb46289b3f71e7e4700 - 47c6881a303ade66dca9618b5127557be7511e1d44a64892efecefd451b7f7e0 - 77d63f3133a1978d139098af5d2e2cc19675c1bf380a7f2dac2d59ce876c29ee - 046e46ecee6430a190f0f8cfdcc4723f5d69f617d1167788ebcd410fd6c206e5 - afa61ad764739ea2f171e8c3338883b2b076e354a40c39d73709d5592f3ad577 - 7cfabfb6454de77116b7ca806ca43cf1c93b21b126708e787f7e0d2e3b1907af - 7d38732aef00b03c54f353cd81f5b22fb43437f0b0960ae269c0af58832e7044 - 9690287d26cd6d3fd8301f762a40d4304ef7dbf0f73da913a793eb5f171295af - c9eafbbdf6a267804dbfb2f5f8d6f1a1b53aa0fa9426f9af05138655a49d61f6 - c5d249574dc53a8425bef3469d2bf6aa3e1735a9cef1cfe5339a7c4b674294a1 - 6a6bcdddbf4cf6edae30b7d5eba330232d88fc2722085409ecbac0861f661d05 - ac2abdbd3cad39a5d52626ffe00e7f59ab52c669b3da6f43268d62e2f01345d7 - 566718f0068fccedacf3cee3ab56a36e849bc3d4acadf508962c81981f29e7e9 - bb94fb6835400bfe0b70276fc45e941b4a5dd809f946865dfca841373beb42f7 - 9b36cc8688ab7871ef90f7778b3747fc6503a56ed42f8faafa0b6568e9a906d0 - b99159527690293830cf167affa9a604c26a10e268d0617a3d06e7319ff8572a - 22695eda8f34c749e95a310752461d48f45eafb428dbf6a1d324e223577fae0d - f35d72064fd5a7246020e5958d8d43b0f0e1f439aee7095e306318400bd4b298 - e015951a49b812ae1889e24dd67f67cc26c38242a0c20708ef845277559b131d - 343acef6937334a0a525fd181f88c7f68f75e93cdeacffef05df4a8211e288b7 - c9e3739e55834d7512e5817498c358498a3cb0f652f21c213c06287204ebed01 - 2381df9b757dd2aac778001a09f36d88e98f2620dd05813425f53b9e35f26040 - a6f21d925b9334d5f46e054ae6db492f7c3c8c62b043a292e45a984a37ef6087 - ced2a3d7a590e538ca6d817efda47478ca198246640835733c5d579205fd9059 - c2bff27ecd581fffb156cb9fdfc26cdfa2a2fd8dab3ad478c80ca53d22c59ef6 - efc4f0b1781463bdf0561e25e9c31dc5878949cbd34684393f168b7b69f88e15 - c4fac0f3281e59de3a1a43767ac497689605d6e35673e3606b5a43fb835cd47a - fc034024f5a960d3ac82b5b5b99dc481b8d6508496bd6264dd873c4883a9440e - c3c5fe21cb5bb84af9b6428ff6f62ba8b669dc931ea3bd66225bd3d88aec07f8 - bb5955b070dd509f4a8f170162826ec497d0a09e56eaa641e8223328b67408a3 - a0d018d37b19fa4e82d89411c9e297df12fa56b003f6631cfbc12355dd8cac94 - d8a5eac605c4288f1946de393dd52b9c16f8f618335c1e609806b5ec806d697a - 867cd73998fca97eeb29a08ae3b492329741bcfcd157c275e2f7c3d75dd2da7f - a56814cbc21b8415645c655ae20836935c3fba31d66c0b33de33ace295a294e3 - 0dbbca82f751b0fe80ca7f3b161350d982e966499e0835c415cd7ed32861b3a7 - 238f218891c28e1505bddbd08a183896b93d383d56e5a429a8ac731d30b54624 - 2d7f404c97d377275a4e9be9fcf5712ba2b85c161042d80f992c4c1d794890f5 - 3093d3e5de225238bb15c459c0b317c5ebf05302389d03cbd0b69768ca9c011d - 313247a18560313e0d39895713c793488e98c705659fc5b6aaba59fd25fbeb5c - 06542ba7fad18017e52b135ab68266a0c791a1446b36b55f4476e9e6720c33d0 - abfeca306d10dcaba73becffa90bf830707983f341b8abfec90203297c2f676e - cb1e4c67fad60b0080ce304a78728174f463093a2a6d730b5bd6739b5a15c370 - 93da2ce9ffa2aec8aa56fd88c97ee5bead6b8ba46b4df3bd98a4376402669183 - d6144c43d24bff108ae787092bbbefe91c135345a923f7f8b951ac7cd46fa807 - c2c24bfe1522a36181b6c6d03acf98a0df3921c0493cc8c818df70ebf2760c53 - d68229f3b05b80ad807cd2a750b916e460665574c96b5b8e5258e2f689a4a971 - 4ca52ff75e0358feb4a535617076d2aede70b0d7ab29524a4b4bfe4f1b7ab0da - ff20a2ac005ee398f2aec1897f578ed38072b7b21e3e962abc67ecb66d01d3fe" +checksum="1951d1412b6e3de153bec871ac75b182529c40d703b0e6faa3aacdac35744498 + c90fb72b96a8c4ac3c1efd045962242d98a2f803955df3e88888736478d63602 + 8e82fa53f8237eb0d2afa1c8c4ce9da209bce4554483e151dba43da93262d1f3 + 286565e0de10090182497bf540b5b29676fa0faffc40f63bbf1bc9666cee37f0 + d27c97c11dec8d7948e9e959c75a52b1d0aaf86ad8ef8148a73a2de4b20fc1f6 + 2eaf51fdf94935bbf91c4414afd54ad04fe685abe5a6ac8628d72e71ecd07e35 + fe80c229e70619d5d6ce9f55de4bca1c61d4053e3d32aa5cbd51e2a05ae2b83b + c0f77657ed1841edea389f76d20313a9b433c2b6b0173ae9393be241b26ddc71 + d1a74be7f40e1c1ab72c8a1b5dbe49f9a5edd23b9e99b99fc9a9265dcf7c637c + 215a7134b6980c9bd76662d331aa27170361a7e3382bb66de778be31e8d8be78 + 9722f33259e2f097b246e4f6b560ba50c2cbed0e9b85525e84c84d46a4997c82 + 3bec3846afec50553d57e3e9e066244dc0f05e2a2bdb3ae8b4f9f02e3c8ca35d + 1b53f351976e964f0384f018042c2f5e4b50db9a491f75dfadc09bf765d18e73 + 6bb04c7748f451e9df011fc54c875dea56e536402c04d0cba27dcee8efa4f0fd + 05f7c731b095838c754c3fc4c5614e1a596c69f9538aa975effd86c787117e49 + 0d33d4f160822887d087dfe9174ccdc2ea1e2cc8878607ddadff0d34968a0a13 + 9f3d13e3f24dd61073d6c738d0249119283c1e3f89734b409c48e44c8472730a + 24f4f814051c8324b41867fd855b1fc78c768201e153bfb8640db440de58c853 + 45948336e9def651199d548df702459d4fb7667c11c057984efe932039df0312 + 74c32583b012c8daa0f6d5c844b502ebe76eaac2d61cc3a0331f265c3b8cdad1 + fc63430d1c60b2c1ae66076e502616fa440d35cf2c6b09acbf3e4ca34d2519f7 + 81ee3a9c75dc85c466917fe33a66cafca363b87d7b1bf0cb5b7b464253b5f5aa + a6bcddab931c266658ddfc4c668429cc5342cd8a232df10f8ceaa590bc49a840 + e86b82a50d69c88e3dac4f4f5d3a4ac2a27ac1b6db5388384c0e79aa21f77caf + ba3774750117a480ca7d18a7830f27eb5e2f493e25b3f22cf805186e3925563e + 714446124f4caa4fbe8411c15d6041f2c5e0080c154e5befac4e557a8a74dd8f + 5c8bf7f727f6ea7370a39cd013107e3b24a21b56ae335a71dffbfa243c13b742 + fb1420d63515857657a92ef38371b1b9a0aa897b7aadc9e451bf2d9da4ffef17 + 696b62a8043b3486a059fe8487bf0749065d9e878311eeec0730304647862d85 + b5649b00e2fc530b8f63d5f963511c6ef7cae4deadf70fb83d4e70972c7c313b + a6ecba0825dbc2f3bec693577b850ca52acd100d0df3af544784c23fb6d1f4f0 + d36dc9011d464bc027bb0b3c91ccd73baa879d8c814d790f802a9ddaf2b805e2 + 410ca6c4a58e2d0d6057dd9203b9d7eb4b93baf1ec4a8e5ebb8651bf80138d8f + 49702c62a0156218a9e3b405da1629f38e519f4880a873040df1948c36408396 + ac3312e70ca69310620582a23abcb18b7e8e7486cc6f2753ee77f3f52ecb3d0b + f7ab49c53fd9aad793c6efd95fae234af85fdfb83c6ed27e7be158a1aa7e738e + 40ad4638619e3ba1a10a3e4435576d9d56033cd04575cb839072070d4e71a844 + 7bcf1a1e811df56a16cfbd1ed9aaaec4be87ceeeb627b637453c7bef8af926b6 + abedc83798c5a8d1254f6f0cf2a938f702854749a70cbb1eae667674b6929c71 + 283678aa2856fc587b881350c951416aa76086ad1175d9174eafbc6c9b9e4e33 + 31909339d708f4d039ad2b155cdce0b556f5070e727557f07be3d890debb9608 + fc0c86ca18e652438a38fef65f1302405953d88bd187d18c3e71cc2adabfa63d + 62215faec6e80fff004957f544b94cb80615894741be6be265ef7701d0ddb871 + 8ff77a6f9b18aa28dc969415b4113840c647409d55a8e2c97800095f6f1f2dee + f1cc4f47b187a09f16929f531b44e6a7d26473a175a44dca33a13a59ee79b88c + 1e73ff8f4f5b0290a84810b1a7ba60abcf0ab3a5d40a3eb9a179c94af79c2f69 + 0be99f9215e5f96f6e2590a3fab30e739d5aa237578de23d9147fc10a9734cac + 4b164ee6f3d4d82a751b6be64d7b8a90c31f5669ceede3ff98355b3381ffceaf + 6936cc84a1f76519ab915d0c91fb66024556afa9af686ced76daa2f326b7ed77 + c278a4c70b3f90ba6d499be3828d999d63ce6eed13b126c3611e812558aeb0d5 + 7e33b56d19a8ec633ce2223d0caf7d8cfe999c3259a2377b07f345ad3827658d + aecc84bab9abecf1f8090450ade2f7eac172865b5b7422407cfa04b2e5e17fd9 + 1b8878eeef01f2961a1d6beb302e68fd895cdd4f5b0da87f70393b20ccd81767 + 93e7cf622a273c4169226af136b798d5e363b765e00ec788aab510d4eab846a0 + dd6030769be34a901ce1af8753f45ec67ee893057fa9a7c37aca41117f3ac2a9" From b6034a9b97ef0ced8ad039965399c3c92e30d206 Mon Sep 17 00:00:00 2001 From: mmnmnnmnmm <45293514+mmnmnnmnmm@users.noreply.github.com> Date: Fri, 28 Aug 2020 20:49:23 +0100 Subject: [PATCH 2/2] thunderbird: update to 78.2.0 [ci skip] --- srcpkgs/thunderbird/files/mozconfig | 10 +-- srcpkgs/thunderbird/files/thunderbird-wayland | 2 + .../patches/fix-i686-ppc-musl.patch | 8 +- srcpkgs/thunderbird/patches/fix-musl.patch | 11 --- .../patches/fix-sandbox-membarrier.patch | 52 ------------ .../thunderbird/patches/fix-seccomp-bpf.patch | 14 ---- srcpkgs/thunderbird/patches/fix-toolkit.patch | 78 ------------------ srcpkgs/thunderbird/patches/fix-tools.patch | 17 ---- .../thunderbird/patches/ppc32-fix-build.patch | 36 +++++++++ .../patches/ppc32-skia-portable.patch | 14 ---- .../thunderbird/patches/rust-configure.patch | 15 ++-- .../thunderbird/patches/rust-glslopt.patch | 13 +++ .../thunderbird/patches/rust-has-i128.patch | 21 +++++ .../thunderbird/patches/sandbox-fork.patch | 13 +++ srcpkgs/thunderbird/patches/sndio.patch | 81 +++++-------------- srcpkgs/thunderbird/template | 61 +++++++------- 16 files changed, 147 insertions(+), 299 deletions(-) create mode 100644 srcpkgs/thunderbird/files/thunderbird-wayland delete mode 100644 srcpkgs/thunderbird/patches/fix-musl.patch delete mode 100644 srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch delete mode 100644 srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch delete mode 100644 srcpkgs/thunderbird/patches/fix-toolkit.patch create mode 100644 srcpkgs/thunderbird/patches/ppc32-fix-build.patch delete mode 100644 srcpkgs/thunderbird/patches/ppc32-skia-portable.patch create mode 100644 srcpkgs/thunderbird/patches/rust-glslopt.patch create mode 100644 srcpkgs/thunderbird/patches/rust-has-i128.patch create mode 100644 srcpkgs/thunderbird/patches/sandbox-fork.patch diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig index 334846e9a64..ed6cfb244cb 100644 --- a/srcpkgs/thunderbird/files/mozconfig +++ b/srcpkgs/thunderbird/files/mozconfig @@ -3,7 +3,6 @@ ac_add_options --libdir=/usr/lib ac_add_options --with-system-nspr ac_add_options --with-system-nss -ac_add_options --with-system-bz2 ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-libevent @@ -12,12 +11,8 @@ ac_add_options --with-system-icu # XXX: the system's libpng doesn't have APNG support ac_add_options --without-system-png ac_add_options --enable-system-pixman -ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi -ac_add_options --with-nspr-prefix=${XBPS_CROSS_BASE}/usr -ac_add_options --with-nss-prefix=${XBPS_CROSS_BASE}/usr - nspr_config_args=" --libdir=${XBPS_CROSS_BASE}/usr/lib --includedir=${XBPS_CROSS_BASE}/usr/include/nspr" @@ -26,16 +21,15 @@ nss_config_args=" --libdir=${XBPS_CROSS_BASE}/usr/lib --includedir=${XBPS_CROSS_BASE}/usr/include/nss" -ac_add_options --disable-gconf ac_add_options --disable-tests ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-install-strip ac_add_options --disable-strip ac_add_options --disable-profiling -ac_add_options --disable-gold +ac_add_options --enable-release ac_add_options --enable-optimize="$CFLAGS" ac_add_options --enable-official-branding -ac_add_options --enable-calendar ac_add_options --enable-application=comm/mail +ac_add_options --enable-calendar diff --git a/srcpkgs/thunderbird/files/thunderbird-wayland b/srcpkgs/thunderbird/files/thunderbird-wayland new file mode 100644 index 00000000000..cd7f9ab7394 --- /dev/null +++ b/srcpkgs/thunderbird/files/thunderbird-wayland @@ -0,0 +1,2 @@ +#!/bin/sh +exec env MOZ_ENABLE_WAYLAND= /usr/lib/thunderbird/thunderbird "$@" diff --git a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch index 40aab43ae86..6df609bbf16 100644 --- a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch +++ b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch @@ -1,11 +1,11 @@ --- mozglue/misc/StackWalk.cpp 2017-04-11 04:13:21.000000000 +0200 +++ mozglue/misc/StackWalk.cpp 2017-11-29 15:23:07.218649970 +0100 -@@ -33,7 +33,7 @@ using namespace mozilla; - # define MOZ_STACKWALK_SUPPORTS_MACOSX 0 +@@ -41,7 +41,7 @@ + #define MOZ_STACKWALK_SUPPORTS_MACOSX 0 #endif --#if (defined(linux) && \ +-#if (defined(linux) && \ +#if defined(__GLIBC__) && (defined(linux) && \ ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ defined(HAVE__UNWIND_BACKTRACE))) - # define MOZ_STACKWALK_SUPPORTS_LINUX 1 + #define MOZ_STACKWALK_SUPPORTS_LINUX 1 diff --git a/srcpkgs/thunderbird/patches/fix-musl.patch b/srcpkgs/thunderbird/patches/fix-musl.patch deleted file mode 100644 index c1cb99bf651..00000000000 --- a/srcpkgs/thunderbird/patches/fix-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/profiler/core/platform-linux-android.cpp.orig 2019-07-09 22:58:30.039475686 +0200 -+++ tools/profiler/core/platform-linux-android.cpp 2019-07-09 22:58:39.331437677 +0200 -@@ -73,7 +73,7 @@ - - int profiler_current_thread_id() { - // glibc doesn't provide a wrapper for gettid(). --#if defined(__GLIBC__) -+#if defined(__linux__) - return static_cast(static_cast(syscall(SYS_gettid))); - #else - return static_cast(gettid()); diff --git a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch b/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch deleted file mode 100644 index caffd83cf67..00000000000 --- a/srcpkgs/thunderbird/patches/fix-sandbox-membarrier.patch +++ /dev/null @@ -1,52 +0,0 @@ -allow usage of SYS_membarrier, needed since musl-1.1.22 - ---- security/sandbox/linux/SandboxFilter.cpp -+++ security/sandbox/linux/SandboxFilter.cpp -@@ -283,6 +283,8 @@ - case __NR_set_tid_address: - return Allow(); - #endif -+ case __NR_membarrier: -+ return Allow(); - - // prctl - case __NR_prctl: { - ---- security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -+++ security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -@@ -1385,6 +1385,10 @@ - #define __NR_memfd_create (__NR_SYSCALL_BASE+385) - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier (__NR_SYSCALL_BASE+389) -+#endif -+ - // ARM private syscalls. - #if !defined(__ARM_NR_BASE) - #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000) - ---- security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -@@ -1290,5 +1290,9 @@ - #define __NR_memfd_create 319 - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier 324 -+#endif -+ - #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_ - ---- security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -+++ security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -@@ -1490,5 +1490,9 @@ - #define __NR_shutdown 373 - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier 375 -+#endif -+ - #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_ - diff --git a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch b/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch deleted file mode 100644 index ed94fc39ed0..00000000000 --- a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig 2015-09-23 09:10:08.812740571 +0200 -+++ security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-09-23 09:11:38.404746155 +0200 -@@ -23,6 +23,11 @@ - #include "sandbox/linux/services/android_ucontext.h" - #endif - -+// musl libc defines siginfo_t __si_fields instead of _sifields -+#if defined(OS_LINUX) && !defined(__GLIBC__) -+#define _sifields __si_fields -+#endif -+ - namespace { - - struct arch_sigsys { diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch deleted file mode 100644 index 86e8ef47855..00000000000 --- a/srcpkgs/thunderbird/patches/fix-toolkit.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig 2016-07-05 21:00:03.672000517 +0200 -+++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200 -@@ -1134,6 +1134,12 @@ - #ifndef __NR_fallocate - #define __NR_fallocate 285 - #endif -+ -+#undef __NR_pread -+#define __NR_pread __NR_pread64 -+#undef __NR_pwrite -+#define __NR_pwrite __NR_pwrite64 -+ - /* End of x86-64 definitions */ - #elif defined(__mips__) - #if _MIPS_SIM == _MIPS_SIM_ABI32 ---- toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-03-15 05:19:36.000000000 +0000 -+++ toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-04-17 10:24:33.793431933 +0000 -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - - #include - #include ---- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-03-15 05:19:36.000000000 +0000 -+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-04-17 10:24:33.793431933 +0000 -@@ -41,6 +41,10 @@ - - #include "common/using_std_string.h" - -+#ifndef N_UNDF -+#define N_UNDF 0 -+#endif -+ - using std::vector; - - namespace google_breakpad { ---- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-03-15 05:19:36.000000000 +0000 -+++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-04-17 10:24:33.793431933 +0000 -@@ -55,7 +55,7 @@ - - #ifdef HAVE_MACH_O_NLIST_H - #include --#elif defined(HAVE_A_OUT_H) -+#elif 0 - #include - #endif - ---- toolkit.orig/mozapps/update/common/updatedefines.h 2019-01-29 11:34:36.416804577 +0100 -+++ toolkit/mozapps/update/common/updatedefines.h 2019-01-29 11:34:59.193583777 +0100 -@@ -102,7 +102,7 @@ - - # ifdef SOLARIS - # include --# else -+# elif !(defined(__linux__)) || defined(__GLIBC__) - # include - # endif - # include ---- toolkit.orig/mozapps/update/updater/updater.cpp 2014-03-15 05:19:37.000000000 +0000 -+++ toolkit/mozapps/update/updater/updater.cpp 2014-04-17 10:24:33.796765327 +0000 -@@ -3978,6 +3978,7 @@ - - int add_dir_entries(const NS_tchar* dirpath, ActionList* list) { - int rv = OK; -+#if !defined(__linux__) || defined(__GLIBC__) - FTS* ftsdir; - FTSENT* ftsdirEntry; - mozilla::UniquePtr searchpath(get_full_path(dirpath)); -@@ -4085,6 +4086,7 @@ - } - - fts_close(ftsdir); -+#endif - - return rv; - } diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch index 0ed043fb5b5..d29da8bb54b 100644 --- a/srcpkgs/thunderbird/patches/fix-tools.patch +++ b/srcpkgs/thunderbird/patches/fix-tools.patch @@ -1,20 +1,3 @@ ---- tools/profiler/lul/LulElf.cpp.orig 2019-01-29 12:05:34.223834130 +0100 -+++ tools/profiler/lul/LulElf.cpp 2019-01-29 12:08:02.480400845 +0100 -@@ -469,10 +469,10 @@ - // Return the non-directory portion of FILENAME: the portion after the - // last slash, or the whole filename if there are no slashes. - string BaseFileName(const string& filename) { -- // Lots of copies! basename's behavior is less than ideal. -- char* c_filename = strdup(filename.c_str()); -- string base = basename(c_filename); -- free(c_filename); -+ // basename's behavior is less than ideal so avoid it -+ const char *c_filename = filename.c_str(); -+ const char *p = strrchr(c_filename, '/'); -+ string base = p ? p+1 : c_filename; - return base; - } - --- tools/profiler/core/platform-linux-android.cpp.orig 2019-01-29 12:09:40.980448579 +0100 +++ tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100 @@ -253,7 +253,11 @@ diff --git a/srcpkgs/thunderbird/patches/ppc32-fix-build.patch b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch new file mode 100644 index 00000000000..c1a8f422d0a --- /dev/null +++ b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch @@ -0,0 +1,36 @@ +This is not a complete/correct patch, but it makes firefox build. For now +mostly for tracking, so a real fix can be made, but right now it still +segfaults on start. + +Ref: https://hg.mozilla.org/mozilla-central/rev/08339a56f3ae +Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60 +Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e +Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp + +--- xpcom/reflect/xptcall/xptcall.h ++++ xpcom/reflect/xptcall/xptcall.h +@@ -71,6 +71,11 @@ struct nsXPTCVariant { + ExtendedVal ext; + }; + ++#if defined(__powerpc__) && !defined(__powerpc64__) ++ // this field is still necessary on ppc32, as an address ++ // to it is taken certain places in xptcall ++ void *ptr; ++#endif + nsXPTType type; + uint8_t flags; + +@@ -91,7 +96,12 @@ struct nsXPTCVariant { + }; + + void ClearFlags() { flags = 0; } ++#if defined(__powerpc__) && !defined(__powerpc64__) ++ void SetIndirect() { ptr = &val; flags |= IS_INDIRECT; } ++ bool IsPtrData() const { return IsIndirect(); } ++#else + void SetIndirect() { flags |= IS_INDIRECT; } ++#endif + + bool IsIndirect() const { return 0 != (flags & IS_INDIRECT); } + diff --git a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch b/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch deleted file mode 100644 index 93c625a861e..00000000000 --- a/srcpkgs/thunderbird/patches/ppc32-skia-portable.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gfx/skia/skia/third_party/skcms/skcms.cc -+++ gfx/skia/skia/third_party/skcms/skcms.cc -@@ -1806,6 +1806,11 @@ typedef enum { - Op_store_ffff, - } Op; - -+// work around ICE on 32-bit ppc -+#if defined(__powerpc__) && !defined(__powerpc64__) -+# define SKCMS_PORTABLE -+#endif -+ - #if defined(__clang__) - template using Vec = T __attribute__((ext_vector_type(N))); - #elif defined(__GNUC__) diff --git a/srcpkgs/thunderbird/patches/rust-configure.patch b/srcpkgs/thunderbird/patches/rust-configure.patch index 09191782b35..887c102bc55 100644 --- a/srcpkgs/thunderbird/patches/rust-configure.patch +++ b/srcpkgs/thunderbird/patches/rust-configure.patch @@ -1,20 +1,23 @@ ---- build/moz.configure/rust.configure 2020-06-06 10:05:25.819337924 +0200 -+++ build/moz.configure/rust.configure 2020-06-06 10:07:11.346031015 +0200 -@@ -79,10 +79,6 @@ +Mozilla rustc check does not support crossbuild: let's remove it +Remove calls to unwrap_rustup, they fail if rustup isn't present + +--- build/moz.configure/rust.configure.orig 2019-10-17 04:19:59.000000000 +0700 ++++ build/moz.configure/rust.configure 2019-10-22 11:48:55.616022140 +0700 +@@ -78,9 +78,6 @@ return unwrap -rustc = unwrap_rustup(rustc, 'rustc') -cargo = unwrap_rustup(cargo, 'cargo') - -- + set_config('CARGO', cargo) set_config('RUSTC', rustc) +@@ -348,26 +345,6 @@ -@@ -366,25 +362,6 @@ os.write(in_fd, source) os.close(in_fd) - +- - cmd = [ - rustc, - '--crate-type', 'staticlib', diff --git a/srcpkgs/thunderbird/patches/rust-glslopt.patch b/srcpkgs/thunderbird/patches/rust-glslopt.patch new file mode 100644 index 00000000000..3717caa2290 --- /dev/null +++ b/srcpkgs/thunderbird/patches/rust-glslopt.patch @@ -0,0 +1,13 @@ +overwrite HOST_* flags to get rid of -MF + +--- third_party/rust/glslopt/build.rs 2020-06-03 01:37:31.000000000 +0200 ++++ third_party/rust/glslopt/build.rs 2020-06-04 10:57:16.418469546 +0200 +@@ -28,6 +28,8 @@ + env::remove_var(format!("CXXFLAGS_{}", &target)); + env::remove_var(format!("CFLAGS_{}", target.replace("-", "_"))); + env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_"))); ++ env::set_var("HOST_CFLAGS", "-O2"); ++ env::set_var("HOST_CXXFLAGS", "-O2"); + + configure(&mut cc::Build::new()) + .warnings(false) diff --git a/srcpkgs/thunderbird/patches/rust-has-i128.patch b/srcpkgs/thunderbird/patches/rust-has-i128.patch new file mode 100644 index 00000000000..4c90cd3d106 --- /dev/null +++ b/srcpkgs/thunderbird/patches/rust-has-i128.patch @@ -0,0 +1,21 @@ +The configure check fails for cross builds. +i128 is supported since rust-1.26, so it is safe for us to assume it is always present + +--- third_party/rust/num-traits/build.rs.orig 2020-02-14 23:57:25.985355610 +0100 ++++ third_party/rust/num-traits/build.rs 2020-02-14 23:58:36.255710188 +0100 +@@ -1,14 +1,5 @@ +-extern crate autocfg; +- +-use std::env; +- + fn main() { +- let ac = autocfg::new(); +- if ac.probe_type("i128") { +- println!("cargo:rustc-cfg=has_i128"); +- } else if env::var_os("CARGO_FEATURE_I128").is_some() { +- panic!("i128 support was not detected!"); +- } ++ println!("cargo:rustc-cfg=has_i128"); + + autocfg::rerun_path("build.rs"); + } diff --git a/srcpkgs/thunderbird/patches/sandbox-fork.patch b/srcpkgs/thunderbird/patches/sandbox-fork.patch new file mode 100644 index 00000000000..72640cb7f70 --- /dev/null +++ b/srcpkgs/thunderbird/patches/sandbox-fork.patch @@ -0,0 +1,13 @@ +make SYS_fork non-fatal, musl uses it for fork(2) + +--- security/sandbox/linux/SandboxFilter.cpp ++++ security/sandbox/linux/SandboxFilter.cpp +@@ -1253,6 +1253,8 @@ + // usually do something reasonable on error. + case __NR_clone: + return ClonePolicy(Error(EPERM)); ++ case __NR_fork: ++ return Error(ENOSYS); + + # ifdef __NR_fadvise64 + case __NR_fadvise64: diff --git a/srcpkgs/thunderbird/patches/sndio.patch b/srcpkgs/thunderbird/patches/sndio.patch index 6c72284c19b..c5e5c486dd1 100644 --- a/srcpkgs/thunderbird/patches/sndio.patch +++ b/srcpkgs/thunderbird/patches/sndio.patch @@ -1,8 +1,8 @@ --- old-configure.in.orig +++ old-configure.in -@@ -2839,6 +2839,22 @@ - - AC_SUBST(MOZ_ALSA) +@@ -2818,6 +2818,22 @@ + _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES" + fi +dnl ================================== +dnl = Check sndio availability @@ -21,26 +21,11 @@ +AC_SUBST(MOZ_SNDIO) + dnl ======================================================== - dnl = Disable PulseAudio - dnl ======================================================== ---- toolkit/library/moz.build.orig -+++ toolkit/library/moz.build -@@ -235,10 +235,8 @@ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'): - OS_LIBS += CONFIG['TK_LIBS'] - --if CONFIG['OS_ARCH'] == 'OpenBSD': -- OS_LIBS += [ -- 'sndio', -- ] -+if CONFIG['MOZ_SNDIO']: -+ OS_LIBS += CONFIG['MOZ_SNDIO_LIBS'] - - if CONFIG['MOZ_ENABLE_DBUS']: - OS_LIBS += CONFIG['MOZ_DBUS_GLIB_LIBS'] + dnl = + dnl = Maintainer debug option (no --enable equivalent) --- media/libcubeb/src/moz.build.orig +++ media/libcubeb/src/moz.build -@@ -43,7 +43,7 @@ +@@ -44,11 +44,13 @@ ] DEFINES['USE_JACK'] = True @@ -49,49 +34,19 @@ SOURCES += [ 'cubeb_sndio.c', ] ---- build/moz.configure/old.configure.orig -+++ build/moz.configure/old.configure -@@ -169,6 +169,7 @@ + DEFINES['USE_SNDIO'] = True ++ ++if CONFIG['OS_ARCH'] == 'OpenBSD': + DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True + + if CONFIG['OS_TARGET'] == 'Darwin': +--- build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 ++++ - 2020-06-30 12:18:26.027756310 +0200 +@@ -210,6 +210,7 @@ @old_configure_options( '--cache-file', '--datadir', + '--enable-sndio', - '--enable-content-sandbox', - '--enable-cookies', - '--enable-cpp-rtti', ---- security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp.orig -+++ security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp -@@ -349,6 +349,21 @@ - } - } - } -+ -+#ifdef MOZ_SNDIO -+ // ~/.aucat_cookie (sndio) -+ rv = homeDir->Clone(getter_AddRefs(confDir)); -+ if (NS_SUCCEEDED(rv)) { -+ rv = confDir->AppendNative(NS_LITERAL_CSTRING(".aucat_cookie")); -+ if (NS_SUCCEEDED(rv)) { -+ nsAutoCString tmpPath; -+ rv = confDir->GetNativePath(tmpPath); -+ if (NS_SUCCEEDED(rv)) { -+ policy->AddPath(rdwrcr, tmpPath.get()); -+ } -+ } -+ } -+#endif - } - - // Firefox binary dir. ---- security/sandbox/linux/moz.build.orig -+++ security/sandbox/linux/moz.build -@@ -81,6 +81,9 @@ - if CONFIG['MOZ_ALSA']: - DEFINES['MOZ_ALSA'] = True - -+if CONFIG['MOZ_SNDIO']: -+ DEFINES['MOZ_SNDIO'] = True -+ - # This copy of SafeSPrintf doesn't need to avoid the Chromium logging - # dependency like the one in libxul does, but this way the behavior is - # consistent. See also the comment in SandboxLogging.h. + '--enable-crashreporter', + '--enable-dbus', + '--enable-debug-js-modules', diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 7d57aec6929..bb680f2a9c0 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=68.11.0 +version=78.2.0 revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" @@ -11,27 +11,26 @@ maintainer="Enno Boland " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=0d2f403c7aca55ab130b7262ff8afc0254e5c0471db01f1631976df68a6af5f2 +checksum=273804d2199dde45f1857053575fe7c7fbb823f7547621400a5595ff5ae3ec14 lib32disabled=yes -hostmakedepends="autoconf213 unzip zip pkg-config perl python python3 yasm rust cargo - llvm clang nodejs cbindgen nasm which tar" +hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo + llvm clang nodejs-lts-10 cbindgen python nasm which tar" makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel - pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel + pixman-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel) - $(vopt_if startup_notification startup-notification-devel) $(vopt_if xscreensaver libXScrnSaver-devel) - $(vopt_if sndio sndio-devel)" -depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme" + $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)" +depends="nss>=3.47.1 desktop-file-utils hicolor-icon-theme" -build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland" -build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland" +build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland" +build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland" case $XBPS_TARGET_MACHINE in - armv6*) broken="required NEON extensions are not supported on armv6" ;; + armv[56]*) broken="required NEON extensions are not supported on armv6" ;; ppc64*) ;; ppc*) broken="xptcall bitrot" ;; esac @@ -64,7 +63,9 @@ post_extract() { } post_patch() { - _clear_vendor_checksums cssparser + _clear_vendor_checksums audio_thread_priority + _clear_vendor_checksums num-traits + _clear_vendor_checksums glslopt } do_build() { @@ -73,7 +74,7 @@ do_build() { case "$XBPS_TARGET_MACHINE" in *-musl) echo "ac_add_options --disable-jemalloc" >>.mozconfig - echo "ac_add_options --enable-release" >>.mozconfig + echo "ac_add_options --disable-gold" >>.mozconfig ;; esac @@ -93,13 +94,6 @@ do_build() { export LDFLAGS+=" -latomic" fi - case "$XBPS_TARGET_MACHINE" in - x86_64-musl|i686-musl) - echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig - echo "ac_add_options --target=${XBPS_TRIPLET}" >>.mozconfig - ;; - esac - if [ "$CROSS_BUILD" ]; then BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \ sed -n '/#include <...> search starts here:/,/End of search list./p' | \ @@ -128,10 +122,6 @@ do_build() { mkdir -p third_party/rust/libloading/.deps case "$XBPS_TARGET_MACHINE" in - i686*) - export CFLAGS+=" -D_FILE_OFFSET_BITS=64" - export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64" - ;; armv7*) export CFLAGS+=" -mfpu=neon -Wno-psabi" export CXXFLAGS+=" -mfpu=neon -Wno-psabi" @@ -145,9 +135,14 @@ do_build() { export LDFLAGS+=" -Wl,--no-keep-memory" # patch the rust debug level, this is hardcoded sed -i "s/debug_info = '2'/debug_info = '1'/" \ - build/moz.configure/toolchain.configure + build/moz.configure/toolchain.configure fi + case "$XBPS_TARGET_MACHINE" in + aarch64*|i686*|x86_64*) + echo "ac_add_options --enable-rust-simd" >>.mozconfig ;; + esac + export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird" if [ "$SOURCE_DATE_EPOCH" ]; then @@ -157,20 +152,20 @@ do_build() { export MOZ_MAKE_FLAGS="${makejobs}" export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild" - # avoid error: /usr/bin/as: invalid option -- 'N' - unset AS + + export AS=$CC cat <>.mozconfig ac_add_options --with-google-location-service-api-keyfile="${wrksrc}/google-api-key" ac_add_options --with-google-safebrowsing-api-keyfile="${wrksrc}/google-api-key" ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key" ac_add_options $(vopt_enable alsa) +ac_add_options $(vopt_enable jack) ac_add_options $(vopt_enable sndio) ac_add_options $(vopt_enable dbus) ac_add_options $(vopt_enable dbus necko-wifi) ac_add_options $(vopt_enable pulseaudio) -ac_add_options $(vopt_enable startup_notification startup-notification) -ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk') +ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' 'cairo-gtk3') ! rm -f old-configure @@ -182,9 +177,9 @@ do_install() { vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/preferences vinstall ${FILESDIR}/thunderbird.desktop 644 usr/share/applications - for i in 16 22 24 32 48 256; do - vinstall ./comm/mail/branding/thunderbird/default$i.png 644 \ - usr/share/icons/hicolor/${i}x${i}/apps thunderbird.png + for i in 16x16 22x22 24x24 32x32 48x48 128x128 256x256; do + vinstall ${wrksrc}/comm/mail/branding/thunderbird/default${i%x*}.png 644 \ + usr/share/icons/hicolor/${i}/apps thunderbird.png done # Use system-provided dictionaries @@ -197,4 +192,6 @@ do_install() { # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 ln -sf thunderbird ${DESTDIR}/usr/lib/thunderbird/thunderbird-bin + + vbin ${FILESDIR}/thunderbird-wayland }