diff --git a/srcpkgs/thunderbird/files/thunderbird.desktop b/srcpkgs/thunderbird/files/thunderbird.desktop index a626e52badb..210859df015 100644 --- a/srcpkgs/thunderbird/files/thunderbird.desktop +++ b/srcpkgs/thunderbird/files/thunderbird.desktop @@ -1,13 +1,64 @@ [Desktop Entry] -Version=1.0 Name=Thunderbird -Comment=Mail & News Reader -GenericName=Mail Client & News Reader +GenericName=Mail Client +GenericName[ast]=Client de correu +GenericName[ca]=Client de correu +GenericName[cs]=Poštovní klient +GenericName[da]=E-postklient +GenericName[de]=E-Mail-Anwendung +GenericName[el]=Λογισμικό αλληλογραφίας +GenericName[es]=Cliente de correo +GenericName[fi]=Sähköpostiohjelma +GenericName[fr]=Client de messagerie +GenericName[gl]=Cliente de correo electrónico +GenericName[he]=לקוח דוא״ל +GenericName[hr]=Klijent e-pošte +GenericName[hu]=Levelezőkliens +GenericName[it]=Client email +GenericName[ja]=電子メールクライアント +GenericName[ko]=메일 클라이언트 +GenericName[nl]=E-mailprogramma +GenericName[pl]=Klient poczty +GenericName[pt_BR]=Cliente de E-mail +GenericName[ru]=Почтовый клиент +GenericName[sk]=Poštový klient +GenericName[ug]=ئېلخەت دېتالى +GenericName[uk]=Поштова програма +GenericName[vi]=Phần mềm khách quản lý thư điện tử +GenericName[zh_CN]=邮件新闻客户端 +GenericName[zh_TW]=郵件用戶端 +Comment=Send and receive mail with Thunderbird +Comment[ast]=Lleer y escribir corréu electrónicu +Comment[ca]=Llegiu i escriviu correu +Comment[cs]=Čtení a psaní pošty +Comment[da]=Skriv/læs e-post/nyhedsgruppe med Mozilla Thunderbird +Comment[de]=E-Mails und Nachrichten mit Thunderbird lesen und schreiben +Comment[el]=Διαβάστε και γράψτε γράμματα με το Mozilla Thunderbird +Comment[es]=Lea y escriba correos y noticias con Thunderbird +Comment[fi]=Lue ja kirjoita sähköposteja +Comment[fr]=Lire et écrire des courriels +Comment[gl]=Lea e escriba correo electrónico +Comment[he]=קריאה/כתיבה של דוא״ל/חדשות באמצעות Mozilla Thunderbird +Comment[hr]=Čitajte/šaljite e-poštu s Thunderbird +Comment[hu]=Levelek írása és olvasása a Thunderbirddel +Comment[it]=Per leggere e scrivere email +Comment[ja]=メールの読み書き +Comment[ko]=Mozilla Thunderbird 메일/뉴스 읽기 및 쓰기 클라이언트 +Comment[nl]=E-mail/nieuws lezen en schrijven met Mozilla Thunderbird +Comment[pl]=Czytanie i wysyłanie e-maili +Comment[pt_BR]=Leia e escreva suas mensagens +Comment[ru]=Читайте и пишите письма +Comment[sk]=Čítajte a píšte poštu pomocou programu Thunderbird +Comment[sv]=Läs och skriv e-post +Comment[ug]=ئېلخەت ۋە خەۋەرلەرنى Mozilla Thunderbird دا كۆرۈش ۋە يېزىش +Comment[uk]=Читання та написання листів +Comment[vi]=Đọc và soạn thư điện tử +Comment[zh_CN]=阅读邮件或新闻 +Comment[zh_TW]=以 Mozilla Thunderbird 讀寫郵件或新聞 Exec=thunderbird %u -TryExec=thunderbird Icon=thunderbird Terminal=false Type=Application -Categories=Network;Email; MimeType=message/rfc822;x-scheme-handler/mailto; StartupNotify=true +Categories=Network;Email; diff --git a/srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch b/srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch index d234e0ee3cc..1fcd93610cb 100644 --- a/srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch +++ b/srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch @@ -1,4 +1,3 @@ -Patch from Firefox ESR 38 Void packaging. --- mozilla/xpcom/ds/nsMathUtils.h.orig +++ mozilla/xpcom/ds/nsMathUtils.h @@ -104,12 +104,12 @@ diff --git a/srcpkgs/thunderbird/patches/fix-musl-fortify-inline.patch b/srcpkgs/thunderbird/patches/fix-fortify-inline.patch similarity index 88% rename from srcpkgs/thunderbird/patches/fix-musl-fortify-inline.patch rename to srcpkgs/thunderbird/patches/fix-fortify-inline.patch index c9dabda07ae..13eb4a16b88 100644 --- a/srcpkgs/thunderbird/patches/fix-musl-fortify-inline.patch +++ b/srcpkgs/thunderbird/patches/fix-fortify-inline.patch @@ -1,4 +1,3 @@ -Patch from Firefox ESR 38 Void packaging. --- mozilla/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h +++ mozilla/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h @@ -27,8 +27,5 @@ diff --git a/srcpkgs/thunderbird/patches/fix-gcc-tests.patch b/srcpkgs/thunderbird/patches/fix-gcc-tests.patch index f1863e1a8cd..43cbd665cce 100644 --- a/srcpkgs/thunderbird/patches/fix-gcc-tests.patch +++ b/srcpkgs/thunderbird/patches/fix-gcc-tests.patch @@ -1,18 +1,3 @@ -Patch from Firefox ESR 38 Void packaging. ---- configure.orig 2015-09-28 14:41:14.000000000 +0200 -+++ configure 2015-10-07 13:36:23.281995377 +0200 -@@ -511,8 +511,9 @@ - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' --ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+ac_compile='${CC-cc} -c conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} conftest.$ac_ext $LIBS 1>&5' -+ - cross_compiling=$ac_cv_prog_cc_cross - - ac_exeext= --- mozilla/configure.orig 2015-05-29 18:30:41.474423097 +0200 +++ mozilla/configure 2015-05-29 18:30:53.451550589 +0200 @@ -10966,8 +10966,8 @@ ac_have_llvm_pr8927="no" diff --git a/srcpkgs/thunderbird/patches/fix-linux-include.patch b/srcpkgs/thunderbird/patches/fix-linux-include.patch deleted file mode 100644 index 38936b74af7..00000000000 --- a/srcpkgs/thunderbird/patches/fix-linux-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -Patch from Firefox ESR 38 Void packaging. ---- mozilla/xpcom/io/nsLocalFileUnix.cpp.orig -+++ mozilla/xpcom/io/nsLocalFileUnix.cpp -@@ -28,6 +28,7 @@ - #define USE_LINUX_QUOTACTL - #include - #include -+#include - #endif - - #include "xpcom-private.h" diff --git a/srcpkgs/thunderbird/patches/fix-media.patch b/srcpkgs/thunderbird/patches/fix-media.patch deleted file mode 100644 index 5fe399e6e54..00000000000 --- a/srcpkgs/thunderbird/patches/fix-media.patch +++ /dev/null @@ -1,11 +0,0 @@ -Patch from Firefox ESR 38 Void packaging. ---- mozilla/media.orig/mtransport/third_party/nICEr/src/stun/addrs.c -+++ mozilla/media/mtransport/third_party/nICEr/src/stun/addrs.c -@@ -45,7 +45,6 @@ - #include - #include - #ifndef ANDROID --#include - #include - #else - #include diff --git a/srcpkgs/thunderbird/patches/fix-musl-ipc.patch b/srcpkgs/thunderbird/patches/fix-musl-ipc.patch deleted file mode 100644 index 1aa3201a79b..00000000000 --- a/srcpkgs/thunderbird/patches/fix-musl-ipc.patch +++ /dev/null @@ -1,56 +0,0 @@ -Patch from Firefox ESR 38 Void packaging. ---- mozilla/ipc/chromium/src/base/file_util.h -+++ mozilla/ipc/chromium/src/base/file_util.h -@@ -14,10 +14,15 @@ - #include - #elif defined(ANDROID) - #include -+#define NO_FTS - #elif defined(OS_POSIX) - #include --#include - #include -+#ifdef __GLIBC__ -+#include -+#else -+#define NO_FTS -+#endif - #endif - - #include ---- mozilla/ipc/chromium/src/base/file_util_posix.cc -+++ mozilla/ipc/chromium/src/base/file_util_posix.cc -@@ -8,13 +8,13 @@ - #include - #include - #include --#ifndef ANDROID -+#ifndef NO_FTS - #include - #endif - #include - #include - #include --#include -+#include - #include - #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures - #include -@@ -67,7 +67,7 @@ - if (!recursive) - return (rmdir(path_str) == 0); - --#ifdef ANDROID -+#ifdef NO_FTS - // XXX Need ftsless impl for bionic - return false; - #else -@@ -140,7 +140,7 @@ - return false; - } - --#ifdef ANDROID -+#ifdef NO_FTS - // XXX Need ftsless impl for bionic - return false; - #else diff --git a/srcpkgs/thunderbird/patches/fix-musl-memory.patch b/srcpkgs/thunderbird/patches/fix-musl-memory.patch deleted file mode 100644 index 069db35f6e2..00000000000 --- a/srcpkgs/thunderbird/patches/fix-musl-memory.patch +++ /dev/null @@ -1,39 +0,0 @@ -fix for musl libc. ---- mozilla/memory/mozjemalloc/jemalloc.c.orig 2015-09-28 14:41:00.000000000 +0200 -+++ mozilla/memory/mozjemalloc/jemalloc.c 2015-10-09 07:24:21.161462303 +0200 -@@ -325,7 +325,7 @@ - #endif - #include - #include --#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID) -+#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID) && defined(__GLIBC__) - #include - #endif - #include -@@ -664,7 +664,7 @@ - /* No init lock for Windows. */ - #elif defined(MOZ_MEMORY_DARWIN) - static malloc_mutex_t init_lock = {OS_SPINLOCK_INIT}; --#elif defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID) -+#elif defined(MOZ_MEMORY_LINUX) && defined(__GLIBC__) && !defined(MOZ_MEMORY_ANDROID) - static malloc_mutex_t init_lock = PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP; - #elif defined(MOZ_MEMORY) - static malloc_mutex_t init_lock = PTHREAD_MUTEX_INITIALIZER; -@@ -1636,7 +1636,7 @@ - return (true); - #elif defined(MOZ_MEMORY_DARWIN) - mutex->lock = OS_SPINLOCK_INIT; --#elif defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID) -+#elif defined(MOZ_MEMORY_LINUX) && defined(__GLIBC__) && !defined(MOZ_MEMORY_ANDROID) - pthread_mutexattr_t attr; - if (pthread_mutexattr_init(&attr) != 0) - return (true); -@@ -1698,7 +1698,7 @@ - return (true); - #elif defined(MOZ_MEMORY_DARWIN) - lock->lock = OS_SPINLOCK_INIT; --#elif defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID) -+#elif defined(MOZ_MEMORY_LINUX) && defined(__GLIBC__) && !defined(MOZ_MEMORY_ANDROID) - pthread_mutexattr_t attr; - if (pthread_mutexattr_init(&attr) != 0) - return (true); diff --git a/srcpkgs/thunderbird/patches/fix-musl-stat.patch b/srcpkgs/thunderbird/patches/fix-musl-stat.patch deleted file mode 100644 index e92f96722f1..00000000000 --- a/srcpkgs/thunderbird/patches/fix-musl-stat.patch +++ /dev/null @@ -1,26 +0,0 @@ -Patch from Firefox ESR 38 Void packaging. ---- mozilla/dom/system/OSFileConstants.cpp.orig 2013-04-17 06:17:29.798371189 +0000 -+++ mozilla/dom/system/OSFileConstants.cpp 2013-04-17 06:30:30.032285977 +0000 -@@ -509,6 +509,11 @@ - INT_CONSTANT(_STAT_VER), - #endif // defined(_STAT_VER) - -+ // glibc's stat/lstat/fstat are macros while uclibc's are not -+#if defined(__GLIBC__) && !defined(__UCLIBC__) -+ { "OSFILE_STAT_MACROS", INT_TO_JSVAL(1) }, -+#endif // defined(stat) -+ - PROP_END - }; - ---- mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm.orig 2014-04-03 13:08:26.686409787 +0000 -+++ mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm 2014-04-03 13:34:14.101716259 +0000 -@@ -512,7 +512,7 @@ - /*path*/ Type.fd, - /*buf*/ Type.stat.out_ptr - ); -- } else if (Const._STAT_VER != undefined) { -+ } else if (Const.OSFILE_STAT_MACROS != undefined) { - const ver = Const._STAT_VER; - let xstat_name, lxstat_name, fxstat_name; - if (OS.Constants.Sys.Name == "SunOS") { diff --git a/srcpkgs/thunderbird/patches/fix-musl-toolkit.patch b/srcpkgs/thunderbird/patches/fix-musl-toolkit.patch deleted file mode 100644 index ce8609c634e..00000000000 --- a/srcpkgs/thunderbird/patches/fix-musl-toolkit.patch +++ /dev/null @@ -1,145 +0,0 @@ -Patch from Firefox ESR 38 Void packaging. ---- 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 -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - - #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 -@@ -41,6 +41,10 @@ - - #include "common/using_std_string.h" - -+#ifndef N_UNDF -+#define N_UNDF 0 -+#endif -+ - 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 -@@ -53,9 +53,10 @@ - #include - #endif - --#ifdef HAVE_A_OUT_H -+#if 0 - #include - #endif -+ - #ifdef HAVE_MACH_O_NLIST_H - #include - #endif ---- mozilla/toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-03-15 05:19:37.000000000 +0000 -+++ mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-04-17 10:24:33.793431933 +0000 -@@ -2813,7 +2813,7 @@ - LSS_INLINE _syscall6(void*, mmap, void*, s, - size_t, l, int, p, - int, f, int, d, -- __off64_t, o) -+ off_t, o) - - LSS_INLINE _syscall4(int, newfstatat, int, d, - const char *, p, ---- 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 -@@ -105,7 +105,7 @@ - - #ifdef SOLARIS - # include --#else -+#elif !defined(__linux__) || defined(__GLIBC__) - # 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 -@@ -3432,6 +3432,7 @@ - int add_dir_entries(const NS_tchar *dirpath, ActionList *list) - { - int rv = OK; -+#if !defined(__linux__) || defined(__GLIBC__) - FTS *ftsdir; - FTSENT *ftsdirEntry; - NS_tchar searchpath[MAXPATHLEN]; -@@ -3534,6 +3535,7 @@ - } - - fts_close(ftsdir); -+#endif - - return rv; - } ---- mozilla/toolkit.orig/xre/nsSigHandlers.cpp 2014-03-15 05:19:38.000000000 +0000 -+++ mozilla/toolkit/xre/nsSigHandlers.cpp 2014-04-17 10:24:33.796765327 +0000 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include "prthread.h" - #include "plstr.h" - #include "prenv.h" -@@ -152,7 +153,7 @@ - status->__invalid = status->__denorm = status->__zdiv = status->__ovrfl = status->__undfl = - status->__precis = status->__stkflt = status->__errsumm = 0; - -- __uint32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr; -+ u_int32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr; - *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ - *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ - #endif -@@ -172,13 +173,13 @@ - *sw &= ~FPU_STATUS_FLAGS; - #endif - #if defined(__amd64__) -- __uint16_t *cw = &uc->uc_mcontext.fpregs->cwd; -+ u_int16_t *cw = &uc->uc_mcontext.fpregs->cwd; - *cw |= FPU_EXCEPTION_MASK; - -- __uint16_t *sw = &uc->uc_mcontext.fpregs->swd; -+ u_int16_t *sw = &uc->uc_mcontext.fpregs->swd; - *sw &= ~FPU_STATUS_FLAGS; - -- __uint32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr; -+ u_int32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr; - *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ - *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ - #endif -@@ -187,24 +188,24 @@ - ucontext_t *uc = (ucontext_t *)context; - - #if defined(__i386) -- uint32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0]; -+ u_int32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0]; - *cw |= FPU_EXCEPTION_MASK; - -- uint32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1]; -+ u_int32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1]; - *sw &= ~FPU_STATUS_FLAGS; - - /* address of the instruction that caused the exception */ -- uint32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3]; -+ u_int32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3]; - uc->uc_mcontext.gregs[REG_PC] = *ip; - #endif - #if defined(__amd64__) -- uint16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw; -+ u_int16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw; - *cw |= FPU_EXCEPTION_MASK; - -- uint16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw; -+ u_int16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw; - *sw &= ~FPU_STATUS_FLAGS; - -- uint32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr; -+ u_int32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr; - *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ - *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ - #endif diff --git a/srcpkgs/thunderbird/patches/fix-netwerk.patch b/srcpkgs/thunderbird/patches/fix-netwerk.patch deleted file mode 100644 index f03178bc8f7..00000000000 --- a/srcpkgs/thunderbird/patches/fix-netwerk.patch +++ /dev/null @@ -1,38 +0,0 @@ -Patch from Firefox ESR 38 Void packaging. ---- mozilla/netwerk.orig/sctp/src/netinet/sctp_os_userspace.h -+++ mozilla/netwerk/sctp/src/netinet/sctp_os_userspace.h -@@ -400,11 +400,8 @@ - }; - - #else /* !defined(Userspace_os_Windows) */ --#include /* needed? added from old __FreeBSD__ */ - #include --#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID) - #include --#endif - typedef pthread_mutex_t userland_mutex_t; - typedef pthread_cond_t userland_cond_t; - typedef pthread_t userland_thread_t; ---- mozilla/netwerk.orig/sctp/src/netinet/sctp_pcb.c -+++ mozilla/netwerk/sctp/src/netinet/sctp_pcb.c -@@ -30,6 +30,9 @@ - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#define _BSD_SOURCE /* for IPPORT_RESERVED */ -+#include -+ - #ifdef __FreeBSD__ - #include - __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 258765 2013-11-30 12:51:19Z tuexen $"); ---- mozilla/netwerk.orig/sctp/src/user_queue.h -+++ mozilla/netwerk/sctp/src/user_queue.h -@@ -31,7 +31,7 @@ - #ifndef _USER_QUEUE_H_ - #define _USER_QUEUE_H_ - --#if !defined (__Userspace_os_Windows) -+#if defined(__Userspace_os_FreeBSD) - #include - #endif - /* diff --git a/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch b/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch new file mode 100644 index 00000000000..c9c58b52c4c --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch @@ -0,0 +1,14 @@ +--- 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 +@@ -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-stack-overflow.patch b/srcpkgs/thunderbird/patches/fix-stack-overflow.patch new file mode 100644 index 00000000000..0b0d74daa87 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-stack-overflow.patch @@ -0,0 +1,43 @@ +https://bugs.alpinelinux.org/issues/5559 +https://bugzilla.mozilla.org/show_bug.cgi?id=1274732 + +--- mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp ++++ mozilla/netwerk/streamconv/converters/nsHTTPCompressConv.cpp +@@ -165,9 +165,8 @@ nsHTTPCompressConv::BrotliHandler(nsIInputStream *stream, void *closure, const c + nsHTTPCompressConv *self = static_cast(closure); + *countRead = 0; + +- const uint32_t kOutSize = 128 * 1024; // just a chunk size, we call in a loop +- unsigned char outBuffer[kOutSize]; +- unsigned char *outPtr; ++ const size_t kOutSize = 128 * 1024; // just a chunk size, we call in a loop ++ uint8_t *outPtr; + size_t outSize; + size_t avail = aAvail; + BrotliResult res; +@@ -177,9 +176,15 @@ nsHTTPCompressConv::BrotliHandler(nsIInputStream *stream, void *closure, const c + return NS_OK; + } + ++ auto outBuffer = MakeUniqueFallible(kOutSize); ++ if (outBuffer == nullptr) { ++ self->mBrotli->mStatus = NS_ERROR_OUT_OF_MEMORY; ++ return self->mBrotli->mStatus; ++ } ++ + do { + outSize = kOutSize; +- outPtr = outBuffer; ++ outPtr = outBuffer.get(); + + // brotli api is documented in brotli/dec/decode.h and brotli/dec/decode.c + LOG(("nsHttpCompresssConv %p brotlihandler decompress %d\n", self, avail)); +@@ -210,7 +215,7 @@ nsHTTPCompressConv::BrotliHandler(nsIInputStream *stream, void *closure, const c + nsresult rv = self->do_OnDataAvailable(self->mBrotli->mRequest, + self->mBrotli->mContext, + self->mBrotli->mSourceOffset, +- reinterpret_cast(outBuffer), ++ reinterpret_cast(outBuffer.get()), + outSize); + LOG(("nsHttpCompressConv %p BrotliHandler ODA rv=%x", self, rv)); + if (NS_FAILED(rv)) { diff --git a/srcpkgs/thunderbird/patches/fix-toolkit.patch b/srcpkgs/thunderbird/patches/fix-toolkit.patch new file mode 100644 index 00000000000..90e2c5aaa5a --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-toolkit.patch @@ -0,0 +1,77 @@ +--- 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 +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + #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 +@@ -41,6 +41,10 @@ + + #include "common/using_std_string.h" + ++#ifndef N_UNDF ++#define N_UNDF 0 ++#endif ++ + 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 +@@ -53,9 +53,10 @@ + #include + #endif + +-#ifdef HAVE_A_OUT_H ++#if 0 + #include + #endif ++ + #ifdef HAVE_MACH_O_NLIST_H + #include + #endif +--- mozilla/toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-03-15 05:19:37.000000000 +0000 ++++ mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-04-17 10:24:33.793431933 +0000 +@@ -2813,7 +2813,7 @@ + LSS_INLINE _syscall6(void*, mmap, void*, s, + size_t, l, int, p, + int, f, int, d, +- __off64_t, o) ++ off_t, o) + + LSS_INLINE _syscall4(int, newfstatat, int, d, + const char *, p, +--- 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 +@@ -105,7 +105,7 @@ + + #ifdef SOLARIS + # include +-#else ++#elif !defined(__linux__) || defined(__GLIBC__) + # 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 +@@ -3432,6 +3432,7 @@ + int add_dir_entries(const NS_tchar *dirpath, ActionList *list) + { + int rv = OK; ++#if !defined(__linux__) || defined(__GLIBC__) + FTS *ftsdir; + FTSENT *ftsdirEntry; + NS_tchar searchpath[MAXPATHLEN]; +@@ -3534,6 +3535,7 @@ + } + + fts_close(ftsdir); ++#endif + + return rv; + } diff --git a/srcpkgs/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch index 523d68a25a5..5fcfff919b9 100644 --- a/srcpkgs/thunderbird/patches/fix-tools.patch +++ b/srcpkgs/thunderbird/patches/fix-tools.patch @@ -1,6 +1,5 @@ -Patch from Firefox ESR 38 Void packaging. ---- mozilla/tools/profiler/local_debug_info_symbolizer.cc -+++ mozilla/tools/profiler/local_debug_info_symbolizer.cc +--- mozilla/tools/profiler/gecko/local_debug_info_symbolizer.cc ++++ mozilla/tools/profiler/gecko/local_debug_info_symbolizer.cc @@ -3,6 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -9,19 +8,8 @@ Patch from Firefox ESR 38 Void packaging. #include "PlatformMacros.h" #include "nsAutoPtr.h" ---- mozilla/tools/profiler/platform-linux.cc -+++ mozilla/tools/profiler/platform-linux.cc -@@ -84,7 +84,7 @@ - - #define SIGNAL_SAVE_PROFILE SIGUSR2 - --#if defined(__GLIBC__) -+#if 1 - // glibc doesn't implement gettid(2). - #include - pid_t gettid() ---- mozilla/tools/profiler/platform.h -+++ mozilla/tools/profiler/platform.h +--- mozilla/tools/profiler/core/platform.h ++++ mozilla/tools/profiler/core/platform.h @@ -29,6 +29,8 @@ #ifndef TOOLS_PLATFORM_H_ #define TOOLS_PLATFORM_H_ @@ -31,8 +19,8 @@ Patch from Firefox ESR 38 Void packaging. #ifdef ANDROID #include #else ---- mozilla/tools/profiler/LulElf.cpp -+++ mozilla/tools/profiler/LulElf.cpp +--- mozilla/tools/profiler/lul/LulElf.cpp ++++ mozilla/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. @@ -48,8 +36,8 @@ Patch from Firefox ESR 38 Void packaging. return base; } ---- mozilla/tools/profiler/platform-linux.cc.orig 2015-06-11 18:39:35.689739054 +0200 -+++ mozilla/tools/profiler/platform-linux.cc 2015-06-11 18:40:04.479706749 +0200 +--- 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) { @@ -64,3 +52,31 @@ Patch from Firefox ESR 38 Void packaging. } void OS::SleepMicro(int microseconds) +--- mozilla/tools/profiler/core/platform.h.orig 2015-11-04 18:27:58.170732586 +0100 ++++ mozilla/tools/profiler/core/platform.h 2015-11-04 18:29:11.898478051 +0100 +@@ -60,9 +60,9 @@ + #include "v8-support.h" + #include + +-// We need a definition of gettid(), but glibc doesn't provide a ++// We need a definition of gettid(), but glibc nor musl don't provide a + // wrapper for it. +-#if defined(__GLIBC__) ++#if defined(__linux__) + #include + #include + static inline pid_t gettid() +--- mozilla/media/libav/config_unix.h.orig 2015-11-04 18:38:46.660289503 +0100 ++++ mozilla/media/libav/config_unix.h 2015-11-04 18:39:38.620814879 +0100 +@@ -223,7 +223,11 @@ + #define HAVE_STRERROR_R 1 + #define HAVE_STRPTIME 1 + #define HAVE_SYSCONF 1 ++#if !defined(__linux__) || defined(__GLIBC__) + #define HAVE_SYSCTL 1 ++#else ++#define HAVE_SYSCTL 0 ++#endif + #define HAVE_USLEEP 1 + #define HAVE_VIRTUALALLOC 0 + #define HAVE_PTHREADS 0 diff --git a/srcpkgs/thunderbird/patches/fix-xpcom.patch b/srcpkgs/thunderbird/patches/fix-xpcom.patch new file mode 100644 index 00000000000..e9d72df8681 --- /dev/null +++ b/srcpkgs/thunderbird/patches/fix-xpcom.patch @@ -0,0 +1,11 @@ +--- 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 +@@ -46,7 +46,7 @@ using namespace mozilla; + # include "mozmemory.h" + #endif // MOZ_MEMORY + +-#if defined(XP_LINUX) ++#if defined(XP_LINUX) && defined(__GLIBC__) + + #include + #include diff --git a/srcpkgs/thunderbird/patches/mallinfo.patch b/srcpkgs/thunderbird/patches/mallinfo.patch new file mode 100644 index 00000000000..60064a776df --- /dev/null +++ b/srcpkgs/thunderbird/patches/mallinfo.patch @@ -0,0 +1,18 @@ +--- mozilla/xpcom/base/nsMemoryReporterManager.cpp ++++ mozilla/xpcom/base/nsMemoryReporterManager.cpp +@@ -153,6 +153,7 @@ ResidentUniqueDistinguishedAmount(int64_t* aN) + return GetProcSelfSmapsPrivate(aN); + } + ++#ifdef __GLIBC__ + #define HAVE_SYSTEM_HEAP_REPORTER 1 + nsresult + SystemHeapSize(int64_t* aSizeOut) +@@ -172,6 +173,7 @@ SystemHeapSize(int64_t* aSizeOut) + *aSizeOut = size_t(info.hblkhd) + size_t(info.uordblks); + return NS_OK; + } ++#endif + + #elif defined(__DragonFly__) || defined(__FreeBSD__) \ + || defined(__NetBSD__) || defined(__OpenBSD__) \ diff --git a/srcpkgs/thunderbird/patches/patch-xpcom_components_Module.h b/srcpkgs/thunderbird/patches/patch-mozilla_xpcom_components_Module.h similarity index 74% rename from srcpkgs/thunderbird/patches/patch-xpcom_components_Module.h rename to srcpkgs/thunderbird/patches/patch-mozilla_xpcom_components_Module.h index 892d5ab5081..718bc6468c8 100644 --- a/srcpkgs/thunderbird/patches/patch-xpcom_components_Module.h +++ b/srcpkgs/thunderbird/patches/patch-mozilla_xpcom_components_Module.h @@ -1,8 +1,6 @@ -$NetBSD: patch-xpcom_components_Module.h,v 1.1 2016/02/06 22:13:22 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_components_Module.h,v 1.2 2016/04/17 18:33:50 ryoon Exp $ -* Workaround for binutils/GNU ld 2.26 from NetBSD/amd64 7.99.26 - ---- mozilla/xpcom/components/Module.h.orig 2016-01-23 23:23:51.000000000 +0000 +--- mozilla/xpcom/components/Module.h.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/components/Module.h @@ -125,7 +125,7 @@ struct Module # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport) diff --git a/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch b/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch index 3e6de85c1dd..61695660baf 100644 --- a/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch +++ b/srcpkgs/thunderbird/patches/thunderbird-install-dir.patch @@ -1,5 +1,5 @@ ---- mozilla/config/baseconfig.mk.orig 2014-07-23 17:41:26.899090299 +0200 -+++ mozilla/config/baseconfig.mk 2014-07-23 17:44:37.283097079 +0200 +--- 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 @@ -12,6 +12,6 @@ +idldir = $(datadir)/idl/$(MOZ_APP_NAME) +installdir = $(libdir)/$(MOZ_APP_NAME) +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - ifndef TOP_DIST - TOP_DIST = dist - endif + ifeq (.,$(DEPTH)) + DIST = dist + else diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 9056cff7ae8..22b0aa4f2b3 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -1,56 +1,58 @@ # Template build file for 'thunderbird'. pkgname=thunderbird -version=38.8.0 +version=45.1.1 revision=1 -wrksrc="comm-esr${version/.*/}" short_desc="Standalone Mail/News reader" maintainer="Enno Boland " homepage="http://www.mozilla.org/thunderbird/" -license="MPL-1.1, GPL-2, LGPL-2.1" -distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2" -checksum=690b3c16fd0cedd49cd84216eeb79361262507f7302e2b0aec862cab1c473333 +license="MPL-2.0, GPL-2, LGPL-2.1" +distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" +checksum=107d103c30b4f666ede1ec197156f94456117783087518fe1af4557d548b718e nopie=yes lib32disabled=yes +only_for_archs="i686 i686-musl x86_64 x86_64-musl" hostmakedepends="unzip zip pkg-config perl python yasm autoconf" -makedepends="alsa-lib-devel cairo-devel dbus-glib-devel gst-plugins-base1-devel - gtk+-devel hunspell-devel icu-devel libSM-devel libXScrnSaver-devel - libXcomposite-devel libXdamage-devel libXrender-devel libXt-devel - libevent-devel libjpeg-turbo-devel libvpx-devel nss-devel pixman-devel - pulseaudio-devel python-devel sqlite-devel startup-notification-devel - wireless_tools-devel" +makedepends=" + nss-devel libjpeg-turbo-devel gtk+-devel icu-devel pixman-devel + sqlite-devel pulseaudio-devel libevent-devel libnotify-devel + libvpx-devel libXrender-devel startup-notification-devel + dbus-glib-devel alsa-lib-devel hunspell-devel libXcomposite-devel + libSM-devel libXScrnSaver-devel libXt-devel libXdamage-devel" depends="desktop-file-utils hicolor-icon-theme" pre_configure() { case "$XBPS_TARGET_MACHINE" in *-musl) - # http://git.alpinelinux.org/cgit/aports/plain/community/firefox/stab.h + # http://git.alpinelinux.org/cgit/aports/plain/community/firefox-esr/stab.h cp $FILESDIR/stab.h mozilla/toolkit/crashreporter/google-breakpad/src/ - sed -i "s/__off64_t/off64_t/g" mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h ;; esac # configure script misdetects the preprocessor without an optimization level sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) + # Note: This is for Void Linux use ONLY. + _google_api_key="AIzaSyCIFdBA7eQP43R6kXRwTq7j6Mvj1ITze90" + echo -n "$_google_api_key" > google-api-key [ ! -d xbps-build ] && mkdir -p xbps-build } - do_configure() { - local cross_args + local _args case "$XBPS_TARGET_MACHINE" in *-musl) # XXX gold linking with --hash-style=sysv results in unhidden symbols # XXX see https://sourceware.org/ml/binutils/2014-09/msg00230.html # # XXX disable jemalloc. - cross_args+=" --disable-jemalloc --enable-gold=no" + _args+=" --disable-jemalloc --enable-gold=no" ;; esac if [ "$CROSS_BUILD" ]; then - cross_args+=" --target=$XBPS_CROSS_TRIPLET --disable-jemalloc" + _args+=" --target=$XBPS_CROSS_TRIPLET --disable-jemalloc" # Make config/system_wrappers/alsa/alsalib.h and pulse/pulse.h find # the required includes. Set system nspr and nss include paths. @@ -61,6 +63,7 @@ do_configure() { -I${XBPS_CROSS_BASE}/usr/include/nspr \ -I${XBPS_CROSS_BASE}/usr/include/nss" export CXXFLAGS+=" ${CFLAGS}" + export LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib" export ac_cv_sqlite_secure_delete=yes \ ac_cv_sqlite_threadsafe=yes \ @@ -74,26 +77,29 @@ do_configure() { export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird" cd xbps-build - # disable --enable-gstreamer for now + # 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 # Use bundled libpng, our does not have the apng patch. SHELL=/bin/bash ../configure --prefix=/usr --libdir=/usr/lib \ --enable-application=mail \ --with-system-nspr --with-system-nss --with-system-bz2 \ --with-system-jpeg --with-system-zlib --without-system-png \ - --with-system-libevent --with-system-libvpx --enable-system-cairo \ + --with-system-libevent --with-system-libvpx \ --enable-system-pixman --enable-system-hunspell --enable-system-sqlite \ - --enable-system-ffi --enable-startup-notification --enable-gio \ + --enable-system-ffi --enable-startup-notification --disable-gio \ --with-pthreads --enable-official-branding --enable-safe-browsing \ --disable-skia --disable-debug --disable-gnomevfs --disable-gconf \ --disable-crashreporter --disable-updater --disable-xprint --disable-tests \ --disable-mochitest --disable-installer --disable-elf-hack \ - --with-system-icu --enable-pulseaudio --enable-gstreamer=1.0 \ + --with-system-icu --enable-pulseaudio --disable-gstreamer \ --disable-cpp-exceptions --disable-javaxpcom \ --with-nspr-prefix=${XBPS_CROSS_BASE}/usr \ - --with-nss-prefix=${XBPS_CROSS_BASE}/usr ${cross_args} \ + --with-nss-prefix=${XBPS_CROSS_BASE}/usr \ + --with-google-api-keyfile="${wrksrc}/google-api-key" \ --enable-optimize="$CFLAGS" --disable-strip --disable-install-strip \ - --disable-static --enable-pie \ - --disable-profiling --disable-profilelocking + --disable-static --enable-pie --disable-profiling \ + --disable-profilelocking ${_args} } do_build() { if [ "$SOURCE_DATE_EPOCH" ]; then @@ -106,7 +112,7 @@ do_install() { cd xbps-build make DESTDIR=${DESTDIR} install - vinstall ${FILESDIR}/vendor.js 644 usr/lib/thunderbird/defaults/pref + 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 @@ -116,13 +122,12 @@ do_install() { # Use system-provided dictionaries rm -rf ${DESTDIR}/usr/lib/thunderbird/{dictionaries,hyphenation} - ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/thunderbird/dictionaries - ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/thunderbird/hyphenation + ln -sf /usr/share/hunspell ${DESTDIR}/usr/lib/thunderbird/dictionaries + ln -sf /usr/share/hyphen ${DESTDIR}/usr/lib/thunderbird/hyphenation # We don't want the development stuff - rm -r ${DESTDIR}/usr/{include,share/idl} - rm -r ${DESTDIR}/usr/lib/thunderbird-devel + rm -rf ${DESTDIR}/usr/{include,lib/thunderbird-devel,share/idl} - # same binaries : usr/lib/thunderbird/{thunderbird-bin,thunderbird} - rm -f ${DESTDIR}/usr/lib/thunderbird/thunderbird-bin + # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf thunderbird ${DESTDIR}/usr/lib/thunderbird/thunderbird-bin }