snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

thunderbird: update to 45.1.1 

Close #4265.
This commit is contained in:
Alessio Sergi 2016-06-04 01:18:04 +02:00
parent 295105c4ec
commit babed5128d
20 changed files with 298 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
srcpkgs/thunderbird/files/thunderbird.desktop
View File

@ -1,13 +1,64 @@
[Desktop Entry] [Desktop Entry]
Version=1.0
Name=Thunderbird Name=Thunderbird
Comment=Mail & News Reader GenericName=Mail Client
GenericName=Mail Client & News Reader 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 Exec=thunderbird %u
TryExec=thunderbird
Icon=thunderbird Icon=thunderbird
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Network;Email;
MimeType=message/rfc822;x-scheme-handler/mailto; MimeType=message/rfc822;x-scheme-handler/mailto;
StartupNotify=true StartupNotify=true
Categories=Network;Email;

1
srcpkgs/thunderbird/patches/0002-Use-C99-math-isfinite.patch
View File

@ -1,4 +1,3 @@
Patch from Firefox ESR 38 Void packaging.
--- mozilla/xpcom/ds/nsMathUtils.h.orig --- mozilla/xpcom/ds/nsMathUtils.h.orig
+++ mozilla/xpcom/ds/nsMathUtils.h +++ mozilla/xpcom/ds/nsMathUtils.h
@@ -104,12 +104,12 @@ @@ -104,12 +104,12 @@

1
srcpkgs/thunderbird/patches/fix-musl-fortify-inline.patch → srcpkgs/thunderbird/patches/fix-fortify-inline.patch
View File

@ -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
+++ 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 @@ @@ -27,8 +27,5 @@

15
srcpkgs/thunderbird/patches/fix-gcc-tests.patch
View File

@ -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.orig 2015-05-29 18:30:41.474423097 +0200
+++ mozilla/configure 2015-05-29 18:30:53.451550589 +0200 +++ mozilla/configure 2015-05-29 18:30:53.451550589 +0200
@@ -10966,8 +10966,8 @@ ac_have_llvm_pr8927="no" @@ -10966,8 +10966,8 @@ ac_have_llvm_pr8927="no"

11
srcpkgs/thunderbird/patches/fix-linux-include.patch
View File

@ -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 <sys/mount.h>
#include <sys/quota.h>
+#include <linux/fs.h>
#endif
#include "xpcom-private.h"

11
srcpkgs/thunderbird/patches/fix-media.patch
View File

@ -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 <sys/param.h>
#include <sys/socket.h>
#ifndef ANDROID
-#include <sys/sysctl.h>
#include <sys/syslog.h>
#else
#include <syslog.h>

56
srcpkgs/thunderbird/patches/fix-musl-ipc.patch
View File

@ -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 <windows.h>
#elif defined(ANDROID)
#include <sys/stat.h>
+#define NO_FTS
#elif defined(OS_POSIX)
#include <sys/types.h>
-#include <fts.h>
#include <sys/stat.h>
+#ifdef __GLIBC__
+#include <fts.h>
+#else
+#define NO_FTS
+#endif
#endif
#include <stdio.h>
--- mozilla/ipc/chromium/src/base/file_util_posix.cc
+++ mozilla/ipc/chromium/src/base/file_util_posix.cc
@@ -8,13 +8,13 @@
#include <errno.h>
#include <fcntl.h>
#include <fnmatch.h>
-#ifndef ANDROID
+#ifndef NO_FTS
#include <fts.h>
#endif
#include <libgen.h>
#include <stdio.h>
#include <string.h>
-#include <sys/errno.h>
+#include <errno.h>
#include <sys/mman.h>
#define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
#include <sys/stat.h>
@@ -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

39
srcpkgs/thunderbird/patches/fix-musl-memory.patch
View File

@ -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 <sys/time.h>
#include <sys/types.h>
-#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID)
+#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID) && defined(__GLIBC__)
#include <sys/sysctl.h>
#endif
#include <sys/uio.h>
@@ -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);

26
srcpkgs/thunderbird/patches/fix-musl-stat.patch
View File

@ -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") {

145
srcpkgs/thunderbird/patches/fix-musl-toolkit.patch
View File

@ -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 <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <libgen.h>
#include <iostream>
#include <set>
--- 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 <config.h>
#endif
-#ifdef HAVE_A_OUT_H
+#if 0
#include <a.out.h>
#endif
+
#ifdef HAVE_MACH_O_NLIST_H
#include <mach-o/nlist.h>
#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 <sys/stat.h>
-#else
+#elif !defined(__linux__) || defined(__GLIBC__)
# include <fts.h>
#endif
# include <dirent.h>
--- 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 <signal.h>
#include <stdio.h>
#include <string.h>
+#include <sys/types.h>
#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

38
srcpkgs/thunderbird/patches/fix-netwerk.patch
View File

@ -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 <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
#include <sys/socket.h>
-#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID)
#include <pthread.h>
-#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 <netdb.h>
+
#ifdef __FreeBSD__
#include <sys/cdefs.h>
__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 <sys/cdefs.h>
#endif
/*

14
srcpkgs/thunderbird/patches/fix-seccomp-bpf.patch Normal file
View File

@ -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 {

43
srcpkgs/thunderbird/patches/fix-stack-overflow.patch Normal file
View File

@ -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<nsHTTPCompressConv *>(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<uint8_t[]>(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<const char *>(outBuffer),
+ reinterpret_cast<const char *>(outBuffer.get()),
outSize);
LOG(("nsHttpCompressConv %p BrotliHandler ODA rv=%x", self, rv));
if (NS_FAILED(rv)) {

77
srcpkgs/thunderbird/patches/fix-toolkit.patch Normal file
View File

@ -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 <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <libgen.h>
#include <iostream>
#include <set>
--- 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 <config.h>
#endif
-#ifdef HAVE_A_OUT_H
+#if 0
#include <a.out.h>
#endif
+
#ifdef HAVE_MACH_O_NLIST_H
#include <mach-o/nlist.h>
#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 <sys/stat.h>
-#else
+#elif !defined(__linux__) || defined(__GLIBC__)
# include <fts.h>
#endif
# include <dirent.h>
--- 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;
}

56
srcpkgs/thunderbird/patches/fix-tools.patch
View File

@ -1,6 +1,5 @@
Patch from Firefox ESR 38 Void packaging. --- mozilla/tools/profiler/gecko/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/local_debug_info_symbolizer.cc
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * 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 "PlatformMacros.h"
#include "nsAutoPtr.h" #include "nsAutoPtr.h"
--- mozilla/tools/profiler/platform-linux.cc --- mozilla/tools/profiler/core/platform.h
+++ mozilla/tools/profiler/platform-linux.cc +++ mozilla/tools/profiler/core/platform.h
@@ -84,7 +84,7 @@
#define SIGNAL_SAVE_PROFILE SIGUSR2
-#if defined(__GLIBC__)
+#if 1
// glibc doesn't implement gettid(2).
#include <sys/syscall.h>
pid_t gettid()
--- mozilla/tools/profiler/platform.h
+++ mozilla/tools/profiler/platform.h
@@ -29,6 +29,8 @@ @@ -29,6 +29,8 @@
#ifndef TOOLS_PLATFORM_H_ #ifndef TOOLS_PLATFORM_H_
#define TOOLS_PLATFORM_H_ #define TOOLS_PLATFORM_H_
@ -31,8 +19,8 @@ Patch from Firefox ESR 38 Void packaging.
#ifdef ANDROID #ifdef ANDROID
#include <android/log.h> #include <android/log.h>
#else #else
--- mozilla/tools/profiler/LulElf.cpp --- mozilla/tools/profiler/lul/LulElf.cpp
+++ mozilla/tools/profiler/LulElf.cpp +++ mozilla/tools/profiler/lul/LulElf.cpp
@@ -579,10 +579,10 @@ @@ -579,10 +579,10 @@
// Return the non-directory portion of FILENAME: the portion after the // Return the non-directory portion of FILENAME: the portion after the
// last slash, or the whole filename if there are no slashes. // last slash, or the whole filename if there are no slashes.
@ -48,8 +36,8 @@ Patch from Firefox ESR 38 Void packaging.
return base; return base;
} }
--- mozilla/tools/profiler/platform-linux.cc.orig 2015-06-11 18:39:35.689739054 +0200 --- mozilla/tools/profiler/core/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 2015-06-11 18:40:04.479706749 +0200
@@ -651,11 +651,13 @@ void OS::Startup() { @@ -651,11 +651,13 @@ void OS::Startup() {
void TickSample::PopulateContext(void* aContext) void TickSample::PopulateContext(void* aContext)
{ {
@ -64,3 +52,31 @@ Patch from Firefox ESR 38 Void packaging.
} }
void OS::SleepMicro(int microseconds) 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 <vector>
-// 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 <unistd.h>
#include <sys/syscall.h>
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

11
srcpkgs/thunderbird/patches/fix-xpcom.patch Normal file
View File

@ -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 <malloc.h>
#include <string.h>

18
srcpkgs/thunderbird/patches/mallinfo.patch Normal file
View File

@ -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__) \

6
srcpkgs/thunderbird/patches/patch-xpcom_components_Module.h → srcpkgs/thunderbird/patches/patch-mozilla_xpcom_components_Module.h
View File

@ -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-04-07 21:33:35.000000000 +0000
--- mozilla/xpcom/components/Module.h.orig 2016-01-23 23:23:51.000000000 +0000
+++ mozilla/xpcom/components/Module.h +++ mozilla/xpcom/components/Module.h
@@ -125,7 +125,7 @@ struct Module @@ -125,7 +125,7 @@ struct Module
# define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport) # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport)

10
srcpkgs/thunderbird/patches/thunderbird-install-dir.patch
View File

@ -1,5 +1,5 @@
--- mozilla/config/baseconfig.mk.orig 2014-07-23 17:41:26.899090299 +0200 --- mozilla/config/baseconfig.mk.orig
+++ mozilla/config/baseconfig.mk 2014-07-23 17:44:37.283097079 +0200 +++ mozilla/config/baseconfig.mk
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
# directly in python/mozbuild/mozbuild/base.py for gmake validation. # directly in python/mozbuild/mozbuild/base.py for gmake validation.
# We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
@ -12,6 +12,6 @@
+idldir = $(datadir)/idl/$(MOZ_APP_NAME) +idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+installdir = $(libdir)/$(MOZ_APP_NAME) +installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
ifndef TOP_DIST ifeq (.,$(DEPTH))
TOP_DIST = dist DIST = dist
endif else

67
srcpkgs/thunderbird/template
View File

@ -1,56 +1,58 @@
# Template build file for 'thunderbird'. # Template build file for 'thunderbird'.
pkgname=thunderbird pkgname=thunderbird
version=38.8.0 version=45.1.1
revision=1 revision=1
wrksrc="comm-esr${version/.*/}"
short_desc="Standalone Mail/News reader" short_desc="Standalone Mail/News reader"
maintainer="Enno Boland <gottox@voidlinux.eu>" maintainer="Enno Boland <gottox@voidlinux.eu>"
homepage="http://www.mozilla.org/thunderbird/" homepage="http://www.mozilla.org/thunderbird/"
license="MPL-1.1, GPL-2, LGPL-2.1" license="MPL-2.0, GPL-2, LGPL-2.1"
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
checksum=690b3c16fd0cedd49cd84216eeb79361262507f7302e2b0aec862cab1c473333 checksum=107d103c30b4f666ede1ec197156f94456117783087518fe1af4557d548b718e
nopie=yes nopie=yes
lib32disabled=yes lib32disabled=yes
only_for_archs="i686 i686-musl x86_64 x86_64-musl"
hostmakedepends="unzip zip pkg-config perl python yasm autoconf" hostmakedepends="unzip zip pkg-config perl python yasm autoconf"
makedepends="alsa-lib-devel cairo-devel dbus-glib-devel gst-plugins-base1-devel makedepends="
gtk+-devel hunspell-devel icu-devel libSM-devel libXScrnSaver-devel nss-devel libjpeg-turbo-devel gtk+-devel icu-devel pixman-devel
libXcomposite-devel libXdamage-devel libXrender-devel libXt-devel sqlite-devel pulseaudio-devel libevent-devel libnotify-devel
libevent-devel libjpeg-turbo-devel libvpx-devel nss-devel pixman-devel libvpx-devel libXrender-devel startup-notification-devel
pulseaudio-devel python-devel sqlite-devel startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel libXcomposite-devel
wireless_tools-devel" libSM-devel libXScrnSaver-devel libXt-devel libXdamage-devel"
depends="desktop-file-utils hicolor-icon-theme" depends="desktop-file-utils hicolor-icon-theme"
pre_configure() { pre_configure() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) *-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/ 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 esac
# configure script misdetects the preprocessor without an optimization level # configure script misdetects the preprocessor without an optimization level
sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure 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 [ ! -d xbps-build ] && mkdir -p xbps-build
} }
do_configure() { do_configure() {
local cross_args local _args
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) # XXX gold linking with --hash-style=sysv results in unhidden symbols *-musl) # XXX gold linking with --hash-style=sysv results in unhidden symbols
# XXX see https://sourceware.org/ml/binutils/2014-09/msg00230.html # XXX see https://sourceware.org/ml/binutils/2014-09/msg00230.html
# #
# XXX disable jemalloc. # XXX disable jemalloc.
cross_args+=" --disable-jemalloc --enable-gold=no" _args+=" --disable-jemalloc --enable-gold=no"
;; ;;
esac esac
if [ "$CROSS_BUILD" ]; then 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 # Make config/system_wrappers/alsa/alsalib.h and pulse/pulse.h find
# the required includes. Set system nspr and nss include paths. # 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/nspr \
-I${XBPS_CROSS_BASE}/usr/include/nss" -I${XBPS_CROSS_BASE}/usr/include/nss"
export CXXFLAGS+=" ${CFLAGS}" export CXXFLAGS+=" ${CFLAGS}"
export LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib"
export ac_cv_sqlite_secure_delete=yes \ export ac_cv_sqlite_secure_delete=yes \
ac_cv_sqlite_threadsafe=yes \ ac_cv_sqlite_threadsafe=yes \
@ -74,26 +77,29 @@ do_configure() {
export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird" export LDFLAGS+=" -Wl,-rpath=/usr/lib/thunderbird"
cd xbps-build 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. # Use bundled libpng, our does not have the apng patch.
SHELL=/bin/bash ../configure --prefix=/usr --libdir=/usr/lib \ SHELL=/bin/bash ../configure --prefix=/usr --libdir=/usr/lib \
--enable-application=mail \ --enable-application=mail \
--with-system-nspr --with-system-nss --with-system-bz2 \ --with-system-nspr --with-system-nss --with-system-bz2 \
--with-system-jpeg --with-system-zlib --without-system-png \ --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-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 \ --with-pthreads --enable-official-branding --enable-safe-browsing \
--disable-skia --disable-debug --disable-gnomevfs --disable-gconf \ --disable-skia --disable-debug --disable-gnomevfs --disable-gconf \
--disable-crashreporter --disable-updater --disable-xprint --disable-tests \ --disable-crashreporter --disable-updater --disable-xprint --disable-tests \
--disable-mochitest --disable-installer --disable-elf-hack \ --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 \ --disable-cpp-exceptions --disable-javaxpcom \
--with-nspr-prefix=${XBPS_CROSS_BASE}/usr \ --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 \ --enable-optimize="$CFLAGS" --disable-strip --disable-install-strip \
--disable-static --enable-pie \ --disable-static --enable-pie --disable-profiling \
--disable-profiling --disable-profilelocking --disable-profilelocking ${_args}
} }
do_build() { do_build() {
if [ "$SOURCE_DATE_EPOCH" ]; then if [ "$SOURCE_DATE_EPOCH" ]; then
@ -106,7 +112,7 @@ do_install() {
cd xbps-build cd xbps-build
make DESTDIR=${DESTDIR} install 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 vinstall ${FILESDIR}/thunderbird.desktop 644 usr/share/applications
for i in 16 22 24 32 48 256; do for i in 16 22 24 32 48 256; do
@ -116,13 +122,12 @@ do_install() {
# Use system-provided dictionaries # Use system-provided dictionaries
rm -rf ${DESTDIR}/usr/lib/thunderbird/{dictionaries,hyphenation} rm -rf ${DESTDIR}/usr/lib/thunderbird/{dictionaries,hyphenation}
ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/thunderbird/dictionaries ln -sf /usr/share/hunspell ${DESTDIR}/usr/lib/thunderbird/dictionaries
ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/thunderbird/hyphenation ln -sf /usr/share/hyphen ${DESTDIR}/usr/lib/thunderbird/hyphenation
# We don't want the development stuff # We don't want the development stuff
rm -r ${DESTDIR}/usr/{include,share/idl} rm -rf ${DESTDIR}/usr/{include,lib/thunderbird-devel,share/idl}
rm -r ${DESTDIR}/usr/lib/thunderbird-devel
# same binaries : usr/lib/thunderbird/{thunderbird-bin,thunderbird} # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
rm -f ${DESTDIR}/usr/lib/thunderbird/thunderbird-bin ln -sf thunderbird ${DESTDIR}/usr/lib/thunderbird/thunderbird-bin
} }