thunderbird: update to 60.0.
This commit is contained in:
Enno Boland
Enno Boland
parent
160cff19c5
commit
d341c13ade
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
From: Mike Hommey <mh@glandium.org>
|
||||
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
|
||||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001
|
||||
From: Ralph Giles <giles@mozilla.com>
|
||||
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
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 <unistd.h>
|
||||
#include <sys/syscall.h>
|
||||
static inline pid_t gettid()
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 <sys/mman.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
|
||||
#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
|
||||
--- 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 <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
|
||||
--- 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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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 <sys/types.h>
|
||||
+
|
||||
#ifdef ANDROID
|
||||
#include <android/log.h>
|
||||
#else
|
||||
--- mozilla/tools/profiler/lul/LulElf.cpp
|
||||
+++ mozilla/tools/profiler/lul/LulElf.cpp
|
||||
#include <stdint.h>
|
||||
#include <math.h>
|
||||
#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<ucontext_t*>(aContext);
|
||||
if (!getcontext(pContext)) {
|
||||
context = pContext;
|
||||
SetSampleContext(this, aContext);
|
||||
if (!getcontext(&sSyncUContext)) {
|
||||
PopulateRegsFromContext(*this, &sSyncUContext);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
void OS::SleepMicro(int microseconds)
|
||||
|
|
|
|||
|
|
@ -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 <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <features.h>
|
||||
-#if __GLIBC_PREREQ(2, 16)
|
||||
+#if !__GLIBC__
|
||||
+#include <sys/auxv.h>
|
||||
+#elif __GLIBC_PREREQ(2, 16)
|
||||
#include <sys/auxv.h>
|
||||
#else
|
||||
#include <fcntl.h>
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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::<cmsghdr>())
|
||||
|
|
@ -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.
|
||||
|
|
@ -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
|
||||
|
|
@ -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 <gottox@voidlinux.eu>"
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue