From d341c13ade876e1b92a001022a41928fd317ffb2 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Tue, 18 Sep 2018 14:11:08 +0200 Subject: [PATCH] thunderbird: update to 60.0. --- srcpkgs/thunderbird/files/mozconfig | 8 +- .../patches/0002-Use-C99-math-isfinite.patch | 17 ---- .../Force-use-the-i686-rust-target.patch | 21 ---- .../patches/disable-hunspell_hooks.patch | 4 +- srcpkgs/thunderbird/patches/fix-cargo.patch | 47 --------- .../patches/fix-fortify-inline.patch | 4 +- srcpkgs/thunderbird/patches/fix-musl.patch | 11 +++ .../thunderbird/patches/fix-seccomp-bpf.patch | 4 +- srcpkgs/thunderbird/patches/fix-toolkit.patch | 24 ++--- srcpkgs/thunderbird/patches/fix-tools.patch | 36 ++++--- .../patches/fix-webrtc-glibcisms.patch | 13 +++ srcpkgs/thunderbird/patches/fix-xpcom.patch | 4 +- srcpkgs/thunderbird/patches/mallinfo.patch | 4 +- .../patches/rust-unitialized-field.patch | 19 ++++ srcpkgs/thunderbird/patches/sndio.patch | 97 +++++++++++++++++++ .../patches/thunderbird-install-dir.patch | 17 ---- srcpkgs/thunderbird/template | 74 +++++++------- 17 files changed, 216 insertions(+), 188 deletions(-) delete mode 100644 srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch delete mode 100644 srcpkgs/thunderbird/patches/Force-use-the-i686-rust-target.patch delete mode 100644 srcpkgs/thunderbird/patches/fix-cargo.patch create mode 100644 srcpkgs/thunderbird/patches/fix-musl.patch create mode 100644 srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch create mode 100644 srcpkgs/thunderbird/patches/rust-unitialized-field.patch create mode 100644 srcpkgs/thunderbird/patches/sndio.patch delete mode 100644 srcpkgs/thunderbird/patches/thunderbird-install-dir.patch diff --git a/srcpkgs/thunderbird/files/mozconfig b/srcpkgs/thunderbird/files/mozconfig index dbbf6ea1c64..5e275c2caa1 100644 --- a/srcpkgs/thunderbird/files/mozconfig +++ b/srcpkgs/thunderbird/files/mozconfig @@ -1,11 +1,6 @@ ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib -ac_add_options --with-pthreads -# XXX build without system cairo see: -# - https://github.com/voidlinux/void-packages/issues/2308#issuecomment-135426813 -# - https://bugs.gentoo.org/show_bug.cgi?id=558150 -# ac_add_options --with-system-cairo ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-bz2 @@ -44,6 +39,5 @@ ac_add_options --enable-optimize="$CFLAGS" ac_add_options --enable-pie ac_add_options --enable-official-branding -ac_add_options --enable-safe-browsing ac_add_options --enable-calendar -ac_add_options --enable-application=mail +ac_add_options --enable-application=comm/mail diff --git a/srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch b/srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch deleted file mode 100644 index 1fcd93610cb..00000000000 --- a/srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- mozilla/xpcom/ds/nsMathUtils.h.orig -+++ mozilla/xpcom/ds/nsMathUtils.h -@@ -104,12 +104,12 @@ - #ifdef WIN32 - // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800. - return !!_finite(aNum); --#elif defined(XP_DARWIN) -+#elif defined(XP_DARWIN) || defined(_GLIBCXX_CMATH) - // Darwin has deprecated |finite| and recommends |isfinite|. The former is - // not present in the iOS SDK. - return std::isfinite(aNum); - #else -- return finite(aNum); -+ return isfinite(aNum); - #endif - } - diff --git a/srcpkgs/thunderbird/patches/Force-use-the-i686-rust-target.patch b/srcpkgs/thunderbird/patches/Force-use-the-i686-rust-target.patch deleted file mode 100644 index 5c85261b7e9..00000000000 --- a/srcpkgs/thunderbird/patches/Force-use-the-i686-rust-target.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Mike Hommey -Date: Tue, 9 May 2017 10:37:08 +0200 -Subject: Force use the i686 rust target - ---- - mozilla/build/moz.configure/rust.configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mozilla/build/moz.configure/rust.configure b/mozilla/build/moz.configure/rust.configure -index 261768f..3f14978 100644 ---- mozilla/build/moz.configure/rust.configure -+++ mozilla/build/moz.configure/rust.configure -@@ -105,7 +105,7 @@ def rust_target(rust_compiler, rustc, target, cross_compiling): - # OpenBSD - ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd', - # Linux -- ('x86', 'Linux'): 'i586-unknown-linux-gnu', -+ ('x86', 'Linux'): 'i686-unknown-linux-gnu', - # Linux - ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu', - # OS X and iOS diff --git a/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch b/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch index de93efe65b1..a5f7c29f2bd 100644 --- a/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch +++ b/srcpkgs/thunderbird/patches/disable-hunspell_hooks.patch @@ -1,5 +1,5 @@ ---- mozilla/mozilla-config.h.in 2016-07-06 15:16:06.621880293 +0200 -+++ mozilla/mozilla-config.h.in 2016-07-06 15:16:42.958428126 +0200 +--- mozilla-config.h.in 2016-07-06 15:16:06.621880293 +0200 ++++ mozilla-config.h.in 2016-07-06 15:16:42.958428126 +0200 @@ -54,7 +54,7 @@ * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in, * unless --enable-system-hunspell is defined. diff --git a/srcpkgs/thunderbird/patches/fix-cargo.patch b/srcpkgs/thunderbird/patches/fix-cargo.patch deleted file mode 100644 index 687e28d1acc..00000000000 --- a/srcpkgs/thunderbird/patches/fix-cargo.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001 -From: Ralph Giles -Date: Fri, 10 Feb 2017 12:58:18 -0800 -Subject: [PATCH] Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj - -We use the cheddar crate to generate a C header file -for our mp4parse_capi wrapper crate. Currently we -do this at code check-in time via update-rust.sh. - -Cargo 0.18 and later will try to execute a build.rs -file in the crate source tree regardless of whether -it's specified in Cargo.toml so patching out that -line just results in 'crate cheddar not found'. - -This change restores the old behaviour by substituting -a 'build = false' line instead. - -We do have syntex vendored, but we don't currently build -it by default, so I prefer this solution to just vendoring -cheddar and generating the header at build time. The syntex -crate is quite large and adds significantly to our compile -time. - -MozReview-Commit-ID: InJRRODWAdP - ---HG-- -extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e ---- - media/libstagefright/binding/mp4parse-cargo.patch | 5 +++-- - media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++ - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml -index aee7ee947151a27c..d7e3f55119d3f4b6 100644 ---- mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml -+++ mozilla/media/libstagefright/binding/mp4parse_capi/Cargo.toml -@@ -18,6 +18,8 @@ exclude = [ - "*.mp4", - ] - -+build = false -+ - [dependencies] - byteorder = "1.0.0" - "mp4parse" = {version = "0.6.0", path = "../mp4parse"} --- -2.12.2 diff --git a/srcpkgs/thunderbird/patches/fix-fortify-inline.patch b/srcpkgs/thunderbird/patches/fix-fortify-inline.patch index 13eb4a16b88..c1190197d32 100644 --- a/srcpkgs/thunderbird/patches/fix-fortify-inline.patch +++ b/srcpkgs/thunderbird/patches/fix-fortify-inline.patch @@ -1,5 +1,5 @@ ---- mozilla/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h -+++ mozilla/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h +--- media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h ++++ media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h @@ -27,8 +27,5 @@ typedef int16_t int16; typedef unsigned short ushort; diff --git a/srcpkgs/thunderbird/patches/fix-musl.patch b/srcpkgs/thunderbird/patches/fix-musl.patch new file mode 100644 index 00000000000..c32921d39e1 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-musl.patch @@ -0,0 +1,11 @@ +--- tools/profiler/core/platform.h.orig ++++ tools/profiler/core/platform.h +@@ -56,7 +56,7 @@ + + // We need a definition of gettid(), but glibc doesn't provide a + // wrapper for it. +-#if defined(__GLIBC__) ++#if defined(__linux__) + #include + #include + static inline pid_t gettid() diff --git a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch b/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch index c9c58b52c4c..ed94fc39ed0 100644 --- a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch +++ b/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch @@ -1,5 +1,5 @@ ---- mozilla/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc.orig 2015-09-23 09:10:08.812740571 +0200 -+++ mozilla/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-09-23 09:11:38.404746155 +0200 +--- 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 diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch index b7ad8b4f510..7d79879862d 100644 --- a/srcpkgs/thunderbird/patches/fix-toolkit.patch +++ b/srcpkgs/thunderbird/patches/fix-toolkit.patch @@ -1,5 +1,5 @@ ---- mozilla/toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig 2016-07-05 21:00:03.672000517 +0200 -+++ mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200 +--- 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 @@ -13,8 +13,8 @@ /* End of x86-64 definitions */ #elif defined(__mips__) #if _MIPS_SIM == _MIPS_SIM_ABI32 ---- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-03-15 05:19:36.000000000 +0000 -+++ mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-04-17 10:24:33.793431933 +0000 +--- 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 @@ -23,8 +23,8 @@ #include #include ---- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-03-15 05:19:36.000000000 +0000 -+++ mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-04-17 10:24:33.793431933 +0000 +--- 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" @@ -36,8 +36,8 @@ using std::vector; namespace google_breakpad { ---- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-03-15 05:19:36.000000000 +0000 -+++ mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-04-17 10:24:33.793431933 +0000 +--- 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 @@ -48,8 +48,8 @@ #endif ---- mozilla/toolkit.orig/mozapps/update/common/updatedefines.h 2014-03-15 05:19:37.000000000 +0000 -+++ mozilla/toolkit/mozapps/update/common/updatedefines.h 2014-04-17 10:24:33.793431933 +0000 +--- toolkit.orig/mozapps/update/common/updatedefines.h 2014-03-15 05:19:37.000000000 +0000 ++++ toolkit/mozapps/update/common/updatedefines.h 2014-04-17 10:24:33.793431933 +0000 @@ -105,7 +105,7 @@ #ifdef SOLARIS @@ -59,8 +59,8 @@ # include #endif # include ---- mozilla/toolkit.orig/mozapps/update/updater/updater.cpp 2014-03-15 05:19:37.000000000 +0000 -+++ mozilla/toolkit/mozapps/update/updater/updater.cpp 2014-04-17 10:24:33.796765327 +0000 +--- 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 @@ -3432,6 +3432,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList *list) { diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch index 5bb06ef1721..d5a94cb5798 100644 --- a/srcpkgs/thunderbird/patches/fix-tools.patch +++ b/srcpkgs/thunderbird/patches/fix-tools.patch @@ -1,16 +1,16 @@ ---- mozilla/tools/profiler/core/platform.h -+++ mozilla/tools/profiler/core/platform.h +--- tools/profiler/core/platform.h ++++ tools/profiler/core/platform.h @@ -29,6 +29,8 @@ #ifndef TOOLS_PLATFORM_H_ #define TOOLS_PLATFORM_H_ - + +#include + - #ifdef ANDROID - #include - #else ---- mozilla/tools/profiler/lul/LulElf.cpp -+++ mozilla/tools/profiler/lul/LulElf.cpp + #include + #include + #include "MainThreadUtils.h" +--- tools/profiler/lul/LulElf.cpp ++++ tools/profiler/lul/LulElf.cpp @@ -579,10 +579,10 @@ // Return the non-directory portion of FILENAME: the portion after the // last slash, or the whole filename if there are no slashes. @@ -25,20 +25,18 @@ + string base = p ? p+1 : c_filename; return base; } - ---- mozilla/tools/profiler/core/platform-linux.cc.orig 2015-06-11 18:39:35.689739054 +0200 -+++ mozilla/tools/profiler/core/platform-linux.cc 2015-06-11 18:40:04.479706749 +0200 -@@ -651,11 +651,13 @@ void OS::Startup() { - void TickSample::PopulateContext(void* aContext) + +--- tools/profiler/core/platform-linux-android.cpp.orig ++++ tools/profiler/core/platform-linux-android.cpp +@@ -534,9 +534,11 @@ + void + Registers::SyncPopulate() { - MOZ_ASSERT(aContext); +#if defined(__GLIBC__) - ucontext_t* pContext = reinterpret_cast(aContext); - if (!getcontext(pContext)) { - context = pContext; - SetSampleContext(this, aContext); + if (!getcontext(&sSyncUContext)) { + PopulateRegsFromContext(*this, &sSyncUContext); } +#endif } + #endif - void OS::SleepMicro(int microseconds) diff --git a/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch b/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch new file mode 100644 index 00000000000..0a9304430b2 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch @@ -0,0 +1,13 @@ +--- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2018-05-09 23:48:44.677389171 +0200 ++++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2018-05-09 23:48:56.254373557 +0200 +@@ -11,7 +11,9 @@ + #include + #include + #include +-#if __GLIBC_PREREQ(2, 16) ++#if !__GLIBC__ ++#include ++#elif __GLIBC_PREREQ(2, 16) + #include + #else + #include diff --git a/srcpkgs/thunderbird/patches/fix-xpcom.patch b/srcpkgs/thunderbird/patches/fix-xpcom.patch index e9d72df8681..38dd582d96b 100644 --- a/srcpkgs/thunderbird/patches/fix-xpcom.patch +++ b/srcpkgs/thunderbird/patches/fix-xpcom.patch @@ -1,5 +1,5 @@ ---- mozilla/xpcom/base/nsMemoryReporterManager.cpp.orig 2015-12-16 11:53:14.211144456 +0100 -+++ mozilla/xpcom/base/nsMemoryReporterManager.cpp 2015-12-16 11:55:26.859476381 +0100 +--- xpcom/base/nsMemoryReporterManager.cpp.orig 2015-12-16 11:53:14.211144456 +0100 ++++ xpcom/base/nsMemoryReporterManager.cpp 2015-12-16 11:55:26.859476381 +0100 @@ -46,7 +46,7 @@ using namespace mozilla; # include "mozmemory.h" #endif // MOZ_MEMORY diff --git a/srcpkgs/thunderbird/patches/mallinfo.patch b/srcpkgs/thunderbird/patches/mallinfo.patch index 60064a776df..c9a38d45bdf 100644 --- a/srcpkgs/thunderbird/patches/mallinfo.patch +++ b/srcpkgs/thunderbird/patches/mallinfo.patch @@ -1,5 +1,5 @@ ---- mozilla/xpcom/base/nsMemoryReporterManager.cpp -+++ mozilla/xpcom/base/nsMemoryReporterManager.cpp +--- xpcom/base/nsMemoryReporterManager.cpp ++++ xpcom/base/nsMemoryReporterManager.cpp @@ -153,6 +153,7 @@ ResidentUniqueDistinguishedAmount(int64_t* aN) return GetProcSelfSmapsPrivate(aN); } diff --git a/srcpkgs/thunderbird/patches/rust-unitialized-field.patch b/srcpkgs/thunderbird/patches/rust-unitialized-field.patch new file mode 100644 index 00000000000..67ef3a02ab8 --- /dev/null +++ b/srcpkgs/thunderbird/patches/rust-unitialized-field.patch @@ -0,0 +1,19 @@ +--- ./media/audioipc/audioipc/src/cmsg.rs.orig 2018-05-09 22:19:14.748631939 +0200 ++++ ./media/audioipc/audioipc/src/cmsg.rs 2018-05-09 22:19:22.961620862 +0200 +@@ -106,11 +106,11 @@ impl ControlMsgBuilder { + return Err(Error::NoSpace); + } + +- let cmsghdr = cmsghdr { +- cmsg_len: cmsg_len as _, +- cmsg_level: level, +- cmsg_type: kind, +- }; ++ use std::mem; ++ let mut cmsghdr: cmsghdr = unsafe { mem::zeroed() }; ++ cmsghdr.cmsg_len = cmsg_len as _; ++ cmsghdr.cmsg_level = level; ++ cmsghdr.cmsg_type = kind; + + let cmsghdr = unsafe { + slice::from_raw_parts(&cmsghdr as *const _ as *const _, mem::size_of::()) diff --git a/srcpkgs/thunderbird/patches/sndio.patch b/srcpkgs/thunderbird/patches/sndio.patch new file mode 100644 index 00000000000..097b313e90b --- /dev/null +++ b/srcpkgs/thunderbird/patches/sndio.patch @@ -0,0 +1,97 @@ +--- old-configure.in.orig ++++ old-configure.in +@@ -2839,6 +2839,22 @@ + + AC_SUBST(MOZ_ALSA) + ++dnl ================================== ++dnl = Check sndio availability ++dnl ================================== ++ ++MOZ_ARG_ENABLE_BOOL(sndio, ++[ --enable-sndio Enable sndio support], ++ MOZ_SNDIO=1, ++ MOZ_SNDIO=) ++ ++if test -n "$MOZ_SNDIO"; then ++ MOZ_SNDIO_LIBS="-lsndio" ++ AC_SUBST_LIST(MOZ_SNDIO_LIBS) ++fi ++ ++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'] +--- media/libcubeb/src/moz.build.orig ++++ media/libcubeb/src/moz.build +@@ -43,7 +43,7 @@ + ] + DEFINES['USE_JACK'] = True + +-if CONFIG['OS_ARCH'] == 'OpenBSD': ++if CONFIG['MOZ_SNDIO']: + SOURCES += [ + 'cubeb_sndio.c', + ] +--- build/moz.configure/old.configure.orig ++++ build/moz.configure/old.configure +@@ -159,6 +159,7 @@ + '--enable-accessibility', + '--enable-address-sanitizer', + '--enable-alsa', ++ '--enable-sndio', + '--enable-bundled-fonts', + '--enable-clang-plugin', + '--enable-content-sandbox', +--- 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. diff --git a/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch b/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch deleted file mode 100644 index 61695660baf..00000000000 --- a/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- mozilla/config/baseconfig.mk.orig -+++ mozilla/config/baseconfig.mk -@@ -2,10 +2,10 @@ - # directly in python/mozbuild/mozbuild/base.py for gmake validation. - # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending - # whether a normal build is happening or whether the check is running. --includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+includedir := $(includedir)/$(MOZ_APP_NAME) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - ifeq (.,$(DEPTH)) - DIST = dist - else diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 848755cef41..1efeb74f588 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,45 +3,37 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=52.9.1 -revision=2 +version=60.0 +revision=1 short_desc="Standalone Mail/News reader" maintainer="Enno Boland " homepage="https://www.thunderbird.net/" license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=286fa71504e7184f3a41bcbdebf591bebe8e04dccbad1c93a47c6e72a7125c4d +checksum=bd7da88dcc03c448a4e975b5a1d3e9bf466ec9151b1059392bcdb50955a22056 only_for_archs="i686 i686-musl x86_64 x86_64-musl" lib32disabled=yes -hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm - $(vopt_if rust cargo)" -makedepends=" - nss-devel libjpeg-turbo-devel gtk+-devel icu-devel pixman-devel - sqlite-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel - hunspell-devel libXcomposite-devel libSM-devel libXt-devel libXdamage-devel - $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) - $(vopt_if gtk3 gtk+3-devel) $(vopt_if pulseaudio pulseaudio-devel) +hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo + llvm clang" +makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel + pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx-devel + libXrender-devel libXcomposite-devel libSM-devel libXt-devel + libXdamage-devel hunspell-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)" -depends="nss>=3.27 desktop-file-utils hicolor-icon-theme" + $(vopt_if xscreensaver libXScrnSaver-devel) + $(vopt_if sndio sndio-devel)" +depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme" -build_options="alsa dbus gtk3 rust pulseaudio startup_notification xscreensaver" -build_options_default="alsa dbus gtk3 pulseaudio startup_notification xscreensaver" - -desc_option_rust="Build rust components" - -case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) build_options_default+=" rust" ;; -esac +build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio" +build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio" post_extract() { case "$XBPS_TARGET_MACHINE" in *-musl) - # fix musl rust triplet - sed -i "s/\(x86_64-unknown-linux\)-gnu/\1-musl/" mozilla/build/moz.configure/rust.configure - cp "${FILESDIR}/stab.h" mozilla/toolkit/crashreporter/google-breakpad/src/ + cp "${FILESDIR}/stab.h" toolkit/crashreporter/google-breakpad/src/ ;; esac @@ -59,7 +51,15 @@ do_build() { case "$XBPS_TARGET_MACHINE" in *-musl) echo "ac_add_options --disable-jemalloc" >>.mozconfig - echo "ac_add_options --enable-gold=no" >>.mozconfig + echo "ac_add_options --disable-gold" >>.mozconfig + echo "ac_add_options --enable-release" >>.mozconfig + ;; + esac + + 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 @@ -75,13 +75,12 @@ do_build() { echo "ac_add_options --target=$XBPS_CROSS_TRIPLET" >>.mozconfig fi - if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then - # Append CFLAGS and CXXFLAGS to set work around code which gcc6 would - # otherwise regard as out-of-specification and allow it to produce a - # working program. - export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" - export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" - fi + case "$XBPS_TARGET_MACHINE" in + i686*) + export CFLAGS+=" -D_FILE_OFFSET_BITS=64" + export CXXFLAGS+=" -D_FILE_OFFSET_BITS=64" + ;; + esac export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird" @@ -94,27 +93,26 @@ do_build() { cat <>.mozconfig ac_add_options --with-google-api-keyfile="${wrksrc}/google-api-key" ac_add_options --with-mozilla-api-keyfile="${wrksrc}/mozilla-api-key" -ac_add_options --enable-default-toolkit=cairo-gtk$(vopt_if gtk3 '3' '2') ac_add_options $(vopt_enable alsa) +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 rust) ac_add_options $(vopt_enable startup_notification startup-notification) ! - make -f client.mk build + rm -f old-configure + ./mach build } do_install() { - make -f client.mk DESTDIR="$DESTDIR" install + DESTDIR="$DESTDIR" ./mach 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 other-licenses/branding/thunderbird/mailicon${i}.png 644 \ + vinstall ./comm/mail/branding/thunderbird/default$i.png 644 \ usr/share/icons/hicolor/${i}x${i}/apps thunderbird.png - done # Use system-provided dictionaries