diff options
Diffstat (limited to 'mail/thunderbird/patches')
193 files changed, 1045 insertions, 2546 deletions
diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al deleted file mode 100644 index d4913d6c4f0..00000000000 --- a/mail/thunderbird/patches/patch-al +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-al,v 1.12 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/storage/src/mozStorageConnection.cpp.orig 2014-07-18 00:05:51.000000000 +0000 -+++ mozilla/storage/src/mozStorageConnection.cpp -@@ -600,6 +600,11 @@ Connection::initialize(nsIFile *aDatabas - - mDatabaseFile = aDatabaseFile; - -+ // XXX tnn: the configure script demands that sqlite3 is compiled with -+ // SECURE_DELETE on by default. sqlite3 in pkgsrc does not have that, -+ // so instead we enable secure_delete manually here. -+ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA secure_delete = 1;")); -+ - return NS_OK; - } - diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax deleted file mode 100644 index 13f4fc4b904..00000000000 --- a/mail/thunderbird/patches/patch-ax +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-ax,v 1.15 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2015-06-08 17:49:33.000000000 +0000 -+++ mozilla/xpcom/base/nsStackWalk.cpp -@@ -34,12 +34,12 @@ static CriticalAddress gCriticalAddress; - #define _GNU_SOURCE - #endif - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_DARWIN) - #include <dlfcn.h> - #endif - --#define NSSTACKWALK_SUPPORTS_MACOSX \ -- (defined(XP_MACOSX) && \ -+#define NSSTACKWALK_SUPPORTS_DARWIN \ -+ (defined(XP_DARWIN) && \ - (defined(__i386) || defined(__ppc__) || defined(HAVE__UNWIND_BACKTRACE))) - - #define NSSTACKWALK_SUPPORTS_LINUX \ -@@ -47,7 +47,7 @@ static CriticalAddress gCriticalAddress; - ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ - defined(HAVE__UNWIND_BACKTRACE))) - --#if NSSTACKWALK_SUPPORTS_MACOSX -+#if NSSTACKWALK_SUPPORTS_DARWIN - #include <pthread.h> - #include <CoreServices/CoreServices.h> - -@@ -830,7 +830,7 @@ NS_DescribeCodeAddress(void* aPC, nsCode - } - - // i386 or PPC Linux stackwalking code --#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_MACOSX) -+#elif HAVE_DLADDR && (HAVE__UNWIND_BACKTRACE || NSSTACKWALK_SUPPORTS_LINUX || NSSTACKWALK_SUPPORTS_DARWIN) - - #include <stdlib.h> - #include <string.h> -@@ -901,7 +901,7 @@ FramePointerStackWalk(NS_WalkStackCallba - (long(next) & 3)) { - break; - } --#if (defined(__ppc__) && defined(XP_MACOSX)) || defined(__powerpc64__) -+#if (defined(__ppc__) && defined(XP_DARWIN)) || defined(__powerpc64__) - // ppc mac or powerpc64 linux - void* pc = *(bp + 2); - bp += 3; -@@ -931,7 +931,7 @@ FramePointerStackWalk(NS_WalkStackCallba - } - - #define X86_OR_PPC (defined(__i386) || defined(PPC) || defined(__ppc__)) --#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_MACOSX || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code -+#if X86_OR_PPC && (NSSTACKWALK_SUPPORTS_DARWIN || NSSTACKWALK_SUPPORTS_LINUX) // i386 or PPC Linux or Mac stackwalking code - - XPCOM_API(nsresult) - NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames, diff --git a/mail/thunderbird/patches/patch-ay b/mail/thunderbird/patches/patch-ay deleted file mode 100644 index f719da2702d..00000000000 --- a/mail/thunderbird/patches/patch-ay +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ay,v 1.12 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/browser/app/nsBrowserApp.cpp.orig 2015-06-08 17:49:17.000000000 +0000 -+++ mozilla/browser/app/nsBrowserApp.cpp -@@ -18,8 +18,10 @@ - #include <unistd.h> - #endif - --#ifdef XP_MACOSX -+#ifdef XP_DARWIN - #include <mach/mach_time.h> -+#endif -+#ifdef MOZ_WIDGET_COCOA - #include "MacQuirks.h" - #endif - -@@ -459,7 +461,7 @@ TimeStamp_Now() - } - - return sGetTickCount64() * freq.QuadPart; --#elif defined(XP_MACOSX) -+#elif defined(XP_DARWIN) - return mach_absolute_time(); - #elif defined(HAVE_CLOCK_MONOTONIC) - struct timespec ts; -@@ -606,6 +608,7 @@ int main(int argc, char* argv[]) - TriggerQuirks(); - #endif - -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); - int gotCounters; - #if defined(XP_UNIX) - struct rusage initialRUsage; diff --git a/mail/thunderbird/patches/patch-calendar_lightning_Makefile.in b/mail/thunderbird/patches/patch-calendar_lightning_Makefile.in index c3727e7c178..85fb948df65 100644 --- a/mail/thunderbird/patches/patch-calendar_lightning_Makefile.in +++ b/mail/thunderbird/patches/patch-calendar_lightning_Makefile.in @@ -1,11 +1,11 @@ -$NetBSD: patch-calendar_lightning_Makefile.in,v 1.3 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-calendar_lightning_Makefile.in,v 1.4 2016/04/17 18:33:50 ryoon Exp $ ---- calendar/lightning/Makefile.in.orig 2015-06-08 17:40:38.000000000 +0000 +--- calendar/lightning/Makefile.in.orig 2016-04-07 21:14:23.000000000 +0000 +++ calendar/lightning/Makefile.in -@@ -6,7 +6,7 @@ +@@ -5,7 +5,7 @@ + # Calendar builders currently use STRIP_XPI to reduce the binary component in # Lightning. - USE_EXTENSION_MANIFEST = 1 -XPI_PKGNAME = lightning-$(LIGHTNING_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM) +XPI_PKGNAME = lightning XPI_VERSION = $(LIGHTNING_VERSION) diff --git a/mail/thunderbird/patches/patch-calendar_lightning_build_universal.mk b/mail/thunderbird/patches/patch-calendar_lightning_build_universal.mk index d6252de2d84..38b2f36ed64 100644 --- a/mail/thunderbird/patches/patch-calendar_lightning_build_universal.mk +++ b/mail/thunderbird/patches/patch-calendar_lightning_build_universal.mk @@ -1,6 +1,6 @@ -$NetBSD: patch-calendar_lightning_build_universal.mk,v 1.2 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-calendar_lightning_build_universal.mk,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- calendar/lightning/build/universal.mk.orig 2014-07-18 00:04:05.000000000 +0000 +--- calendar/lightning/build/universal.mk.orig 2016-04-07 21:14:23.000000000 +0000 +++ calendar/lightning/build/universal.mk @@ -19,7 +19,7 @@ include $(topsrcdir)/mozilla/toolkit/moz diff --git a/mail/thunderbird/patches/patch-calendar_providers_gdata_Makefile.in b/mail/thunderbird/patches/patch-calendar_providers_gdata_Makefile.in index bbdb82f0939..95b62a41001 100644 --- a/mail/thunderbird/patches/patch-calendar_providers_gdata_Makefile.in +++ b/mail/thunderbird/patches/patch-calendar_providers_gdata_Makefile.in @@ -1,11 +1,11 @@ -$NetBSD: patch-calendar_providers_gdata_Makefile.in,v 1.3 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-calendar_providers_gdata_Makefile.in,v 1.4 2016/04/17 18:33:50 ryoon Exp $ ---- calendar/providers/gdata/Makefile.in.orig 2015-06-08 17:40:38.000000000 +0000 +--- calendar/providers/gdata/Makefile.in.orig 2016-04-07 21:14:23.000000000 +0000 +++ calendar/providers/gdata/Makefile.in -@@ -4,7 +4,7 @@ +@@ -2,7 +2,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/. - USE_EXTENSION_MANIFEST = 1 - DIST_FILES = install.rdf -XPI_PKGNAME = gdata-provider-$(GDATA_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM) +XPI_PKGNAME = gdata-provider XPI_VERSION = $(GDATA_VERSION) diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc deleted file mode 100644 index df84a7565f0..00000000000 --- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.8 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2014-07-18 00:05:24.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util_posix.cc -@@ -8,7 +8,7 @@ - #include <errno.h> - #include <fcntl.h> - #include <fnmatch.h> --#ifndef ANDROID -+#if !defined(ANDROID) && !defined(OS_SOLARIS) - #include <fts.h> - #endif - #include <libgen.h> -@@ -67,7 +67,7 @@ bool Delete(const FilePath& path, bool r - if (!recursive) - return (rmdir(path_str) == 0); - --#ifdef ANDROID -+#if defined(ANDROID) || defined(OS_SOLARIS) - // XXX Need ftsless impl for bionic - return false; - #else -@@ -140,7 +140,7 @@ bool CopyDirectory(const FilePath& from_ - return false; - } - --#ifdef ANDROID -+#if defined(ANDROID) || defined(OS_SOLARIS) - // XXX Need ftsless impl for bionic - return false; - #else -@@ -435,7 +435,7 @@ bool SetCurrentDirectory(const FilePath& - return !ret; - } - --#if !defined(OS_MACOSX) -+#if !defined(MOZ_WIDGET_COCOA) - bool GetTempDir(FilePath* path) { - const char* tmp = getenv("TMPDIR"); - if (tmp) -@@ -499,6 +499,6 @@ bool CopyFile(const FilePath& from_path, - - return result; - } --#endif // !defined(OS_MACOSX) -+#endif // !defined(MOZ_WIDGET_COCOA) - - } // namespace file_util diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc deleted file mode 100644 index 24606e383b5..00000000000 --- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.7 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig 2014-07-18 00:05:24.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/sys_info_posix.cc -@@ -119,7 +119,11 @@ std::wstring SysInfo::GetEnvVar(const wc - - // static - std::string SysInfo::OperatingSystemName() { -+#ifdef OS_SOLARIS -+ struct utsname info; -+#else - utsname info; -+#endif - if (uname(&info) < 0) { - NOTREACHED(); - return ""; -@@ -129,7 +133,11 @@ std::string SysInfo::OperatingSystemName - - // static - std::string SysInfo::OperatingSystemVersion() { -+#ifdef OS_SOLARIS -+ struct utsname info; -+#else - utsname info; -+#endif - if (uname(&info) < 0) { - NOTREACHED(); - return ""; diff --git a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h b/mail/thunderbird/patches/patch-ldap_c-sdk_include_portable.h index 7f11735cf21..73bc57cfef5 100644 --- a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h +++ b/mail/thunderbird/patches/patch-ldap_c-sdk_include_portable.h @@ -1,17 +1,13 @@ -$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.7 2012/09/02 06:43:40 ryoon Exp $ +$NetBSD: patch-ldap_c-sdk_include_portable.h,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- ldap/sdks/c-sdk/ldap/include/portable.h.orig 2012-08-25 00:31:56.000000000 +0000 -+++ ldap/sdks/c-sdk/ldap/include/portable.h -@@ -122,8 +122,11 @@ +--- ldap/c-sdk/include/portable.h.orig 2016-04-07 21:14:24.000000000 +0000 ++++ ldap/c-sdk/include/portable.h +@@ -122,7 +122,7 @@ * some systems don't have the BSD re_comp and re_exec routines */ #ifndef NEED_BSDREGEX -#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined(__OpenBSD__) || defined( linux ) || defined( DARWIN )) && !defined(sgi) +#if ( defined( SYSV ) || defined( NETBSD ) || defined(DRAGONFLY) || defined( FREEBSD ) || defined(__OpenBSD__) || defined( linux ) || defined( DARWIN )) && !defined(sgi) #define NEED_BSDREGEX -+/* there are conflicting prototypes in unistd.h on DragonFly */ -+#define re_comp ldap_compat_re_comp -+#define re_exec ldap_compat_re_exec #endif #endif - diff --git a/mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk b/mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk deleted file mode 100644 index 585a71ccd93..00000000000 --- a/mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-ldap_sdks_c-sdk_build.mk,v 1.2 2012/09/02 06:43:40 ryoon Exp $ - ---- ldap/sdks/c-sdk/build.mk.orig 2012-08-25 00:31:56.000000000 +0000 -+++ ldap/sdks/c-sdk/build.mk -@@ -488,21 +488,21 @@ LINK_LIB = $(RM) $@; $(AR) $(AR_F - LINK_LIB2 = $(RM) $@; $(AR) $@ $(OBJS2); $(RANLIB) $@ - ifneq ($(LD),$(CC)) - ifdef SONAMEFLAG_PREFIX --LINK_DLL = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \ -+LINK_DLL = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS) \ - $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \ - -o $@ $(SONAMEFLAG_PREFIX)$(notdir $@) $(OBJS) - else # SONAMEFLAG_PREFIX --LINK_DLL = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \ -+LINK_DLL = $(LD) $(DSO_LDOPTS) $(LDRPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS) \ - $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \ - -o $@ $(OBJS) - endif # SONAMEFLAG_PREFIX - else # $(CC) is used to link libs - ifdef SONAMEFLAG_PREFIX --LINK_DLL = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \ -+LINK_DLL = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS) \ - $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \ - -o $@ $(SONAMEFLAG_PREFIX)$(notdir $@) $(OBJS) - else # SONAMEFLAG_PREFIX --LINK_DLL = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) \ -+LINK_DLL = $(LD) $(DSO_LDOPTS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) $(ALDFLAGS) $(OS_LDFLAGS) \ - $(DLL_LDFLAGS) $(DLL_EXPORT_FLAGS) \ - -o $@ $(OBJS) - endif # SONAMEFLAG_PREFIX -@@ -517,7 +517,7 @@ SO_FILES_TO_REMOVE=so_locations - endif - - ifneq (,$(filter BeOS Darwin NetBSD,$(OS_ARCH))) --LINK_DLL = $(MKSHLIB) $(OBJS) -+LINK_DLL = $(MKSHLIB) $(OBJS) $(OS_LDFLAGS) - endif - - ifeq ($(OS_ARCH), HP-UX) diff --git a/mail/thunderbird/patches/patch-zc b/mail/thunderbird/patches/patch-mail_app_nsMailApp.cpp index 05dc8680c92..0c4baa903a6 100644 --- a/mail/thunderbird/patches/patch-zc +++ b/mail/thunderbird/patches/patch-mail_app_nsMailApp.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-zc,v 1.6 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mail_app_nsMailApp.cpp,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mail/app/nsMailApp.cpp.orig 2015-06-08 17:40:39.000000000 +0000 +--- mail/app/nsMailApp.cpp.orig 2016-04-07 21:14:22.000000000 +0000 +++ mail/app/nsMailApp.cpp @@ -15,6 +15,26 @@ #include <sys/resource.h> @@ -29,7 +29,7 @@ $NetBSD: patch-zc,v 1.6 2015/07/09 15:17:35 ryoon Exp $ #ifdef XP_MACOSX #include "MacQuirks.h" -@@ -218,6 +238,7 @@ FileExists(const char *path) +@@ -213,6 +233,7 @@ FileExists(const char *path) static nsresult InitXPCOMGlue(const char *argv0, nsIFile **xreDirectory) { diff --git a/mail/thunderbird/patches/patch-mail_components_shell_nsMailGNOMEIntegration.cpp b/mail/thunderbird/patches/patch-mail_components_shell_nsMailGNOMEIntegration.cpp index 3234b11c468..2ba01659608 100644 --- a/mail/thunderbird/patches/patch-mail_components_shell_nsMailGNOMEIntegration.cpp +++ b/mail/thunderbird/patches/patch-mail_components_shell_nsMailGNOMEIntegration.cpp @@ -1,8 +1,6 @@ -$NetBSD: patch-mail_components_shell_nsMailGNOMEIntegration.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mail_components_shell_nsMailGNOMEIntegration.cpp,v 1.3 2016/04/17 18:33:50 ryoon Exp $ -Avoid warning storing a size_t in an unsigned int on LP64 - ---- mail/components/shell/nsMailGNOMEIntegration.cpp.orig 2015-06-08 17:40:38.000000000 +0000 +--- mail/components/shell/nsMailGNOMEIntegration.cpp.orig 2016-04-07 21:14:23.000000000 +0000 +++ mail/components/shell/nsMailGNOMEIntegration.cpp @@ -50,16 +50,16 @@ struct AppTypeAssociation { diff --git a/mail/thunderbird/patches/patch-mail_installer_package-manifest.in b/mail/thunderbird/patches/patch-mail_installer_package-manifest.in index 0500a30ede2..98cb5f42b0c 100644 --- a/mail/thunderbird/patches/patch-mail_installer_package-manifest.in +++ b/mail/thunderbird/patches/patch-mail_installer_package-manifest.in @@ -1,8 +1,8 @@ -$NetBSD: patch-mail_installer_package-manifest.in,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mail_installer_package-manifest.in,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mail/installer/package-manifest.in.orig 2015-06-08 17:40:38.000000000 +0000 +--- mail/installer/package-manifest.in.orig 2016-04-07 21:14:23.000000000 +0000 +++ mail/installer/package-manifest.in -@@ -717,7 +717,7 @@ +@@ -804,7 +804,7 @@ #endif ; for Solaris SPARC diff --git a/mail/thunderbird/patches/patch-mail_installer_removed-files.in b/mail/thunderbird/patches/patch-mail_installer_removed-files.in index 4fbb1a66b35..94241f7985a 100644 --- a/mail/thunderbird/patches/patch-mail_installer_removed-files.in +++ b/mail/thunderbird/patches/patch-mail_installer_removed-files.in @@ -1,8 +1,8 @@ -$NetBSD: patch-mail_installer_removed-files.in,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mail_installer_removed-files.in,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mail/installer/removed-files.in.orig 2015-06-08 17:40:38.000000000 +0000 +--- mail/installer/removed-files.in.orig 2016-04-07 21:14:23.000000000 +0000 +++ mail/installer/removed-files.in -@@ -198,42 +198,6 @@ +@@ -196,42 +196,6 @@ @DIR_MACOS@greprefs/security-prefs.js @DIR_MACOS@greprefs/xpinstall.js @DIR_MACOS@greprefs/ @@ -43,5 +43,5 @@ $NetBSD: patch-mail_installer_removed-files.in,v 1.2 2015/07/09 15:17:34 ryoon E -@DIR_MACOS@hyphenation/hyph_tr.dic -@DIR_MACOS@hyphenation/hyph_uk.dic - #ifdef MOZ_WIDGET_GTK2 + #ifdef MOZ_WIDGET_GTK icons/mozicon128.png diff --git a/mail/thunderbird/patches/patch-ml b/mail/thunderbird/patches/patch-ml deleted file mode 100644 index f0f052c6593..00000000000 --- a/mail/thunderbird/patches/patch-ml +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ml,v 1.8 2015/07/09 15:17:34 ryoon Exp $ - -Treat DragonFly like FreeBSD. - ---- mozilla/js/src/Makefile.in.orig 2015-06-08 17:49:55.000000000 +0000 -+++ mozilla/js/src/Makefile.in -@@ -16,9 +16,6 @@ TOPLEVEL_BUILD := 1 - - run_for_side_effects := $(shell echo 'MAKE: $(MAKE)') - --DIST_INSTALL = 1 --NO_EXPAND_LIBS = 1 -- - ifdef JS_HAS_CTYPES - ifdef MOZ_NATIVE_FFI - LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS) diff --git a/mail/thunderbird/patches/patch-mozilla_accessible_atk_Platform.cpp b/mail/thunderbird/patches/patch-mozilla_accessible_atk_Platform.cpp deleted file mode 100644 index 13a4547b2b1..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_accessible_atk_Platform.cpp +++ /dev/null @@ -1,98 +0,0 @@ -$NetBSD: patch-mozilla_accessible_atk_Platform.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/accessible/atk/Platform.cpp.orig 2015-06-08 17:49:16.000000000 +0000 -+++ mozilla/accessible/atk/Platform.cpp -@@ -18,8 +18,9 @@ - #include <dbus/dbus.h> - #endif - #include <gtk/gtk.h> -+ - #if (MOZ_WIDGET_GTK == 3) --#include <atk-bridge.h> -+extern "C" __attribute__((weak,visibility("default"))) int atk_bridge_adaptor_init(int*, char **[]); - #endif - - using namespace mozilla; -@@ -46,7 +47,6 @@ static gulong sToplevel_hide_hook = 0; - - GType g_atk_hyperlink_impl_type = G_TYPE_INVALID; - --#if (MOZ_WIDGET_GTK == 2) - struct GnomeAccessibilityModule - { - const char *libName; -@@ -67,11 +67,13 @@ static GnomeAccessibilityModule sAtkBrid - "gnome_accessibility_module_shutdown", nullptr - }; - -+#if (MOZ_WIDGET_GTK == 2) - static GnomeAccessibilityModule sGail = { - "libgail.so", nullptr, - "gnome_accessibility_module_init", nullptr, - "gnome_accessibility_module_shutdown", nullptr - }; -+#endif - - static nsresult - LoadGtkModule(GnomeAccessibilityModule& aModule) -@@ -98,7 +100,11 @@ LoadGtkModule(GnomeAccessibilityModule& - else - subLen = loc2 - loc1; - nsAutoCString sub(Substring(libPath, loc1, subLen)); -+#if (MOZ_WIDGET_GTK == 2) - sub.AppendLiteral("/gtk-2.0/modules/"); -+#else -+ sub.AppendLiteral("/gtk-3.0/modules/"); -+#endif - sub.Append(aModule.libName); - aModule.lib = PR_LoadLibrary(sub.get()); - if (aModule.lib) -@@ -123,7 +129,6 @@ LoadGtkModule(GnomeAccessibilityModule& - } - return NS_OK; - } --#endif // (MOZ_WIDGET_GTK == 2) - - void - a11y::PlatformInit() -@@ -175,14 +180,17 @@ a11y::PlatformInit() - - // Init atk-bridge now - PR_SetEnv("NO_AT_BRIDGE=0"); --#if (MOZ_WIDGET_GTK == 2) -- rv = LoadGtkModule(sAtkBridge); -- if (NS_SUCCEEDED(rv)) { -- (*sAtkBridge.init)(); -- } --#else -- atk_bridge_adaptor_init(nullptr, nullptr); -+#if (MOZ_WIDGET_GTK == 3) -+ if (atk_bridge_adaptor_init) { -+ atk_bridge_adaptor_init(nullptr, nullptr); -+ } else - #endif -+ { -+ nsresult rv = LoadGtkModule(sAtkBridge); -+ if (NS_SUCCEEDED(rv)) { -+ (*sAtkBridge.init)(); -+ } -+ } - - if (!sToplevel_event_hook_added) { - sToplevel_event_hook_added = true; -@@ -210,7 +218,6 @@ a11y::PlatformShutdown() - sToplevel_hide_hook); - } - --#if (MOZ_WIDGET_GTK == 2) - if (sAtkBridge.lib) { - // Do not shutdown/unload atk-bridge, - // an exit function registered will take care of it -@@ -221,6 +228,7 @@ a11y::PlatformShutdown() - sAtkBridge.init = nullptr; - sAtkBridge.shutdown = nullptr; - } -+#if (MOZ_WIDGET_GTK == 2) - if (sGail.lib) { - // Do not shutdown gail because - // 1) Maybe it's not init-ed by us. e.g. GtkEmbed diff --git a/mail/thunderbird/patches/patch-mozilla_b2g_installer_Makefile.in b/mail/thunderbird/patches/patch-mozilla_b2g_installer_Makefile.in deleted file mode 100644 index f9785e7e7e1..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_b2g_installer_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mozilla_b2g_installer_Makefile.in,v 1.1 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/b2g/installer/Makefile.in.orig 2014-07-18 00:05:06.000000000 +0000 -+++ mozilla/b2g/installer/Makefile.in -@@ -61,6 +61,10 @@ ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS) - DEFINES += -DMOZ_RTSP - endif - -+ifdef MOZ_DEBUG -+DEFINES += -DMOZ_DEBUG=1 -+endif -+ - ifdef GKMEDIAS_SHARED_LIBRARY - DEFINES += -DGKMEDIAS_SHARED_LIBRARY - endif diff --git a/mail/thunderbird/patches/patch-mozilla_b2g_installer_package-manifest.in b/mail/thunderbird/patches/patch-mozilla_b2g_installer_package-manifest.in deleted file mode 100644 index 0e4b4b0d01a..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_b2g_installer_package-manifest.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_b2g_installer_package-manifest.in,v 1.2 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/b2g/installer/package-manifest.in.orig 2015-06-08 17:49:17.000000000 +0000 -+++ mozilla/b2g/installer/package-manifest.in -@@ -638,7 +638,7 @@ - @BINPATH@/components/EngineeringModeAPI.js - @BINPATH@/components/EngineeringModeService.js - --#ifdef MOZ_DEBUG -+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) - @BINPATH@/components/TestInterfaceJS.js - @BINPATH@/components/TestInterfaceJS.manifest - #endif diff --git a/mail/thunderbird/patches/patch-rc b/mail/thunderbird/patches/patch-mozilla_browser_branding_unofficial_locales_en-US_brand.dtd index d82cacc8acf..8180878b4ff 100644 --- a/mail/thunderbird/patches/patch-rc +++ b/mail/thunderbird/patches/patch-mozilla_browser_branding_unofficial_locales_en-US_brand.dtd @@ -1,16 +1,16 @@ -$NetBSD: patch-rc,v 1.7 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_browser_branding_unofficial_locales_en-US_brand.dtd,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig 2015-06-08 17:49:18.000000000 +0000 +--- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig 2016-04-07 21:33:15.000000000 +0000 +++ mozilla/browser/branding/unofficial/locales/en-US/brand.dtd @@ -2,8 +2,8 @@ - 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/. --> --<!ENTITY brandShorterName "Mozilla Developer Preview"> --<!ENTITY brandShortName "Mozilla Developer Preview"> --<!ENTITY brandFullName "Mozilla Developer Preview"> +-<!ENTITY brandShorterName "Nightly"> +-<!ENTITY brandShortName "Nightly"> +-<!ENTITY brandFullName "Nightly"> +<!ENTITY brandShorterName "Browser"> +<!ENTITY brandShortName "Browser"> +<!ENTITY brandFullName "Browser"> - <!ENTITY vendorShortName "mozilla.org"> + <!ENTITY vendorShortName "Mozilla"> <!ENTITY trademarkInfo.part1 " "> diff --git a/mail/thunderbird/patches/patch-mozilla_browser_installer_package-manifest.in b/mail/thunderbird/patches/patch-mozilla_browser_installer_package-manifest.in index d4aab71c4db..aa935d80fdc 100644 --- a/mail/thunderbird/patches/patch-mozilla_browser_installer_package-manifest.in +++ b/mail/thunderbird/patches/patch-mozilla_browser_installer_package-manifest.in @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_browser_installer_package-manifest.in,v 1.3 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_browser_installer_package-manifest.in,v 1.4 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/browser/installer/package-manifest.in.orig 2015-06-08 17:49:21.000000000 +0000 +--- mozilla/browser/installer/package-manifest.in.orig 2016-04-07 21:33:17.000000000 +0000 +++ mozilla/browser/installer/package-manifest.in -@@ -618,7 +618,7 @@ +@@ -606,7 +606,7 @@ @RESPATH@/components/MozKeyboard.js @RESPATH@/components/InputMethod.manifest @@ -10,8 +10,8 @@ $NetBSD: patch-mozilla_browser_installer_package-manifest.in,v 1.3 2015/07/09 15 +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) @RESPATH@/components/TestInterfaceJS.js @RESPATH@/components/TestInterfaceJS.manifest - #endif -@@ -800,7 +800,7 @@ + @RESPATH@/components/TestInterfaceJSMaplike.js +@@ -824,7 +824,7 @@ #endif ; for Solaris SPARC diff --git a/mail/thunderbird/patches/patch-mozilla_build_autoconf_compiler-opts.m4 b/mail/thunderbird/patches/patch-mozilla_build_autoconf_compiler-opts.m4 index 3719449e1e6..bdaeddc8643 100644 --- a/mail/thunderbird/patches/patch-mozilla_build_autoconf_compiler-opts.m4 +++ b/mail/thunderbird/patches/patch-mozilla_build_autoconf_compiler-opts.m4 @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_build_autoconf_compiler-opts.m4,v 1.1 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_build_autoconf_compiler-opts.m4,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/build/autoconf/compiler-opts.m4.orig 2014-07-18 00:05:10.000000000 +0000 +--- mozilla/build/autoconf/compiler-opts.m4.orig 2016-04-07 21:33:17.000000000 +0000 +++ mozilla/build/autoconf/compiler-opts.m4 @@ -53,14 +53,6 @@ case "$target" in if test -z "$CXX"; then diff --git a/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4 b/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4 index d6d8751e4df..7ad03bd470e 100644 --- a/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4 +++ b/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4 @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.4 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.5 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/build/autoconf/nss.m4.orig 2015-06-08 17:49:22.000000000 +0000 +--- mozilla/build/autoconf/nss.m4.orig 2016-04-07 21:33:17.000000000 +0000 +++ mozilla/build/autoconf/nss.m4 @@ -22,18 +22,18 @@ AC_ARG_WITH(nss-exec-prefix, if test -n "$nss_config_exec_prefix"; then diff --git a/mail/thunderbird/patches/patch-mozilla_build_gyp.mozbuild b/mail/thunderbird/patches/patch-mozilla_build_gyp.mozbuild index 3ba9f681e1c..1f7a9e5ad69 100644 --- a/mail/thunderbird/patches/patch-mozilla_build_gyp.mozbuild +++ b/mail/thunderbird/patches/patch-mozilla_build_gyp.mozbuild @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_build_gyp.mozbuild,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_build_gyp.mozbuild,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/build/gyp.mozbuild.orig 2015-06-08 17:49:22.000000000 +0000 +--- mozilla/build/gyp.mozbuild.orig 2016-04-07 21:33:17.000000000 +0000 +++ mozilla/build/gyp.mozbuild -@@ -12,6 +12,7 @@ gyp_vars = { +@@ -14,6 +14,7 @@ gyp_vars = { 'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0, 'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0, 'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0, @@ -10,7 +10,7 @@ $NetBSD: patch-mozilla_build_gyp.mozbuild,v 1.2 2015/07/09 15:17:34 ryoon Exp $ # basic stuff for everything 'include_internal_video_render': 0, 'clang_use_chrome_plugins': 0, -@@ -87,7 +88,7 @@ flavors = { +@@ -96,7 +97,7 @@ flavors = { 'WINNT': 'win', 'Android': 'linux' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' else 'android', 'Linux': 'linux', @@ -19,7 +19,7 @@ $NetBSD: patch-mozilla_build_gyp.mozbuild,v 1.2 2015/07/09 15:17:34 ryoon Exp $ 'SunOS': 'solaris', 'GNU/kFreeBSD': 'freebsd', 'DragonFly': 'dragonfly', -@@ -122,5 +123,11 @@ if CONFIG['INTEL_ARCHITECTURE']: +@@ -131,5 +132,11 @@ if CONFIG['INTEL_ARCHITECTURE']: if not CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3'] or not CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSE4_1']: gyp_vars['yuv_disable_asm'] = 1 diff --git a/mail/thunderbird/patches/patch-mozilla_build_pgo_profileserver.py b/mail/thunderbird/patches/patch-mozilla_build_pgo_profileserver.py index 41ad7d95f44..8537315f2fe 100644 --- a/mail/thunderbird/patches/patch-mozilla_build_pgo_profileserver.py +++ b/mail/thunderbird/patches/patch-mozilla_build_pgo_profileserver.py @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_build_pgo_profileserver.py,v 1.1 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_build_pgo_profileserver.py,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/build/pgo/profileserver.py.orig 2013-10-23 22:08:50.000000000 +0000 +--- mozilla/build/pgo/profileserver.py.orig 2016-04-07 21:33:18.000000000 +0000 +++ mozilla/build/pgo/profileserver.py -@@ -59,7 +59,7 @@ if __name__ == '__main__': +@@ -68,7 +68,7 @@ if __name__ == '__main__': env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog) print "jarlog: %s" % env["MOZ_JAR_LOG_FILE"] diff --git a/mail/thunderbird/patches/patch-mozilla_config_Makefile.in b/mail/thunderbird/patches/patch-mozilla_config_Makefile.in index 8fdbde89569..03f4a9293c1 100644 --- a/mail/thunderbird/patches/patch-mozilla_config_Makefile.in +++ b/mail/thunderbird/patches/patch-mozilla_config_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_config_Makefile.in,v 1.3 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_config_Makefile.in,v 1.4 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/config/Makefile.in.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/config/Makefile.in.orig 2016-04-07 21:33:18.000000000 +0000 +++ mozilla/config/Makefile.in -@@ -77,6 +77,16 @@ export:: $(export-preqs) +@@ -73,6 +73,16 @@ export:: $(export-preqs) -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \ -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ diff --git a/mail/thunderbird/patches/patch-mozilla_config_baseconfig.mk b/mail/thunderbird/patches/patch-mozilla_config_baseconfig.mk index 4a54d4cd335..b86d396350b 100644 --- a/mail/thunderbird/patches/patch-mozilla_config_baseconfig.mk +++ b/mail/thunderbird/patches/patch-mozilla_config_baseconfig.mk @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_config_baseconfig.mk,v 1.4 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_config_baseconfig.mk,v 1.5 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/config/baseconfig.mk.orig 2014-07-18 00:05:10.000000000 +0000 +--- mozilla/config/baseconfig.mk.orig 2016-04-07 21:33:18.000000000 +0000 +++ mozilla/config/baseconfig.mk @@ -2,10 +2,10 @@ # directly in python/mozbuild/mozbuild/base.py for gmake validation. @@ -14,6 +14,6 @@ $NetBSD: patch-mozilla_config_baseconfig.mk,v 1.4 2014/07/27 20:04:59 ryoon Exp +idldir = $(datadir)/idl/${MOZILLA_PKG_NAME} +installdir = $(libdir)/${MOZILLA_PKG_NAME} +sdkdir = $(libdir)/${MOZILLA_PKG_NAME} - ifndef TOP_DIST - TOP_DIST = dist - endif + ifeq (.,$(DEPTH)) + DIST = dist + else diff --git a/mail/thunderbird/patches/patch-mozilla_config_external_moz.build b/mail/thunderbird/patches/patch-mozilla_config_external_moz.build index 957b74db1c7..60d95e54aeb 100644 --- a/mail/thunderbird/patches/patch-mozilla_config_external_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_config_external_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_config_external_moz.build,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_config_external_moz.build,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/config/external/moz.build.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/config/external/moz.build.orig 2016-04-07 21:33:18.000000000 +0000 +++ mozilla/config/external/moz.build -@@ -19,10 +19,19 @@ if CONFIG['MOZ_UPDATER']: +@@ -20,10 +20,19 @@ if CONFIG['MOZ_UPDATER']: # There's no "native brotli" yet, but probably in the future... external_dirs += ['modules/brotli'] @@ -24,25 +24,13 @@ $NetBSD: patch-mozilla_config_external_moz.build,v 1.2 2015/07/09 15:17:34 ryoon external_dirs += ['media/libtremor'] if CONFIG['MOZ_WEBM']: -@@ -37,15 +46,16 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ - if not CONFIG['MOZ_NATIVE_PNG']: - external_dirs += ['media/libpng'] - -+if not CONFIG['MOZ_NATIVE_SPEEX']: -+ external_dirs += ['media/libspeex_resampler'] -+ -+if not CONFIG['MOZ_NATIVE_SOUNDTOUCH']: -+ external_dirs += ['media/libsoundtouch'] -+ +@@ -50,9 +59,6 @@ if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']: external_dirs += [ 'media/kiss_fft', 'media/libcubeb', - 'media/libogg', - 'media/libopus', - 'media/libtheora', -- 'media/libspeex_resampler', + 'media/libspeex_resampler', 'media/libstagefright', -- 'media/libsoundtouch', - ] - - DIRS += ['../../' + i for i in external_dirs] + 'media/libsoundtouch', diff --git a/mail/thunderbird/patches/patch-mk b/mail/thunderbird/patches/patch-mozilla_config_rules.mk index 381831a8470..949006985a8 100644 --- a/mail/thunderbird/patches/patch-mk +++ b/mail/thunderbird/patches/patch-mozilla_config_rules.mk @@ -1,10 +1,8 @@ -$NetBSD: patch-mk,v 1.11 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_config_rules.mk,v 1.1 2016/04/17 18:33:50 ryoon Exp $ -Treat DragonFly like FreeBSD. - ---- mozilla/config/rules.mk.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/config/rules.mk.orig 2016-04-07 21:33:18.000000000 +0000 +++ mozilla/config/rules.mk -@@ -761,6 +761,7 @@ endif +@@ -773,6 +773,7 @@ endif ifdef DTRACE_PROBE_OBJ EXTRA_DEPS += $(DTRACE_PROBE_OBJ) OBJS += $(DTRACE_PROBE_OBJ) diff --git a/mail/thunderbird/patches/patch-mozilla_config_stl__wrappers_ios b/mail/thunderbird/patches/patch-mozilla_config_stl__wrappers_ios index 0f17351b177..24a10489a12 100644 --- a/mail/thunderbird/patches/patch-mozilla_config_stl__wrappers_ios +++ b/mail/thunderbird/patches/patch-mozilla_config_stl__wrappers_ios @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_config_stl__wrappers_ios,v 1.1 2013/05/14 12:41:02 joerg Exp $ +$NetBSD: patch-mozilla_config_stl__wrappers_ios,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/config/stl_wrappers/ios.orig 2013-05-13 18:23:07.000000000 +0000 +--- mozilla/config/stl_wrappers/ios.orig 2016-04-17 13:47:46.239830507 +0000 +++ mozilla/config/stl_wrappers/ios @@ -0,0 +1,3 @@ +#pragma GCC visibility push(default) diff --git a/mail/thunderbird/patches/patch-mozilla_config_stl__wrappers_ostream b/mail/thunderbird/patches/patch-mozilla_config_stl__wrappers_ostream index c169e0bb38e..6a1c65312bf 100644 --- a/mail/thunderbird/patches/patch-mozilla_config_stl__wrappers_ostream +++ b/mail/thunderbird/patches/patch-mozilla_config_stl__wrappers_ostream @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_config_stl__wrappers_ostream,v 1.1 2013/05/14 12:41:02 joerg Exp $ +$NetBSD: patch-mozilla_config_stl__wrappers_ostream,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/config/stl_wrappers/ostream.orig 2013-05-13 18:22:40.000000000 +0000 +--- mozilla/config/stl_wrappers/ostream.orig 2016-04-17 13:47:46.239960852 +0000 +++ mozilla/config/stl_wrappers/ostream @@ -0,0 +1,3 @@ +#pragma GCC visibility push(default) diff --git a/mail/thunderbird/patches/patch-mozilla_config_system-headers b/mail/thunderbird/patches/patch-mozilla_config_system-headers index 484dd81d466..bf92ca482d6 100644 --- a/mail/thunderbird/patches/patch-mozilla_config_system-headers +++ b/mail/thunderbird/patches/patch-mozilla_config_system-headers @@ -1,24 +1,16 @@ -$NetBSD: patch-mozilla_config_system-headers,v 1.9 2016/01/31 23:43:48 joerg Exp $ +$NetBSD: patch-mozilla_config_system-headers,v 1.10 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/config/system-headers.orig 2015-12-21 22:32:58.000000000 +0000 +--- mozilla/config/system-headers.orig 2016-04-07 21:33:18.000000000 +0000 +++ mozilla/config/system-headers -@@ -189,7 +189,6 @@ asm/signal.h - ASRegistry.h - assert.h - atk/atk.h --atk-bridge.h - atlcom.h - atlconv.h - atlctl.cpp -@@ -638,6 +637,7 @@ libgnomevfs/gnome-vfs-mime-handlers.h - libgnomevfs/gnome-vfs-mime-utils.h - libgnomevfs/gnome-vfs-ops.h - libgnomevfs/gnome-vfs-standard-callbacks.h +@@ -628,6 +628,7 @@ libgnome/libgnome.h + libgnomeui/gnome-icon-lookup.h + libgnomeui/gnome-icon-theme.h + libgnomeui/gnome-ui-init.h +libv4l2.h lib$routines.h limits limits.h -@@ -732,6 +732,7 @@ mapiutil.h +@@ -722,6 +723,7 @@ mapiutil.h mapix.h Math64.h math.h @@ -26,37 +18,39 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.9 2016/01/31 23:43:48 joerg Exp mbstring.h #ifdef ANDROID media/AudioEffect.h -@@ -1268,7 +1269,6 @@ X11/Xlocale.h - X11/Xos.h - X11/Xutil.h - zmouse.h --soundtouch/SoundTouch.h - #if MOZ_NATIVE_PNG==1 - png.h +@@ -1314,6 +1316,25 @@ vpx/vp8cx.h + vpx/vp8dx.h + vpx_mem/vpx_mem.h #endif -@@ -1330,10 +1330,13 @@ vorbis/codec.h - theora/theoradec.h - tremor/ivorbiscodec.h - speex/speex_resampler.h ++#ifdef GKMEDIAS_SHARED_LIBRARY ++vpx/vpx_codec.h ++vpx/vpx_decoder.h ++vpx/vpx_encoder.h ++vpx/vp8cx.h ++vpx/vp8dx.h ++vpx_mem/vpx_mem.h ++vorbis/codec.h ++theora/theoradec.h ++tremor/ivorbiscodec.h ++speex/speex_resampler.h +soundtouch/SoundTouch.h - ogg/ogg.h - ogg/os_types.h - nestegg/nestegg.h - cubeb/cubeb.h ++ogg/ogg.h ++ogg/os_types.h ++nestegg/nestegg.h ++cubeb/cubeb.h +speex/speex_resampler.h +soundtouch/SoundTouch.h - #endif ++#endif gst/gst.h gst/app/gstappsink.h -@@ -1362,3 +1365,45 @@ unicode/utypes.h + gst/app/gstappsrc.h +@@ -1344,3 +1365,43 @@ unicode/utypes.h #endif libutil.h unwind.h +#if MOZ_NATIVE_GRAPHITE2==1 +graphite2/Font.h -+graphite2/Log.h +graphite2/Segment.h -+graphite2/Types.h +#endif +#if MOZ_NATIVE_HARFBUZZ==1 +harfbuzz/hb-ot.h diff --git a/mail/thunderbird/patches/patch-mozilla_config_system__wrappers_unwind.h b/mail/thunderbird/patches/patch-mozilla_config_system__wrappers_unwind.h new file mode 100644 index 00000000000..dc734617dc7 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_config_system__wrappers_unwind.h @@ -0,0 +1,9 @@ +$NetBSD: patch-mozilla_config_system__wrappers_unwind.h,v 1.3 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/config/system_wrappers/unwind.h.orig 2016-04-17 13:47:46.241139741 +0000 ++++ mozilla/config/system_wrappers/unwind.h +@@ -0,0 +1,4 @@ ++#pragma GCC system_header ++#pragma GCC visibility push(default) ++#include_next <unwind.h> ++#pragma GCC visibility pop diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-mozilla_configure.in index 31d2befbe47..bb23a160db0 100644 --- a/mail/thunderbird/patches/patch-aa +++ b/mail/thunderbird/patches/patch-mozilla_configure.in @@ -1,40 +1,25 @@ -$NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_configure.in,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/configure.in.orig 2015-06-08 17:49:55.000000000 +0000 +--- mozilla/configure.in.orig 2016-04-07 21:33:18.000000000 +0000 +++ mozilla/configure.in -@@ -1794,7 +1794,13 @@ Linux) - MOZ_ENABLE_PROFILER_SPS= - esac - ;; --WINNT|Darwin) ;; -+WINNT|Darwin) -+ case "${CPU_ARCH}" in -+ x86 | x86_64) ;; -+ *) -+ MOZ_ENABLE_PROFILER_SPS= -+ esac -+ ;; - *) - MOZ_ENABLE_PROFILER_SPS= - ;; -@@ -1898,7 +1904,7 @@ case "$host" in - ;; +@@ -1746,7 +1746,7 @@ fi + dnl ======================================================== + dnl SPS Profiler + dnl ======================================================== +-MOZ_ENABLE_PROFILER_SPS=1 ++MOZ_ENABLE_PROFILER_SPS= - *-darwin*) -- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11" -+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" - HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' - HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" - ;; -@@ -2022,7 +2028,6 @@ case "$target" in - AC_DEFINE(XP_DARWIN) + case "${OS_TARGET}" in + Android) +@@ -1996,7 +1996,6 @@ case "$target" in _PLATFORM_DEFAULT_TOOLKIT='cairo-uikit' + direct_nspr_config=1 else - AC_DEFINE(XP_MACOSX) AC_DEFINE(XP_DARWIN) _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa' # The ExceptionHandling framework is needed for Objective-C exception -@@ -2641,8 +2646,7 @@ MOZ_CXX11 +@@ -2580,8 +2579,7 @@ MOZ_CXX11 AC_LANG_C @@ -44,7 +29,7 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -@@ -3663,6 +3667,14 @@ if test -n "$YASM"; then +@@ -3476,6 +3474,14 @@ if test -n "$YASM"; then _YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'` fi @@ -59,7 +44,7 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ if test -z "$SKIP_LIBRARY_CHECKS"; then dnl system JPEG support dnl ======================================================== -@@ -3690,11 +3702,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then +@@ -3503,11 +3509,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then #include <jpeglib.h> ], [ #if JPEG_LIB_VERSION < $MOZJPEG #error "Insufficient JPEG library version ($MOZJPEG required)." @@ -72,7 +57,7 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ MOZ_NATIVE_JPEG=1, AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) fi -@@ -4392,6 +4400,10 @@ cairo-gonk) +@@ -4260,6 +4262,10 @@ cairo-gonk) esac @@ -83,16 +68,7 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ AC_SUBST(MOZ_PDF_PRINTING) if test "$MOZ_PDF_PRINTING"; then PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" -@@ -4408,7 +4420,7 @@ fi - - if test "$COMPILE_ENVIRONMENT"; then - if test "$MOZ_ENABLE_GTK3"; then -- PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 atk-bridge-2.0 $GDK_PACKAGES) -+ PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES) - MOZ_GTK3_CFLAGS="-I${_topsrcdir}/widget/gtk/compat-gtk3 $MOZ_GTK3_CFLAGS" - dnl Contrary to MOZ_GTK2_LIBS, MOZ_GTK3_LIBS needs to be literally added to TK_LIBS instead - dnl of a make reference because of how TK_LIBS is mangled in toolkit/library/moz.build -@@ -5149,6 +5161,9 @@ if test -n "$MOZ_WEBRTC"; then +@@ -5018,6 +5024,9 @@ if test -n "$MOZ_WEBRTC"; then MOZ_VPX=1 MOZ_VPX_ERROR_CONCEALMENT=1 @@ -102,7 +78,7 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ dnl enable once Signaling lands MOZ_WEBRTC_SIGNALING=1 AC_DEFINE(MOZ_WEBRTC_SIGNALING) -@@ -5252,6 +5267,157 @@ if test "${ac_cv_c_attribute_aligned}" ! +@@ -5161,6 +5170,142 @@ if test "${ac_cv_c_attribute_aligned}" ! fi dnl ======================================================== @@ -206,21 +182,6 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ +AC_SUBST(MOZ_NATIVE_THEORA) + +dnl ======================================================== -+dnl Check for libspeex resampler -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-speex, -+[ --with-system-speex Use system libspeex (located with pkgconfig)], -+MOZ_NATIVE_SPEEX=1, -+MOZ_NATIVE_SPEEX=) -+ -+if test -n "$MOZ_NATIVE_SPEEX"; then -+ PKG_CHECK_MODULES(MOZ_SPEEX, speexdsp >= 1.2) -+fi -+ -+AC_SUBST(MOZ_NATIVE_SPEEX) -+ -+dnl ======================================================== +dnl Check for libsoundtouch +dnl ======================================================== + @@ -260,7 +221,7 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ dnl = Disable VP8 decoder support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(webm, -@@ -5606,6 +5772,67 @@ fi +@@ -5563,6 +5708,67 @@ fi AC_SUBST(MOZ_WEBM_ENCODER) dnl ================================== @@ -269,7 +230,7 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ + +dnl If using Linux, Solaris or BSDs, ensure that OSS is available +case "$OS_TARGET" in -+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD) ++Linux|SunOS|DragonFly|FreeBSD|GNU/kFreeBSD) + MOZ_OSS=1 + ;; +esac @@ -292,7 +253,7 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ + dnl Prefer 4Front implementation + AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) + if test "$OSSPREFIX" != "yes"; then -+ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf ++ oss_conf=${OSSPREFIX}/etc/oss.conf + if test -f "$oss_conf"; then + . "$oss_conf" + else @@ -328,7 +289,7 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ dnl = Check alsa availability on Linux dnl ================================== -@@ -5619,12 +5846,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, +@@ -5576,12 +5782,23 @@ MOZ_ARG_ENABLE_BOOL(alsa, MOZ_ALSA=1, MOZ_ALSA=) @@ -352,18 +313,7 @@ $NetBSD: patch-aa,v 1.20 2015/07/09 15:17:34 ryoon Exp $ AC_SUBST(MOZ_ALSA) dnl ======================================================== -@@ -6046,7 +6284,9 @@ MOZ_ARG_DISABLE_BOOL(gamepad, - if test "$MOZ_GAMEPAD"; then - case "$OS_TARGET" in - Darwin) -- MOZ_GAMEPAD_BACKEND=cocoa -+ if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then -+ MOZ_GAMEPAD_BACKEND=cocoa -+ fi - ;; - WINNT) - MOZ_GAMEPAD_BACKEND=windows -@@ -8066,6 +8306,49 @@ if test "$USE_FC_FREETYPE"; then +@@ -8139,6 +8356,49 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== diff --git a/mail/thunderbird/patches/patch-mozilla_dom_base_DOMRequest.cpp b/mail/thunderbird/patches/patch-mozilla_dom_base_DOMRequest.cpp new file mode 100644 index 00000000000..ff05b994fd1 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_dom_base_DOMRequest.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-mozilla_dom_base_DOMRequest.cpp,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/dom/base/DOMRequest.cpp.orig 2016-04-07 21:33:22.000000000 +0000 ++++ mozilla/dom/base/DOMRequest.cpp +@@ -20,7 +20,6 @@ using mozilla::dom::DOMError; + using mozilla::dom::DOMRequest; + using mozilla::dom::DOMRequestService; + using mozilla::dom::DOMCursor; +-using mozilla::dom::Promise; + using mozilla::dom::AutoJSAPI; + + DOMRequest::DOMRequest(nsPIDOMWindow* aWindow) diff --git a/mail/thunderbird/patches/patch-mozilla_dom_base_moz.build b/mail/thunderbird/patches/patch-mozilla_dom_base_moz.build index 990e088950f..7140c46a05f 100644 --- a/mail/thunderbird/patches/patch-mozilla_dom_base_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_dom_base_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_dom_base_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_dom_base_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/dom/base/moz.build.orig 2015-06-08 17:49:24.000000000 +0000 +--- mozilla/dom/base/moz.build.orig 2016-04-07 21:33:22.000000000 +0000 +++ mozilla/dom/base/moz.build -@@ -368,6 +368,9 @@ if CONFIG['INTEL_ARCHITECTURE']: +@@ -393,6 +393,9 @@ if CONFIG['INTEL_ARCHITECTURE']: SOURCES += ['nsTextFragmentSSE2.cpp'] SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] diff --git a/mail/thunderbird/patches/patch-mozilla_dom_events_MessageEvent.h b/mail/thunderbird/patches/patch-mozilla_dom_events_MessageEvent.h deleted file mode 100644 index d122fe9e4b8..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_dom_events_MessageEvent.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mozilla_dom_events_MessageEvent.h,v 1.1 2015/11/20 14:48:20 joerg Exp $ - ---- mozilla/dom/events/MessageEvent.h.orig 2015-11-08 13:37:35.000000000 +0000 -+++ mozilla/dom/events/MessageEvent.h -@@ -15,9 +15,6 @@ namespace mozilla { - namespace dom { - - struct MessageEventInit; --class MessagePort; --class MessagePortBase; --class MessagePortList; - class OwningWindowProxyOrMessagePort; - - /** diff --git a/mail/thunderbird/patches/patch-mozilla_dom_media_AudioStream.h b/mail/thunderbird/patches/patch-mozilla_dom_media_AudioStream.h deleted file mode 100644 index 213d1b80ae6..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_dom_media_AudioStream.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_dom_media_AudioStream.h,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/dom/media/AudioStream.h.orig 2015-06-08 17:49:28.000000000 +0000 -+++ mozilla/dom/media/AudioStream.h -@@ -17,7 +17,7 @@ - #include "CubebUtils.h" - - namespace soundtouch { --class SoundTouch; -+class MOZ_IMPORT_API SoundTouch; - } - - namespace mozilla { diff --git a/mail/thunderbird/patches/patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp b/mail/thunderbird/patches/patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp index 2f1d7d19634..8d9c8554581 100644 --- a/mail/thunderbird/patches/patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp +++ b/mail/thunderbird/patches/patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/dom/media/gstreamer/GStreamerAllocator.cpp.orig 2015-06-08 17:49:28.000000000 +0000 +--- mozilla/dom/media/gstreamer/GStreamerAllocator.cpp.orig 2016-04-07 21:33:27.000000000 +0000 +++ mozilla/dom/media/gstreamer/GStreamerAllocator.cpp @@ -51,7 +51,6 @@ typedef struct #pragma GCC diagnostic ignored "-Wunused-function" diff --git a/mail/thunderbird/patches/patch-mozilla_dom_media_moz.build b/mail/thunderbird/patches/patch-mozilla_dom_media_moz.build index b892370bf92..f34064245c2 100644 --- a/mail/thunderbird/patches/patch-mozilla_dom_media_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_dom_media_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_dom_media_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_dom_media_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/dom/media/moz.build.orig 2015-06-08 17:49:28.000000000 +0000 +--- mozilla/dom/media/moz.build.orig 2016-04-07 21:33:27.000000000 +0000 +++ mozilla/dom/media/moz.build -@@ -280,6 +280,27 @@ if CONFIG['ANDROID_VERSION'] > '15': +@@ -319,6 +319,27 @@ if CONFIG['MOZ_GONK_MEDIACODEC']: CFLAGS += CONFIG['GSTREAMER_CFLAGS'] CXXFLAGS += CONFIG['GSTREAMER_CFLAGS'] diff --git a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp index e284ac8ae1b..f6593f953d0 100644 --- a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp +++ b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.6 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.7 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2015-06-08 17:49:29.000000000 +0000 +--- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2016-04-07 21:33:30.000000000 +0000 +++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp -@@ -325,7 +325,7 @@ PluginModuleChild::InitForChrome(const s +@@ -308,7 +308,7 @@ PluginModuleChild::InitForChrome(const s // TODO: use PluginPRLibrary here @@ -11,7 +11,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.6 2015/07/09 15 mShutdownFunc = (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown"); -@@ -1887,7 +1887,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin +@@ -1916,7 +1916,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin AssertPluginThread(); MOZ_ASSERT(mIsChrome); @@ -20,7 +20,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.6 2015/07/09 15 return true; #elif defined(OS_WIN) || defined(OS_MACOSX) *_retval = mGetEntryPointsFunc(&mFunctions); -@@ -1932,7 +1932,7 @@ PluginModuleChild::DoNP_Initialize(const +@@ -1961,7 +1961,7 @@ PluginModuleChild::DoNP_Initialize(const #endif NPError result; diff --git a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h index b29255fdad4..5c1b26ddbcb 100644 --- a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h +++ b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.h,v 1.4 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.h,v 1.5 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig 2013-10-23 22:08:54.000000000 +0000 +--- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig 2016-04-07 21:33:30.000000000 +0000 +++ mozilla/dom/plugins/ipc/PluginModuleChild.h -@@ -328,7 +328,7 @@ private: +@@ -281,7 +281,7 @@ private: // we get this from the plugin NP_PLUGINSHUTDOWN mShutdownFunc; diff --git a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp index c0b0272f64a..0400f742825 100644 --- a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp +++ b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/dom/plugins/ipc/PluginProcessChild.cpp.orig 2015-06-08 17:49:29.000000000 +0000 +--- mozilla/dom/plugins/ipc/PluginProcessChild.cpp.orig 2016-04-07 21:33:30.000000000 +0000 +++ mozilla/dom/plugins/ipc/PluginProcessChild.cpp -@@ -56,7 +56,7 @@ PluginProcessChild::Init() +@@ -46,7 +46,7 @@ PluginProcessChild::Init() { nsDebugImpl::SetMultiprocessMode("NPAPI"); diff --git a/mail/thunderbird/patches/patch-mozilla_dom_system_OSFileConstants.cpp b/mail/thunderbird/patches/patch-mozilla_dom_system_OSFileConstants.cpp index 7471660d491..bd6d124d99a 100644 --- a/mail/thunderbird/patches/patch-mozilla_dom_system_OSFileConstants.cpp +++ b/mail/thunderbird/patches/patch-mozilla_dom_system_OSFileConstants.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/dom/system/OSFileConstants.cpp.orig 2015-06-08 17:49:30.000000000 +0000 +--- mozilla/dom/system/OSFileConstants.cpp.orig 2016-04-07 21:33:31.000000000 +0000 +++ mozilla/dom/system/OSFileConstants.cpp -@@ -9,6 +9,10 @@ +@@ -11,6 +11,10 @@ #include "prsystem.h" @@ -13,7 +13,7 @@ $NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.2 2015/07/09 15:17:34 #if defined(XP_UNIX) #include "unistd.h" #include "dirent.h" -@@ -18,7 +22,9 @@ +@@ -20,7 +24,9 @@ #define statvfs statfs #else #include "sys/statvfs.h" @@ -23,7 +23,7 @@ $NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.2 2015/07/09 15:17:34 #endif // defined(ANDROID) #endif // defined(XP_UNIX) -@@ -26,9 +32,9 @@ +@@ -28,9 +34,9 @@ #include <linux/fadvise.h> #endif // defined(XP_LINUX) @@ -35,25 +35,12 @@ $NetBSD: patch-mozilla_dom_system_OSFileConstants.cpp,v 1.2 2015/07/09 15:17:34 #if defined(XP_WIN) #include <windows.h> -@@ -588,10 +594,10 @@ static const dom::ConstantSpec gLibcProp +@@ -590,7 +596,7 @@ static const dom::ConstantSpec gLibcProp // The size of |fsblkcnt_t|. - { "OSFILE_SIZEOF_FSBLKCNT_T", INT_TO_JSVAL(sizeof (fsblkcnt_t)) }, + { "OSFILE_SIZEOF_FSBLKCNT_T", JS::Int32Value(sizeof (fsblkcnt_t)) }, -#if !defined(ANDROID) +#if !defined(ANDROID) && !(defined(__NetBSD__) && (__NetBSD_Version__ < 600000000)) // The size of |posix_spawn_file_actions_t|. - { "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", INT_TO_JSVAL(sizeof (posix_spawn_file_actions_t)) }, --#endif // !defined(ANDROID) -+#endif // !defined(ANDROID) && NetBSD 5.* - - // Defining |dirent|. - // Size -@@ -660,7 +666,7 @@ static const dom::ConstantSpec gLibcProp - - { "OSFILE_SIZEOF_STATVFS", INT_TO_JSVAL(sizeof (struct statvfs)) }, - -- { "OSFILE_OFFSETOF_STATVFS_F_BSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_bsize)) }, -+ { "OSFILE_OFFSETOF_STATVFS_F_FRSIZE", INT_TO_JSVAL(offsetof (struct statvfs, f_frsize)) }, - { "OSFILE_OFFSETOF_STATVFS_F_BAVAIL", INT_TO_JSVAL(offsetof (struct statvfs, f_bavail)) }, - - #endif // defined(XP_UNIX) + { "OSFILE_SIZEOF_POSIX_SPAWN_FILE_ACTIONS_T", JS::Int32Value(sizeof (posix_spawn_file_actions_t)) }, + #endif // !defined(ANDROID) diff --git a/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp b/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp index 13d6ae7d2ee..3fedddfced1 100644 --- a/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp +++ b/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2015-06-08 17:49:33.000000000 +0000 -+++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo +--- mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig 2016-04-07 21:33:34.000000000 +0000 ++++ mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp +@@ -358,6 +358,14 @@ mozHunspell::LoadDictionaryList(bool aNo } } diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_cairo_libpixman_src_pixman-arm-neon-asm.S b/mail/thunderbird/patches/patch-mozilla_gfx_cairo_libpixman_src_pixman-arm-neon-asm.S new file mode 100644 index 00000000000..68e08b4ab1b --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_gfx_cairo_libpixman_src_pixman-arm-neon-asm.S @@ -0,0 +1,37 @@ +$NetBSD: patch-mozilla_gfx_cairo_libpixman_src_pixman-arm-neon-asm.S,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/gfx/cairo/libpixman/src/pixman-arm-neon-asm.S.orig 2016-04-07 21:33:13.000000000 +0000 ++++ mozilla/gfx/cairo/libpixman/src/pixman-arm-neon-asm.S +@@ -34,6 +34,12 @@ + * - pixman_composite_over_n_8_0565_asm_neon + */ + ++#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__) ++#define UNWIND ++#else ++#define UNWIND @ ++#endif ++ + /* Prevent the stack from becoming executable for no reason... */ + #if defined(__linux__) && defined(__ELF__) + .section .note.GNU-stack,"",%progbits +@@ -3141,7 +3147,8 @@ pixman_asm_function fname + TMP4 .req r9 + STRIDE .req r2 + +- .fnstart ++ .cfi_startproc ++ UNWIND .fnstart + mov ip, sp + .save {r4, r5, r6, r7, r8, r9} + push {r4, r5, r6, r7, r8, r9} +@@ -3244,7 +3251,8 @@ pixman_asm_function fname + .endif + pop {r4, r5, r6, r7, r8, r9} + bx lr +- .fnend ++ UNWIND .fnend ++ .cfi_endproc + + .unreq OUT + .unreq TOP diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_gl_GLContextProviderGLX.cpp b/mail/thunderbird/patches/patch-mozilla_gfx_gl_GLContextProviderGLX.cpp new file mode 100644 index 00000000000..7aa1f243c3b --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_gfx_gl_GLContextProviderGLX.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_gfx_gl_GLContextProviderGLX.cpp,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/gfx/gl/GLContextProviderGLX.cpp.orig 2016-04-07 21:33:13.000000000 +0000 ++++ mozilla/gfx/gl/GLContextProviderGLX.cpp +@@ -84,7 +84,7 @@ GLXLibrary::EnsureInitialized() + // see e.g. bug 608526: it is intrinsically interesting to know whether we have dynamically linked to libGL.so.1 + // because at least the NVIDIA implementation requires an executable stack, which causes mprotect calls, + // which trigger glibc bug http://sourceware.org/bugzilla/show_bug.cgi?id=12225 +-#ifdef __OpenBSD__ ++#if defined(__OpenBSD__) || defined(__NetBSD__) + libGLfilename = "libGL.so"; + #else + libGLfilename = "libGL.so.1"; diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_Bidi.cpp b/mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_Bidi.cpp index 55372872e97..a9059907340 100644 --- a/mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_Bidi.cpp +++ b/mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_Bidi.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_gfx_graphite2_src_Bidi.cpp,v 1.1 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_gfx_graphite2_src_Bidi.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/gfx/graphite2/src/Bidi.cpp.orig 2013-10-23 22:08:57.000000000 +0000 +--- mozilla/gfx/graphite2/src/Bidi.cpp.orig 2016-04-07 21:33:13.000000000 +0000 +++ mozilla/gfx/graphite2/src/Bidi.cpp -@@ -30,6 +30,11 @@ of the License or (at your option) any l +@@ -31,6 +31,11 @@ of the License or (at your option) any l using namespace graphite2; diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_moz.build b/mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_moz.build deleted file mode 100644 index 855c7fc7a40..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_moz.build +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mozilla_gfx_graphite2_src_moz.build,v 1.1 2016/01/31 23:43:48 joerg Exp $ - ---- mozilla/gfx/graphite2/src/moz.build.orig 2016-01-31 20:58:00.012715770 +0000 -+++ mozilla/gfx/graphite2/src/moz.build -@@ -60,10 +60,6 @@ MSVC_ENABLE_PGO = True - if CONFIG['GKMEDIAS_SHARED_LIBRARY']: - NO_VISIBILITY_FLAGS = True - DEFINES['GRAPHITE2_EXPORTING'] = True --else: -- # tell graphite2 not to export symbols, we'll be linking it directly with -- # thebes -- DEFINES['GRAPHITE2_STATIC'] = True - - FINAL_LIBRARY = 'gkmedias' - diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_moz.build b/mail/thunderbird/patches/patch-mozilla_gfx_moz.build index 5a9c35fdd23..3ab06c0214f 100644 --- a/mail/thunderbird/patches/patch-mozilla_gfx_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_gfx_moz.build @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_gfx_moz.build,v 1.1 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_gfx_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/gfx/moz.build.orig 2014-07-18 00:05:20.000000000 +0000 +--- mozilla/gfx/moz.build.orig 2016-04-07 21:33:14.000000000 +0000 +++ mozilla/gfx/moz.build @@ -7,6 +7,12 @@ if CONFIG['MOZ_TREE_CAIRO']: diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_skia_generate__mozbuild.py b/mail/thunderbird/patches/patch-mozilla_gfx_skia_generate__mozbuild.py index af8f434c61a..849c51bcd78 100644 --- a/mail/thunderbird/patches/patch-mozilla_gfx_skia_generate__mozbuild.py +++ b/mail/thunderbird/patches/patch-mozilla_gfx_skia_generate__mozbuild.py @@ -1,14 +1,17 @@ -$NetBSD: patch-mozilla_gfx_skia_generate__mozbuild.py,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_gfx_skia_generate__mozbuild.py,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/gfx/skia/generate_mozbuild.py.orig 2015-06-08 17:49:16.000000000 +0000 +--- mozilla/gfx/skia/generate_mozbuild.py.orig 2016-04-07 21:33:14.000000000 +0000 +++ mozilla/gfx/skia/generate_mozbuild.py -@@ -142,6 +142,9 @@ if CONFIG['GNU_CXX']: - if not CONFIG['CLANG_CXX']: - CXXFLAGS += ['-Wno-logical-op'] +@@ -155,6 +155,12 @@ if CONFIG['GNU_CXX']: + if CONFIG['CPU_ARCH'] == 'arm': + SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer'] +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_skia_moz.build b/mail/thunderbird/patches/patch-mozilla_gfx_skia_moz.build index bf7e148c3dc..f0e1a8c1b30 100644 --- a/mail/thunderbird/patches/patch-mozilla_gfx_skia_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_gfx_skia_moz.build @@ -1,14 +1,17 @@ -$NetBSD: patch-mozilla_gfx_skia_moz.build,v 1.3 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_gfx_skia_moz.build,v 1.4 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/gfx/skia/moz.build.orig 2015-06-08 17:49:16.000000000 +0000 +--- mozilla/gfx/skia/moz.build.orig 2016-04-07 21:33:14.000000000 +0000 +++ mozilla/gfx/skia/moz.build -@@ -970,6 +970,9 @@ if CONFIG['GNU_CXX']: - if not CONFIG['CLANG_CXX']: - CXXFLAGS += ['-Wno-logical-op'] +@@ -684,6 +684,12 @@ if CONFIG['GNU_CXX']: + if CONFIG['CPU_ARCH'] == 'arm': + SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer'] +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_core_SkUtilsArm.cpp b/mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_core_SkUtilsArm.cpp new file mode 100644 index 00000000000..5ecee19313e --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_core_SkUtilsArm.cpp @@ -0,0 +1,45 @@ +$NetBSD: patch-mozilla_gfx_skia_skia_src_core_SkUtilsArm.cpp,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/gfx/skia/skia/src/core/SkUtilsArm.cpp.orig 2016-04-07 21:33:15.000000000 +0000 ++++ mozilla/gfx/skia/skia/src/core/SkUtilsArm.cpp +@@ -16,6 +16,10 @@ + #include <string.h> + #include <pthread.h> + ++#if defined(__NetBSD__) ++#include <sys/sysctl.h> ++#endif ++ + // Set USE_ANDROID_NDK_CPU_FEATURES to use the Android NDK's + // cpu-features helper library to detect NEON at runtime. See + // http://crbug.com/164154 to see why this is needed in Chromium +@@ -47,6 +51,11 @@ + # endif + #endif + ++#if !defined(TEMP_FAILURE_RETRY) ++ // TEMP_FAILURE_RETRY is glibc specific ++# define TEMP_FAILURE_RETRY ++#endif ++ + // A function used to determine at runtime if the target CPU supports + // the ARM NEON instruction set. This implementation is Linux-specific. + static bool sk_cpu_arm_check_neon(void) { +@@ -82,6 +91,17 @@ static bool sk_cpu_arm_check_neon(void) + + result = (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; + ++#elif defined(__NetBSD__) ++ ++ size_t len; ++ int flag; ++ len = sizeof(flag); ++ if (sysctlbyname("machdep.neon_present", &flag, &len, NULL, 0) == 0) { ++ result = flag != 0; ++ } else { ++ result = false; ++ } ++ + #else // USE_ANDROID_NDK_CPU_FEATURES + + // There is no user-accessible CPUID instruction on ARM that we can use. diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp b/mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp new file mode 100644 index 00000000000..49e8c424934 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp @@ -0,0 +1,28 @@ +$NetBSD: patch-mozilla_gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp.orig 2016-04-07 21:33:15.000000000 +0000 ++++ mozilla/gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp +@@ -97,7 +97,11 @@ void SI8_D16_nofilter_DX_arm(const SkBit + "2: \n\t" + : [xx] "+r" (xx), [count8] "+r" (count8), [colors] "+r" (colors) + : [table] "r" (table), [srcAddr] "r" (srcAddr) ++#if defined(__NetBSD__) ++ : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10" ++#else + : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11" ++#endif + ); + + for (i = (count & 7); i > 0; --i) { +@@ -181,7 +185,11 @@ void SI8_opaque_D32_nofilter_DX_arm(cons + "4: \n\t" // exit + : [xx] "+r" (xx), [count] "+r" (count), [colors] "+r" (colors) + : [table] "r" (table), [srcAddr] "r" (srcAddr) ++#if defined(__NetBSD__) ++ : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10" ++#else + : "memory", "cc", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11" ++#endif + ); + } + diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_opts_memset.arm.S b/mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_opts_memset.arm.S new file mode 100644 index 00000000000..2130cdaba94 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_opts_memset.arm.S @@ -0,0 +1,49 @@ +$NetBSD: patch-mozilla_gfx_skia_skia_src_opts_memset.arm.S,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/gfx/skia/skia/src/opts/memset.arm.S.orig 2016-04-07 21:33:15.000000000 +0000 ++++ mozilla/gfx/skia/skia/src/opts/memset.arm.S +@@ -13,6 +13,12 @@ + * to aid future maintenance. + */ + ++#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__) ++#define UNWIND ++#else ++#define UNWIND @ ++#endif ++ + .text + .align 4 + .syntax unified +@@ -30,7 +36,8 @@ + * + */ + arm_memset16: +- .fnstart ++ .cfi_startproc ++ UNWIND .fnstart + push {lr} + + /* if count is equal to zero then abort */ +@@ -51,10 +58,12 @@ arm_memset16: + + /* Now jump into the main loop below. */ + b .Lwork_32 +- .fnend ++ UNWIND .fnend ++ .cfi_endproc + + arm_memset32: +- .fnstart ++ .cfi_startproc ++ UNWIND .fnstart + push {lr} + + /* if count is equal to zero then abort */ +@@ -108,4 +117,5 @@ arm_memset32: + + .Lfinish: + pop {pc} +- .fnend ++ UNWIND .fnend ++ .cfi_endproc diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build b/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build index 0bf2c1ccdc8..a34e0f29f6a 100644 --- a/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.2 2016/01/31 23:43:48 joerg Exp $ +$NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/gfx/thebes/moz.build.orig 2015-12-21 22:32:53.000000000 +0000 +--- mozilla/gfx/thebes/moz.build.orig 2016-04-07 21:33:15.000000000 +0000 +++ mozilla/gfx/thebes/moz.build -@@ -287,6 +287,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS'] +@@ -293,6 +293,12 @@ CXXFLAGS += CONFIG['TK_CFLAGS'] CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CFLAGS += CONFIG['TK_CFLAGS'] @@ -15,11 +15,11 @@ $NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.2 2016/01/31 23:43:48 joerg Exp if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'): CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] -@@ -298,7 +304,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] +@@ -306,7 +312,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk + + LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] -DEFINES['GRAPHITE2_STATIC'] = True - - if CONFIG['GKMEDIAS_SHARED_LIBRARY']: - DEFINES['OTS_DLL'] = True + if CONFIG['OS_ARCH'] == 'WINNT': + del DEFINES['UNICODE'] diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_moz.build b/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_moz.build index e7e7ec1611d..ea38e5c90c4 100644 --- a/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_moz.build @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_gfx_ycbcr_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_gfx_ycbcr_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/gfx/ycbcr/moz.build.orig 2015-06-08 17:49:17.000000000 +0000 +--- mozilla/gfx/ycbcr/moz.build.orig 2016-04-07 21:33:15.000000000 +0000 +++ mozilla/gfx/ycbcr/moz.build @@ -57,7 +57,7 @@ else: diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.S b/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.S index a47dc5f7685..38a054fc533 100644 --- a/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.S +++ b/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.S @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_gfx_ycbcr_yuv__row__arm.S,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_gfx_ycbcr_yuv__row__arm.S,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/gfx/ycbcr/yuv_row_arm.S.orig 2015-07-06 19:52:50.000000000 +0000 +--- mozilla/gfx/ycbcr/yuv_row_arm.S.orig 2016-04-17 13:47:46.265685842 +0000 +++ mozilla/gfx/ycbcr/yuv_row_arm.S @@ -0,0 +1,312 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.s b/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.s new file mode 100644 index 00000000000..b84afe35723 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.s @@ -0,0 +1,37 @@ +$NetBSD: patch-mozilla_gfx_ycbcr_yuv__row__arm.s,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/gfx/ycbcr/yuv_row_arm.s.orig 2016-04-07 21:33:15.000000000 +0000 ++++ mozilla/gfx/ycbcr/yuv_row_arm.s +@@ -2,6 +2,12 @@ + * 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/. */ + ++#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__) ++#define UNWIND ++#else ++#define UNWIND @ ++#endif ++ + .arch armv7-a + .fpu neon + /* Allow to build on targets not supporting neon, and force the object file +@@ -74,7 +80,8 @@ YCbCr42xToRGB565_DITHER30_CONSTS_NEON: + .global ScaleYCbCr42xToRGB565_BilinearY_Row_NEON + .type ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, %function + .balign 64 +- .fnstart ++ .cfi_startproc ++ UNWIND .fnstart + ScaleYCbCr42xToRGB565_BilinearY_Row_NEON: + STMFD r13!,{r4-r9,r14} @ 8 words. + ADR r14,YCbCr42xToRGB565_DITHER03_CONSTS_NEON +@@ -296,7 +303,8 @@ s42xbily_neon_tail: + s42xbily_neon_done: + VPOP {Q4-Q7} @ 16 words. + LDMFD r13!,{r4-r9,PC} @ 8 words. +- .fnend ++ UNWIND .fnend ++ .cfi_endproc + .size ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, .-ScaleYCbCr42xToRGB565_BilinearY_Row_NEON + + #if defined(__ELF__)&&defined(__linux__) diff --git a/mail/thunderbird/patches/patch-mozilla_image_decoders_nsJPEGDecoder.cpp b/mail/thunderbird/patches/patch-mozilla_image_decoders_nsJPEGDecoder.cpp index b9c7a18fdf4..3973697b622 100644 --- a/mail/thunderbird/patches/patch-mozilla_image_decoders_nsJPEGDecoder.cpp +++ b/mail/thunderbird/patches/patch-mozilla_image_decoders_nsJPEGDecoder.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/image/decoders/nsJPEGDecoder.cpp.orig 2015-06-08 17:49:17.000000000 +0000 +--- mozilla/image/decoders/nsJPEGDecoder.cpp.orig 2016-04-07 21:33:16.000000000 +0000 +++ mozilla/image/decoders/nsJPEGDecoder.cpp @@ -23,13 +23,28 @@ @@ -32,7 +32,7 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:3 static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); -@@ -373,6 +388,7 @@ nsJPEGDecoder::WriteInternal(const char* +@@ -339,6 +354,7 @@ nsJPEGDecoder::WriteInternal(const char* case JCS_GRAYSCALE: case JCS_RGB: case JCS_YCbCr: @@ -40,7 +40,7 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:3 // if we're not color managing we can decode directly to // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB if (mCMSMode != eCMSMode_All) { -@@ -381,6 +397,9 @@ nsJPEGDecoder::WriteInternal(const char* +@@ -347,6 +363,9 @@ nsJPEGDecoder::WriteInternal(const char* } else { mInfo.out_color_space = JCS_RGB; } @@ -50,7 +50,7 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:3 break; case JCS_CMYK: case JCS_YCCK: -@@ -450,6 +469,15 @@ nsJPEGDecoder::WriteInternal(const char* +@@ -420,6 +439,16 @@ nsJPEGDecoder::WriteInternal(const char* return; // I/O suspension } @@ -63,10 +63,11 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:3 + mInfo.cconvert->color_convert = ycc_rgb_convert_argb; + } +#endif - ++ // If this is a progressive JPEG ... mState = mInfo.buffered_image ? -@@ -632,7 +660,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus + JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; +@@ -601,7 +630,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus MOZ_ASSERT(imageRow, "Should have a row buffer here"); @@ -78,10 +79,10 @@ $NetBSD: patch-mozilla_image_decoders_nsJPEGDecoder.cpp,v 1.2 2015/07/09 15:17:3 // Special case: scanline will be directly converted into packed ARGB if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { *suspend = true; // suspend -@@ -959,6 +991,282 @@ term_source (j_decompress_ptr jd) +@@ -925,6 +958,282 @@ term_source (j_decompress_ptr jd) + } // namespace image } // namespace mozilla - +#ifndef JCS_EXTENSIONS +/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ + diff --git a/mail/thunderbird/patches/patch-mozilla_intl_hyphenation_glue_hnjalloc.h b/mail/thunderbird/patches/patch-mozilla_intl_hyphenation_glue_hnjalloc.h new file mode 100644 index 00000000000..22997065d82 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_intl_hyphenation_glue_hnjalloc.h @@ -0,0 +1,14 @@ +$NetBSD: patch-mozilla_intl_hyphenation_glue_hnjalloc.h,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/intl/hyphenation/glue/hnjalloc.h.orig 2016-04-07 21:33:16.000000000 +0000 ++++ mozilla/intl/hyphenation/glue/hnjalloc.h +@@ -24,6 +24,9 @@ + */ + + #include <stdio.h> /* ensure stdio.h is loaded before our macros */ ++#ifdef __sun ++#include <wchar.h> ++#endif + + #undef FILE + #define FILE hnjFile diff --git a/mail/thunderbird/patches/patch-mozilla_intl_hyphenation_hnjalloc.h b/mail/thunderbird/patches/patch-mozilla_intl_hyphenation_hnjalloc.h deleted file mode 100644 index ad07b89f345..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_intl_hyphenation_hnjalloc.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mozilla_intl_hyphenation_hnjalloc.h,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/intl/hyphenation/hnjalloc.h.orig 2015-06-08 17:49:18.000000000 +0000 -+++ mozilla/intl/hyphenation/hnjalloc.h -@@ -24,6 +24,9 @@ - */ - - #include <stdio.h> /* ensure stdio.h is loaded before our macros */ -+#ifdef __sun -+#include <wchar.h> -+#endif - - #undef FILE - #define FILE hnjFile diff --git a/mail/thunderbird/patches/patch-mozilla_intl_unicharutil_util_moz.build b/mail/thunderbird/patches/patch-mozilla_intl_unicharutil_util_moz.build deleted file mode 100644 index 0fb4c23a907..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_intl_unicharutil_util_moz.build +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_intl_unicharutil_util_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/intl/unicharutil/util/moz.build.orig 2015-06-08 17:49:21.000000000 +0000 -+++ mozilla/intl/unicharutil/util/moz.build -@@ -38,5 +38,8 @@ if CONFIG['_MSC_VER']: - if CONFIG['ENABLE_INTL_API']: - CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] - -+if CONFIG['MOZ_NATIVE_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['GNU_CXX']: - FAIL_ON_WARNINGS = True diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in deleted file mode 100644 index cce531d227d..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.6 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/ipc/chromium/Makefile.in.orig 2014-07-18 00:05:24.000000000 +0000 -+++ mozilla/ipc/chromium/Makefile.in -@@ -28,6 +28,8 @@ include $(topsrcdir)/config/rules.mk - - ifdef MOZ_NATIVE_LIBEVENT # { - -+OS_CPPFLAGS += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) -+ - export-preqs = \ - $(call mkdir_deps,$(CURDIR)/third_party/libevent) \ - $(NULL) diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_moz.build b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_moz.build deleted file mode 100644 index e96fbc745af..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_moz.build +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-mozilla_ipc_chromium_moz.build,v 1.1 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/ipc/chromium/moz.build.orig 2014-07-18 00:05:24.000000000 +0000 -+++ mozilla/ipc/chromium/moz.build -@@ -19,7 +19,10 @@ if CONFIG['OS_ARCH'] == 'WINNT': - else: - os_posix = 1 - if CONFIG['OS_ARCH'] == 'Darwin': -- os_macosx = 1 -+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': -+ os_macosx = 1 -+ else: -+ os_bsd = 1 - elif CONFIG['OS_ARCH'] == 'DragonFly': - os_dragonfly = 1 - os_bsd = 1 diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_atomicops.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_atomicops.h index 20977021638..9b4b9c6a025 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_atomicops.h +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_atomicops.h @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_atomicops.h,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_atomicops.h,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/atomicops.h.orig 2015-06-08 17:49:21.000000000 +0000 +--- mozilla/ipc/chromium/src/base/atomicops.h.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/atomicops.h @@ -45,7 +45,7 @@ typedef int64_t Atomic64; diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util.h deleted file mode 100644 index 45b8f4ca77f..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_file__util.h,v 1.2 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util.h.orig 2014-07-18 00:05:24.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util.h -@@ -16,7 +16,9 @@ - #include <sys/stat.h> - #elif defined(OS_POSIX) - #include <sys/types.h> -+#if !defined(OS_SOLARIS) - #include <fts.h> -+#endif - #include <sys/stat.h> - #endif - diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__posix.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__posix.cc new file mode 100644 index 00000000000..ff0dc9c5c41 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__posix.cc @@ -0,0 +1,21 @@ +$NetBSD: patch-mozilla_ipc_chromium_src_base_file__util__posix.cc,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2016-04-07 21:33:19.000000000 +0000 ++++ mozilla/ipc/chromium/src/base/file_util_posix.cc +@@ -266,7 +266,7 @@ bool SetCurrentDirectory(const FilePath& + return !ret; + } + +-#if !defined(OS_MACOSX) ++#if !defined(MOZ_WIDGET_COCOA) + bool GetTempDir(FilePath* path) { + const char* tmp = getenv("TMPDIR"); + if (tmp) +@@ -330,6 +330,6 @@ bool CopyFile(const FilePath& from_path, + + return result; + } +-#endif // !defined(OS_MACOSX) ++#endif // !defined(MOZ_WIDGET_COCOA) + + } // namespace file_util diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc index b9d588fb2dc..accadeac0b6 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_message__loop.cc,v 1.5 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_message__loop.cc,v 1.6 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/message_loop.cc.orig 2014-07-18 00:05:24.000000000 +0000 +--- mozilla/ipc/chromium/src/base/message_loop.cc.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/message_loop.cc -@@ -14,20 +14,18 @@ +@@ -13,20 +13,18 @@ #include "base/string_util.h" #include "base/thread_local.h" @@ -24,7 +24,7 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_message__loop.cc,v 1.5 2014/07/27 2 #ifdef ANDROID #include "base/message_pump_android.h" #endif -@@ -138,9 +136,9 @@ MessageLoop::MessageLoop(Type type) +@@ -143,9 +141,9 @@ MessageLoop::MessageLoop(Type type) } #elif defined(OS_POSIX) if (type_ == TYPE_UI) { diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__pump__libevent.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__pump__libevent.cc new file mode 100644 index 00000000000..e146dc60e75 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__pump__libevent.cc @@ -0,0 +1,20 @@ +$NetBSD: patch-mozilla_ipc_chromium_src_base_message__pump__libevent.cc,v 1.3 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc.orig 2016-04-07 21:33:19.000000000 +0000 ++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc +@@ -20,6 +20,7 @@ + + // This macro checks that the _EVENT_SIZEOF_* constants defined in + // ipc/chromiume/src/third_party/<platform>/event2/event-config.h are correct. ++#if 0 + #define CHECK_EVENT_SIZEOF(TYPE, type) \ + static_assert(_EVENT_SIZEOF_##TYPE == sizeof(type), \ + "bad _EVENT_SIZEOF_"#TYPE); +@@ -30,6 +31,7 @@ CHECK_EVENT_SIZEOF(PTHREAD_T, pthread_t) + CHECK_EVENT_SIZEOF(SHORT, short); + CHECK_EVENT_SIZEOF(SIZE_T, size_t); + CHECK_EVENT_SIZEOF(VOID_P, void*); ++#endif + + // Lifecycle of struct event + // Libevent uses two main data structures: diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h index b180f119f08..8c8883786bc 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread.h,v 1.4 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread.h,v 1.5 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2013-10-23 22:09:00.000000000 +0000 +--- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread.h @@ -25,6 +25,9 @@ typedef pthread_t PlatformThreadHandle; #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(__GLIBC__) diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc index 446c4d5c855..138888ccef3 100644 --- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.8 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2014-07-18 00:05:24.000000000 +0000 +--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,8 +9,12 @@ +@@ -9,22 +9,24 @@ #if defined(OS_MACOSX) #include <mach/mach.h> @@ -15,8 +15,6 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.8 2014/07/27 #elif defined(OS_LINUX) #include <sys/syscall.h> #include <sys/prctl.h> -@@ -19,15 +23,13 @@ - #include <sys/thr.h> #endif -#if !defined(OS_MACOSX) @@ -32,7 +30,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.8 2014/07/27 namespace base { void InitThreading(); } // namespace -@@ -91,7 +93,7 @@ void PlatformThread::Sleep(int duration_ +@@ -82,7 +84,7 @@ void PlatformThread::Sleep(int duration_ sleep_time = remaining; } @@ -41,7 +39,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.8 2014/07/27 // Mac is implemented in platform_thread_mac.mm. // static -@@ -114,19 +116,41 @@ void PlatformThread::SetName(const char* +@@ -105,19 +107,41 @@ void PlatformThread::SetName(const char* pthread_setname_np(pthread_self(), "%s", (void *)name); #elif defined(OS_BSD) && !defined(__GLIBC__) pthread_set_name_np(pthread_self(), name); diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h index 6800056f877..60ef9c346c1 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.6 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.7 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/process_util.h.orig 2015-06-08 17:49:21.000000000 +0000 +--- mozilla/ipc/chromium/src/base/process_util.h.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util.h @@ -41,6 +41,9 @@ typedef PROCESSENTRY32 ProcessEntry; diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc index 375f98607f8..9b2cbf89825 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc @@ -1,14 +1,15 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.9 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.10 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2015-06-08 17:49:21.000000000 +0000 +--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -9,6 +9,9 @@ +@@ -10,6 +10,10 @@ + #include <spawn.h> #include <sys/wait.h> - #include <fcntl.h> +#if defined(OS_BSD) +#include <kvm.h> +#endif - #include <unistd.h> - ++ #include <string> + + #include "base/eintr_wrapper.h" diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc index 182eec1c920..c9399061cdd 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__posix.cc,v 1.4 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__posix.cc,v 1.5 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/process_util_posix.cc.orig 2013-10-23 22:09:00.000000000 +0000 +--- mozilla/ipc/chromium/src/base/process_util_posix.cc.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_posix.cc -@@ -110,7 +110,7 @@ void CloseSuperfluousFds(const base::Inj +@@ -116,7 +116,7 @@ void CloseSuperfluousFds(const base::Inj #if defined(ANDROID) static const rlim_t kSystemDefaultMaxFds = 1024; static const char kFDDir[] = "/proc/self/fd"; @@ -11,7 +11,7 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__posix.cc,v 1.4 2013/ static const rlim_t kSystemDefaultMaxFds = 8192; static const char kFDDir[] = "/proc/self/fd"; #elif defined(OS_MACOSX) -@@ -202,7 +202,7 @@ void CloseSuperfluousFds(const base::Inj +@@ -208,7 +208,7 @@ void CloseSuperfluousFds(const base::Inj // TODO(agl): Remove this function. It's fundamentally broken for multithreaded // apps. void SetAllFDsToCloseOnExec() { diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_scoped__nsautorelease__pool.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_scoped__nsautorelease__pool.h index 00727cebed9..3eea38c8d03 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_scoped__nsautorelease__pool.h +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_scoped__nsautorelease__pool.h @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_scoped__nsautorelease__pool.h,v 1.1 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_scoped__nsautorelease__pool.h,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/scoped_nsautorelease_pool.h.orig 2014-07-18 00:05:24.000000000 +0000 +--- mozilla/ipc/chromium/src/base/scoped_nsautorelease_pool.h.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/scoped_nsautorelease_pool.h @@ -7,13 +7,13 @@ diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_sys__info__posix.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_sys__info__posix.cc new file mode 100644 index 00000000000..1e02b3c4b5c --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_sys__info__posix.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-mozilla_ipc_chromium_src_base_sys__info__posix.cc,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig 2016-04-07 21:33:19.000000000 +0000 ++++ mozilla/ipc/chromium/src/base/sys_info_posix.cc +@@ -119,7 +119,11 @@ std::wstring SysInfo::GetEnvVar(const wc + + // static + std::string SysInfo::OperatingSystemName() { ++#ifdef OS_SOLARIS ++ struct utsname info; ++#else + utsname info; ++#endif + if (uname(&info) < 0) { + NOTREACHED(); + return ""; diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc index 8a607c5dc3b..078d94826a9 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_base_time__posix.cc,v 1.2 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_base_time__posix.cc,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/time_posix.cc.orig 2013-10-23 22:09:00.000000000 +0000 +--- mozilla/ipc/chromium/src/base/time_posix.cc.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/time_posix.cc @@ -65,8 +65,10 @@ Time Time::FromExploded(bool is_local, c timestruct.tm_wday = exploded.day_of_week; // mktime/timegm ignore this diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_build_build__config.h index 09aa470a517..7cf155654e6 100644 --- a/mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_build_build__config.h @@ -1,8 +1,8 @@ -$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.6 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_build_build__config.h,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/build/build_config.h.orig 2013-10-23 22:09:00.000000000 +0000 +--- mozilla/ipc/chromium/src/build/build_config.h.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/build/build_config.h -@@ -27,6 +27,8 @@ +@@ -30,6 +30,8 @@ #define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 @@ -11,7 +11,7 @@ $NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.6 2013/11/12 20:50:51 #elif defined(_WIN32) #define OS_WIN 1 #else -@@ -42,7 +44,7 @@ +@@ -45,7 +47,7 @@ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h index 02ef4af47f2..1c20f932703 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h +++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h,v 1.4 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h,v 1.5 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/chromium/src/chrome/common/transport_dib.h.orig 2013-10-23 22:09:00.000000000 +0000 +--- mozilla/ipc/chromium/src/chrome/common/transport_dib.h.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/chromium/src/chrome/common/transport_dib.h -@@ -70,7 +70,7 @@ class TransportDIB { +@@ -66,7 +66,7 @@ class TransportDIB { typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; diff --git a/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/mail/thunderbird/patches/patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp index 7d47fe1c00c..0f04d0bb17a 100644 --- a/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp +++ b/mail/thunderbird/patches/patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.7 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig 2015-06-08 17:49:21.000000000 +0000 +--- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/glue/GeckoChildProcessHost.cpp @@ -4,7 +4,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -16,7 +16,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.7 2015/07/09 15:17:34 ryoo #include "base/command_line.h" #include "base/string_util.h" -@@ -547,7 +553,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -633,7 +639,7 @@ GeckoChildProcessHost::PerformAsyncLaunc // and passing wstrings from one config to the other is unsafe. So // we split the logic here. @@ -25,7 +25,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.7 2015/07/09 15:17:34 ryoo base::environment_map newEnvVars; ChildPrivileges privs = mPrivileges; if (privs == base::PRIVILEGES_DEFAULT) { -@@ -686,7 +692,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -759,7 +765,7 @@ GeckoChildProcessHost::PerformAsyncLaunc childArgv.push_back(pidstring); #if defined(MOZ_CRASHREPORTER) @@ -34,7 +34,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.7 2015/07/09 15:17:34 ryoo int childCrashFd, childCrashRemapFd; if (!CrashReporter::CreateNotificationPipeForChild( &childCrashFd, &childCrashRemapFd)) -@@ -719,7 +725,7 @@ GeckoChildProcessHost::PerformAsyncLaunc +@@ -792,7 +798,7 @@ GeckoChildProcessHost::PerformAsyncLaunc childArgv.push_back(childProcessType); base::LaunchApp(childArgv, mFileMap, diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_glue_ScopedXREEmbed.cpp b/mail/thunderbird/patches/patch-mozilla_ipc_glue_ScopedXREEmbed.cpp deleted file mode 100644 index 7921d061214..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_ipc_glue_ScopedXREEmbed.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_ipc_glue_ScopedXREEmbed.cpp,v 1.1 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/ipc/glue/ScopedXREEmbed.cpp.orig 2014-07-18 00:05:24.000000000 +0000 -+++ mozilla/ipc/glue/ScopedXREEmbed.cpp -@@ -66,7 +66,7 @@ ScopedXREEmbed::Start() - localFile = do_QueryInterface(parent); - NS_ENSURE_TRUE_VOID(localFile); - --#ifdef OS_MACOSX -+#ifdef MOZ_WIDGET_COCOA - if (XRE_GetProcessType() == GeckoProcessType_Content) { - // We're an XPCOM-using subprocess. Walk out of - // [subprocess].app/Contents/MacOS to the real GRE dir. diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_glue_StringUtil.cpp b/mail/thunderbird/patches/patch-mozilla_ipc_glue_StringUtil.cpp index bda2bfabd45..ae516eb7818 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_glue_StringUtil.cpp +++ b/mail/thunderbird/patches/patch-mozilla_ipc_glue_StringUtil.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_ipc_glue_StringUtil.cpp,v 1.1 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_glue_StringUtil.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/glue/StringUtil.cpp.orig 2014-07-18 00:05:24.000000000 +0000 +--- mozilla/ipc/glue/StringUtil.cpp.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/glue/StringUtil.cpp -@@ -64,14 +64,14 @@ namespace base { +@@ -65,14 +65,14 @@ namespace base { // converters, and implementing the one that doesn't exist for OS X // and Windows. diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_glue_moz.build b/mail/thunderbird/patches/patch-mozilla_ipc_glue_moz.build index d138fd562b5..a6baf8385f2 100644 --- a/mail/thunderbird/patches/patch-mozilla_ipc_glue_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_ipc_glue_moz.build @@ -1,12 +1,12 @@ -$NetBSD: patch-mozilla_ipc_glue_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_ipc_glue_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/ipc/glue/moz.build.orig 2015-06-08 17:49:21.000000000 +0000 +--- mozilla/ipc/glue/moz.build.orig 2016-04-07 21:33:19.000000000 +0000 +++ mozilla/ipc/glue/moz.build -@@ -87,7 +87,7 @@ elif CONFIG['OS_ARCH'] in ('DragonFly', +@@ -95,7 +95,7 @@ elif CONFIG['OS_ARCH'] in ('DragonFly', UNIFIED_SOURCES += [ 'ProcessUtils_bsd.cpp' ] --elif CONFIG['OS_ARCH'] in ('Darwin'): +-elif CONFIG['OS_ARCH'] == 'Darwin': +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': UNIFIED_SOURCES += [ 'ProcessUtils_mac.mm' diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_cxx_ast.py b/mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_cxx_ast.py deleted file mode 100644 index 16a29e88533..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_cxx_ast.py +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-mozilla_ipc_ipdl_ipdl_cxx_ast.py,v 1.1 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/ipc/ipdl/ipdl/cxx/ast.py.orig 2014-07-18 00:05:24.000000000 +0000 -+++ mozilla/ipc/ipdl/ipdl/cxx/ast.py -@@ -336,12 +336,13 @@ Type.VOID = Type('void') - Type.VOIDPTR = Type('void', ptr=1) - - class TypeArray(Node): -- def __init__(self, basetype, nmemb): -- '''the type |basetype DECLNAME[nmemb]|. |nmemb| is an Expr''' -+ def __init__(self, basetype, nmemb, alignType): -+ '''the type |basetype DECLNAME[nmemb]|. |nmemb| is an Expr, |alignType| is a type''' - self.basetype = basetype - self.nmemb = nmemb -+ self.alignType = alignType - def __deepcopy__(self, memo): -- return TypeArray(deepcopy(self.basetype, memo), nmemb) -+ return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType) - - class TypeEnum(Node): - def __init__(self, name=None): diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_cxx_cgen.py b/mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_cxx_cgen.py deleted file mode 100644 index 8e6b3548f25..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_cxx_cgen.py +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-mozilla_ipc_ipdl_ipdl_cxx_cgen.py,v 1.1 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/ipc/ipdl/ipdl/cxx/cgen.py.orig 2014-07-18 00:05:24.000000000 +0000 -+++ mozilla/ipc/ipdl/ipdl/cxx/cgen.py -@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor): - def visitDecl(self, d): - # C-syntax arrays make code generation much more annoying - if isinstance(d.type, TypeArray): -+ self.write('MOZ_ALIGNED_DECL(') - d.type.basetype.accept(self) - else: - d.type.accept(self) -@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor): - if isinstance(d.type, TypeArray): - self.write('[') - d.type.nmemb.accept(self) -- self.write(']') -+ self.write('], MOZ_ALIGNOF(') -+ d.type.alignType.accept(self) -+ self.write('))') - - def visitParam(self, p): - self.visitDecl(p) diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_lower.py b/mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_lower.py deleted file mode 100644 index 4e2248b9635..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_lower.py +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_ipc_ipdl_ipdl_lower.py,v 1.2 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/ipc/ipdl/ipdl/lower.py.orig 2014-07-18 00:05:24.000000000 +0000 -+++ mozilla/ipc/ipdl/ipdl/lower.py -@@ -768,7 +768,7 @@ IPDL union type.""" - if self.recursive: - return self.ptrToType() - else: -- return TypeArray(Type('char'), ExprSizeof(self.internalType())) -+ return TypeArray(Type('char'), ExprSizeof(self.internalType()), self.internalType()) - - def unionValue(self): - # NB: knows that Union's storage C union is named |mValue| diff --git a/mail/thunderbird/patches/patch-mozilla_js_public_CallArgs.h b/mail/thunderbird/patches/patch-mozilla_js_public_CallArgs.h deleted file mode 100644 index ddc728a9a21..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_js_public_CallArgs.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_js_public_CallArgs.h,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/js/public/CallArgs.h.orig 2015-06-08 17:49:21.000000000 +0000 -+++ mozilla/js/public/CallArgs.h -@@ -344,7 +344,7 @@ class MOZ_STACK_CLASS CallArgs : public - * Returns true if there are at least |required| arguments passed in. If - * false, it reports an error message on the context. - */ -- bool requireAtLeast(JSContext* cx, const char* fnname, unsigned required); -+ JS_PUBLIC_API(bool) requireAtLeast(JSContext* cx, const char* fnname, unsigned required); - - }; - diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp deleted file mode 100644 index 7621b180046..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp.orig 2015-06-08 17:49:21.000000000 +0000 -+++ mozilla/js/src/asmjs/AsmJSSignalHandlers.cpp -@@ -637,10 +637,11 @@ HandleMachException(JSRuntime* rt, const - mach_port_t rtThread = request.body.thread.name; - - // Read out the JSRuntime thread's register state. -- x86_thread_state_t state; -- unsigned int count = x86_THREAD_STATE_COUNT; -+ moz_platform_thread_state_t state; -+ thread_state_flavor_t flavor = MOZ_PLATFORM_THREAD_STATE_FLAVOR; -+ mach_msg_type_number_t count = MOZ_PLATFORM_THREAD_STATE_COUNT; - kern_return_t kret; -- kret = thread_get_state(rtThread, x86_THREAD_STATE, (thread_state_t)&state, &count); -+ kret = thread_get_state(rtThread, flavor, (thread_state_t)&state, &count); - if (kret != KERN_SUCCESS) - return false; - diff --git a/mail/thunderbird/patches/patch-as b/mail/thunderbird/patches/patch-mozilla_js_src_configure.in index c89115a157c..dc902bd3bac 100644 --- a/mail/thunderbird/patches/patch-as +++ b/mail/thunderbird/patches/patch-mozilla_js_src_configure.in @@ -1,10 +1,8 @@ -$NetBSD: patch-as,v 1.17 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_configure.in,v 1.1 2016/04/17 18:33:50 ryoon Exp $ -Treat DragonFly like FreeBSD. - ---- mozilla/js/src/configure.in.orig 2015-06-08 17:49:21.000000000 +0000 +--- mozilla/js/src/configure.in.orig 2016-04-07 21:33:20.000000000 +0000 +++ mozilla/js/src/configure.in -@@ -2187,8 +2187,7 @@ AC_LANG_CPLUSPLUS +@@ -2114,8 +2114,7 @@ AC_LANG_CPLUSPLUS MOZ_CXX11 @@ -14,7 +12,7 @@ Treat DragonFly like FreeBSD. dnl =============================================================== if test "$GNU_CC" -a "$OS_TARGET" != WINNT; then AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) -@@ -3010,7 +3009,7 @@ if test "$MOZ_MEMORY"; then +@@ -2951,7 +2950,7 @@ if test "$MOZ_MEMORY"; then *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; @@ -23,7 +21,7 @@ Treat DragonFly like FreeBSD. AC_DEFINE(MOZ_MEMORY_BSD) ;; *-android*|*-linuxandroid*) -@@ -3851,6 +3850,16 @@ MOZ_SUBCONFIGURE_ICU() +@@ -3818,6 +3817,16 @@ MOZ_SUBCONFIGURE_ICU() dnl ======================================================== dnl JavaScript shell dnl ======================================================== @@ -38,5 +36,5 @@ Treat DragonFly like FreeBSD. + PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) +fi - MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" - MALLOC_H= + MOZ_CHECK_ALLOCATOR + diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_ctypes_CTypes.h b/mail/thunderbird/patches/patch-mozilla_js_src_ctypes_CTypes.h index 525bb5f2174..aed61921a80 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_ctypes_CTypes.h +++ b/mail/thunderbird/patches/patch-mozilla_js_src_ctypes_CTypes.h @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_js_src_ctypes_CTypes.h,v 1.2 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_ctypes_CTypes.h,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/ctypes/CTypes.h.orig 2014-07-18 00:05:25.000000000 +0000 +--- mozilla/js/src/ctypes/CTypes.h.orig 2016-04-07 21:33:20.000000000 +0000 +++ mozilla/js/src/ctypes/CTypes.h -@@ -14,6 +14,23 @@ +@@ -19,6 +19,23 @@ #include "js/Vector.h" #include "vm/String.h" diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_frontend_ParseMaps.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_frontend_ParseMaps.cpp index 5cc3a904821..a9cdb5aa050 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_frontend_ParseMaps.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_src_frontend_ParseMaps.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_js_src_frontend_ParseMaps.cpp,v 1.1 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_frontend_ParseMaps.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/frontend/ParseMaps.cpp.orig 2013-10-23 22:09:00.000000000 +0000 +--- mozilla/js/src/frontend/ParseMaps.cpp.orig 2016-04-07 21:33:20.000000000 +0000 +++ mozilla/js/src/frontend/ParseMaps.cpp -@@ -132,5 +132,5 @@ frontend::InitAtomMap(JSContext *cx, fro +@@ -133,5 +133,5 @@ frontend::InitAtomMap(frontend::AtomInde } } diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_gc_Statistics.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_gc_Statistics.cpp deleted file mode 100644 index 2a55c632902..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_js_src_gc_Statistics.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mozilla_js_src_gc_Statistics.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/js/src/gc/Statistics.cpp.orig 2015-06-08 17:49:22.000000000 +0000 -+++ mozilla/js/src/gc/Statistics.cpp -@@ -222,8 +222,8 @@ class gcstats::StatisticsSerializer - while (*c) { - if (*c == ' ' || *c == '\t') - p('_'); -- else if (isupper(*c)) -- p(tolower(*c)); -+ else if (isupper((unsigned char)*c)) -+ p(tolower((unsigned char)*c)); - else if (*c == '+') - p("added_"); - else if (*c == '-') diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_jit_ExecutableAllocator.h b/mail/thunderbird/patches/patch-mozilla_js_src_jit_ExecutableAllocator.h deleted file mode 100644 index 5f7905048c3..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_js_src_jit_ExecutableAllocator.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-mozilla_js_src_jit_ExecutableAllocator.h,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/js/src/jit/ExecutableAllocator.h.orig 2015-06-08 17:49:24.000000000 +0000 -+++ mozilla/js/src/jit/ExecutableAllocator.h -@@ -419,6 +419,11 @@ class ExecutableAllocator { - { - __clear_cache(code, reinterpret_cast<char*>(code) + size); - } -+#elif defined(JS_CODEGEN_ARM) && (defined(__FreeBSD__) || defined(__NetBSD__)) -+ static void cacheFlush(void* code, size_t size) -+ { -+ __clear_cache(code, reinterpret_cast<char*>(code) + size); -+ } - #elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__) - static void cacheFlush(void* code, size_t size) - { diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_jit_LIR.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_jit_LIR.cpp index 2c4669be28b..843c54720d7 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_jit_LIR.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_src_jit_LIR.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-mozilla_js_src_jit_LIR.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_jit_LIR.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/jit/LIR.cpp.orig 2015-06-08 17:49:25.000000000 +0000 +--- mozilla/js/src/jit/LIR.cpp.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/js/src/jit/LIR.cpp -@@ -323,7 +323,7 @@ LNode::printName(FILE* fp, Opcode op) +@@ -322,7 +322,7 @@ LNode::printName(GenericPrinter& out, Op const char* name = names[op]; size_t len = strlen(name); for (size_t i = 0; i < len; i++) -- fprintf(fp, "%c", tolower(name[i])); -+ fprintf(fp, "%c", tolower(((unsigned char)name[i]))); +- out.printf("%c", tolower(name[i])); ++ out.printf("%c", tolower((unsigned char)name[i])); } void diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_jit_MIR.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_jit_MIR.cpp index f45ba637fad..860d19dfbb0 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_jit_MIR.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_src_jit_MIR.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-mozilla_js_src_jit_MIR.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_jit_MIR.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/jit/MIR.cpp.orig 2015-06-08 17:49:25.000000000 +0000 +--- mozilla/js/src/jit/MIR.cpp.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/js/src/jit/MIR.cpp -@@ -71,7 +71,7 @@ MDefinition::PrintOpcodeName(FILE* fp, M +@@ -75,7 +75,7 @@ MDefinition::PrintOpcodeName(GenericPrin const char* name = names[op]; size_t len = strlen(name); for (size_t i = 0; i < len; i++) -- fprintf(fp, "%c", tolower(name[i])); -+ fprintf(fp, "%c", tolower(((unsigned char)name[i]))); +- out.printf("%c", tolower(name[i])); ++ out.printf("%c", tolower((unsigned char)name[i])); } const Value& diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_jit_arm_Architecture-arm.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_jit_arm_Architecture-arm.cpp index f0a00ee25b5..6d4b144cbdc 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_jit_arm_Architecture-arm.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_src_jit_arm_Architecture-arm.cpp @@ -1,12 +1,12 @@ -$NetBSD: patch-mozilla_js_src_jit_arm_Architecture-arm.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_jit_arm_Architecture-arm.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/jit/arm/Architecture-arm.cpp.orig 2015-06-08 17:49:25.000000000 +0000 +--- mozilla/js/src/jit/arm/Architecture-arm.cpp.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/js/src/jit/arm/Architecture-arm.cpp @@ -16,7 +16,7 @@ #include "jit/arm/Assembler-arm.h" #include "jit/RegisterSets.h" --#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) +-#if !defined(__linux__) || defined(ANDROID) || defined(JS_SIMULATOR_ARM) +#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) || defined(__NetBSD__) // The Android NDK and B2G do not include the hwcap.h kernel header, and it is not // defined when building the simulator, so inline the header defines we need. diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_jsapi.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_jsapi.cpp deleted file mode 100644 index a87bea4b813..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_js_src_jsapi.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_js_src_jsapi.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/js/src/jsapi.cpp.orig 2015-06-08 17:49:25.000000000 +0000 -+++ mozilla/js/src/jsapi.cpp -@@ -115,7 +115,7 @@ using js::frontend::Parser; - #define JS_ADDRESSOF_VA_LIST(ap) (&(ap)) - #endif - --bool -+JS_PUBLIC_API(bool) - JS::CallArgs::requireAtLeast(JSContext* cx, const char* fnname, unsigned required) { - if (length() < required) { - char numArgsStr[40]; diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_jsdate.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_jsdate.cpp index 03af5399025..9dfe30cd839 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_jsdate.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_src_jsdate.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_js_src_jsdate.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_jsdate.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/jsdate.cpp.orig 2015-06-08 17:49:25.000000000 +0000 +--- mozilla/js/src/jsdate.cpp.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/js/src/jsdate.cpp -@@ -2669,11 +2669,11 @@ ToLocaleFormatHelper(JSContext* cx, Hand +@@ -2672,8 +2672,8 @@ ToLocaleFormatHelper(JSContext* cx, Hand if (strcmp(format, "%x") == 0 && result_len >= 6 && /* Format %x means use OS settings, which may have 2-digit yr, so hack end of 3/11/22 or 11.03.22 or 11Mar22 to use 4-digit yr...*/ @@ -11,10 +11,5 @@ $NetBSD: patch-mozilla_js_src_jsdate.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ + !isdigit(((unsigned char)buf[result_len - 3])) && + isdigit(((unsigned char)buf[result_len - 2])) && isdigit(((unsigned char)buf[result_len - 1])) && /* ...but not if starts with 4-digit year, like 2022/3/11. */ -- !(isdigit(buf[0]) && isdigit(buf[1]) && -- isdigit(buf[2]) && isdigit(buf[3]))) { -+ !(isdigit(((unsigned char)buf[0])) && isdigit(((unsigned char)buf[1])) && -+ isdigit(((unsigned char)buf[2])) && isdigit(((unsigned char)buf[3])))) { - double localtime = obj->as<DateObject>().cachedLocalTime(&cx->runtime()->dateTimeInfo); - int year = IsNaN(localtime) ? 0 : (int) YearFromTime(localtime); - JS_snprintf(buf + (result_len - 2), (sizeof buf) - (result_len - 2), + !(isdigit(buf[0]) && isdigit(buf[1]) && + isdigit(buf[2]) && isdigit(buf[3]))) { diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_jskwgen.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_jskwgen.cpp index 565d24b5709..830ab0d270d 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_jskwgen.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_src_jskwgen.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_js_src_jskwgen.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_jskwgen.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/jskwgen.cpp.orig 2015-06-08 17:49:25.000000000 +0000 +--- mozilla/js/src/jskwgen.cpp.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/js/src/jskwgen.cpp @@ -181,7 +181,7 @@ qchar(char c, char* quoted_buffer) *s++ = '\\'; diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_jsmath.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_jsmath.cpp index d8c5914c0c6..d21d440710e 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_jsmath.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_src_jsmath.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_js_src_jsmath.cpp,v 1.1 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_jsmath.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/jsmath.cpp.orig 2013-10-23 22:09:02.000000000 +0000 +--- mozilla/js/src/jsmath.cpp.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/js/src/jsmath.cpp -@@ -244,7 +244,7 @@ js::ecmaAtan2(double y, double x) +@@ -272,7 +272,7 @@ js::ecmaAtan2(double y, double x) } #endif diff --git a/mail/thunderbird/patches/patch-bf b/mail/thunderbird/patches/patch-mozilla_js_src_jsnativestack.cpp index cca7e8fd5a0..d7e614ff390 100644 --- a/mail/thunderbird/patches/patch-bf +++ b/mail/thunderbird/patches/patch-mozilla_js_src_jsnativestack.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-bf,v 1.7 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_jsnativestack.cpp,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/jsnativestack.cpp.orig 2013-10-23 22:09:02.000000000 +0000 +--- mozilla/js/src/jsnativestack.cpp.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/js/src/jsnativestack.cpp -@@ -114,7 +114,7 @@ js::GetNativeStackBaseImpl() +@@ -102,7 +102,7 @@ js::GetNativeStackBaseImpl() pthread_attr_init(&sattr); # if defined(__OpenBSD__) stack_t ss; diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_shell_jsoptparse.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_shell_jsoptparse.cpp index ff4e5b6eb6e..b26c29c642f 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_shell_jsoptparse.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_src_shell_jsoptparse.cpp @@ -1,9 +1,9 @@ -$NetBSD: patch-mozilla_js_src_shell_jsoptparse.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_shell_jsoptparse.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/shell/jsoptparse.cpp.orig 2015-06-08 17:49:25.000000000 +0000 +--- mozilla/js/src/shell/jsoptparse.cpp.orig 2016-04-07 21:33:25.000000000 +0000 +++ mozilla/js/src/shell/jsoptparse.cpp -@@ -90,7 +90,7 @@ PrintParagraph(const char* text, unsigne - printf("%*s", startColno, ""); +@@ -95,7 +95,7 @@ PrintParagraph(const char* text, unsigne + ++it; while (*it != '\0') { - MOZ_ASSERT(!isspace(*it)); diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_vm_SPSProfiler.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_vm_SPSProfiler.cpp index 30f3e5cc981..ed907a0f38f 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_src_vm_SPSProfiler.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_src_vm_SPSProfiler.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_js_src_vm_SPSProfiler.cpp,v 1.2 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_js_src_vm_SPSProfiler.cpp,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/src/vm/SPSProfiler.cpp.orig 2014-07-18 00:05:30.000000000 +0000 +--- mozilla/js/src/vm/SPSProfiler.cpp.orig 2016-04-07 21:33:28.000000000 +0000 +++ mozilla/js/src/vm/SPSProfiler.cpp @@ -4,6 +4,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_XPCConvert.cpp b/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_XPCConvert.cpp index f04aaf4fa19..9bcc0dbbeea 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_XPCConvert.cpp +++ b/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_XPCConvert.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_js_xpconnect_src_XPCConvert.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_js_xpconnect_src_XPCConvert.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/xpconnect/src/XPCConvert.cpp.orig 2015-06-08 17:49:29.000000000 +0000 +--- mozilla/js/xpconnect/src/XPCConvert.cpp.orig 2016-04-07 21:33:28.000000000 +0000 +++ mozilla/js/xpconnect/src/XPCConvert.cpp @@ -134,7 +134,7 @@ XPCConvert::NativeData2JS(MutableHandleV d.setNumber(*static_cast<const float*>(s)); diff --git a/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_xpcprivate.h b/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_xpcprivate.h index 1dca8a903b6..097963dfc4f 100644 --- a/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_xpcprivate.h +++ b/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_xpcprivate.h @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_js_xpconnect_src_xpcprivate.h,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_js_xpconnect_src_xpcprivate.h,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/js/xpconnect/src/xpcprivate.h.orig 2015-06-08 17:49:55.000000000 +0000 +--- mozilla/js/xpconnect/src/xpcprivate.h.orig 2016-04-07 21:33:28.000000000 +0000 +++ mozilla/js/xpconnect/src/xpcprivate.h -@@ -1017,6 +1017,8 @@ static inline bool IS_PROTO_CLASS(const +@@ -999,6 +999,8 @@ typedef nsTArray<InterpositionWhitelistP /***************************************************************************/ // XPCWrappedNativeScope is one-to-one with a JS global object. diff --git a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_AUTHORS b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_AUTHORS deleted file mode 100644 index 205e169c35a..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_AUTHORS +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-mozilla_media_libcubeb_AUTHORS,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/media/libcubeb/AUTHORS.orig 2015-06-08 17:49:22.000000000 +0000 -+++ mozilla/media/libcubeb/AUTHORS -@@ -4,3 +4,4 @@ Michael Wu <mwu@mozilla.com> - Paul Adenot <paul@paul.cx> - David Richards <drichards@mozilla.com> - Sebastien Alaiwan <sebastien.alaiwan@gmail.com> -+Evgeniy Vodolazskiy <waterlaz@gmail.com> diff --git a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb.c b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb.c index 86d6fc220d1..e540071a7e5 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb.c +++ b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb.c @@ -1,10 +1,10 @@ -$NetBSD: patch-mozilla_media_libcubeb_src_cubeb.c,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libcubeb_src_cubeb.c,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libcubeb/src/cubeb.c.orig 2015-06-08 17:49:22.000000000 +0000 +--- mozilla/media/libcubeb/src/cubeb.c.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libcubeb/src/cubeb.c -@@ -56,6 +56,9 @@ int opensl_init(cubeb ** context, char c - #if defined(USE_AUDIOTRACK) - int audiotrack_init(cubeb ** context, char const * context_name); +@@ -60,6 +60,9 @@ int audiotrack_init(cubeb ** context, ch + #if defined(USE_KAI) + int kai_init(cubeb ** context, char const * context_name); #endif +#if defined(USE_OSS) +int oss_init(cubeb ** context, char const * context_name); @@ -12,9 +12,9 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb.c,v 1.1 2015/07/09 15:17:34 ryoo int validate_stream_params(cubeb_stream_params stream_params) -@@ -122,6 +125,9 @@ cubeb_init(cubeb ** context, char const - #if defined(USE_AUDIOTRACK) - audiotrack_init, +@@ -129,6 +132,9 @@ cubeb_init(cubeb ** context, char const + #if defined(USE_KAI) + kai_init, #endif +#if defined(USE_OSS) + oss_init, diff --git a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c index e769e23312b..5b232542dc5 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c +++ b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libcubeb/src/cubeb_alsa.c.orig 2015-06-08 17:49:22.000000000 +0000 +--- mozilla/media/libcubeb/src/cubeb_alsa.c.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libcubeb/src/cubeb_alsa.c @@ -7,12 +7,18 @@ #undef NDEBUG @@ -170,7 +170,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) { float * b = (float *) p; -@@ -328,14 +385,64 @@ alsa_refill_stream(cubeb_stream * stm) +@@ -328,14 +385,66 @@ alsa_refill_stream(cubeb_stream * stm) b[i] *= stm->volume; } } @@ -206,15 +206,17 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 + return ERROR; + } + continue; -+#if defined(EBADFD) ++#if __linux__ + case -EBADFD: ++#else ++ case -EBADF: ++#endif + fprintf(stderr, "%s: snc_pcm_writei returned -%s, giving up\n", + __func__, "EBADFD"); + free(p); + stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR); + pthread_mutex_unlock(&stm->mutex); + return ERROR; -+#endif + } + if (wrote < 0) { + fprintf(stderr, "%s: snc_pcm_writei returned unexpected error %lld, " @@ -243,7 +245,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 } if (got != avail) { long buffer_fill = stm->buffer_size - (avail - got); -@@ -343,7 +450,7 @@ alsa_refill_stream(cubeb_stream * stm) +@@ -343,7 +452,7 @@ alsa_refill_stream(cubeb_stream * stm) /* Fill the remaining buffer with silence to guarantee one full period has been written. */ @@ -252,7 +254,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 set_timeout(&stm->drain_timeout, buffer_time * 1000); -@@ -454,26 +561,26 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -454,26 +563,26 @@ get_slave_pcm_node(snd_config_t * lconf, slave_def = NULL; @@ -284,7 +286,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 if (r < 0) { break; } -@@ -482,7 +589,7 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -482,7 +591,7 @@ get_slave_pcm_node(snd_config_t * lconf, if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -293,7 +295,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 if (r < 0) { break; } -@@ -491,7 +598,7 @@ get_slave_pcm_node(snd_config_t * lconf, +@@ -491,7 +600,7 @@ get_slave_pcm_node(snd_config_t * lconf, } while (0); if (slave_def) { @@ -302,7 +304,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 } return NULL; -@@ -514,22 +621,22 @@ init_local_config_with_workaround(char c +@@ -514,22 +623,22 @@ init_local_config_with_workaround(char c lconf = NULL; @@ -329,7 +331,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 if (r < 0) { break; } -@@ -538,7 +645,7 @@ init_local_config_with_workaround(char c +@@ -538,7 +647,7 @@ init_local_config_with_workaround(char c if (r < 0 || r > (int) sizeof(node_name)) { break; } @@ -338,7 +340,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 if (r < 0) { break; } -@@ -549,12 +656,12 @@ init_local_config_with_workaround(char c +@@ -549,12 +658,12 @@ init_local_config_with_workaround(char c } /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ @@ -353,7 +355,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 if (r < 0) { break; } -@@ -565,18 +672,18 @@ init_local_config_with_workaround(char c +@@ -565,18 +674,18 @@ init_local_config_with_workaround(char c /* Don't clobber an explicit existing handle_underrun value, set it only if it doesn't already exist. */ @@ -375,7 +377,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 if (r < 0) { break; } -@@ -584,7 +691,7 @@ init_local_config_with_workaround(char c +@@ -584,7 +693,7 @@ init_local_config_with_workaround(char c return lconf; } while (0); @@ -384,7 +386,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 return NULL; } -@@ -596,9 +703,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s +@@ -596,9 +705,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s pthread_mutex_lock(&cubeb_alsa_mutex); if (local_config) { @@ -396,7 +398,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -611,7 +718,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) +@@ -611,7 +720,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) int r; pthread_mutex_lock(&cubeb_alsa_mutex); @@ -405,7 +407,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 pthread_mutex_unlock(&cubeb_alsa_mutex); return r; -@@ -668,12 +775,65 @@ alsa_init(cubeb ** context, char const * +@@ -668,12 +777,65 @@ alsa_init(cubeb ** context, char const * pthread_attr_t attr; snd_pcm_t * dummy; @@ -472,7 +474,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 cubeb_alsa_error_handler_set = 1; } pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -681,6 +841,8 @@ alsa_init(cubeb ** context, char const * +@@ -681,6 +843,8 @@ alsa_init(cubeb ** context, char const * ctx = calloc(1, sizeof(*ctx)); assert(ctx); @@ -481,7 +483,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 ctx->ops = &alsa_ops; r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -730,7 +892,7 @@ alsa_init(cubeb ** context, char const * +@@ -730,7 +894,7 @@ alsa_init(cubeb ** context, char const * config fails with EINVAL, the PA PCM is too old for this workaround. */ if (r == -EINVAL) { pthread_mutex_lock(&cubeb_alsa_mutex); @@ -490,7 +492,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 pthread_mutex_unlock(&cubeb_alsa_mutex); ctx->local_config = NULL; } else if (r >= 0) { -@@ -769,9 +931,13 @@ alsa_destroy(cubeb * ctx) +@@ -769,9 +933,13 @@ alsa_destroy(cubeb * ctx) pthread_mutex_destroy(&ctx->mutex); free(ctx->fds); @@ -505,7 +507,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 pthread_mutex_unlock(&cubeb_alsa_mutex); } -@@ -839,7 +1005,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre +@@ -839,7 +1007,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre return CUBEB_ERROR; } @@ -514,7 +516,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 assert(r == 0); /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't -@@ -849,23 +1015,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre +@@ -849,23 +1017,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre latency = latency < 500 ? 500 : latency; } @@ -544,7 +546,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 assert((nfds_t) r == stm->nfds); r = pthread_cond_init(&stm->cond, NULL); -@@ -896,7 +1062,7 @@ alsa_stream_destroy(cubeb_stream * stm) +@@ -896,7 +1064,7 @@ alsa_stream_destroy(cubeb_stream * stm) pthread_mutex_lock(&stm->mutex); if (stm->pcm) { if (stm->state == DRAINING) { @@ -553,7 +555,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 } alsa_locked_pcm_close(stm->pcm); stm->pcm = NULL; -@@ -906,7 +1072,10 @@ alsa_stream_destroy(cubeb_stream * stm) +@@ -906,7 +1074,10 @@ alsa_stream_destroy(cubeb_stream * stm) pthread_mutex_destroy(&stm->mutex); r = pthread_cond_destroy(&stm->cond); @@ -565,7 +567,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 alsa_unregister_stream(stm); -@@ -938,12 +1107,12 @@ alsa_get_max_channel_count(cubeb * ctx, +@@ -938,12 +1109,12 @@ alsa_get_max_channel_count(cubeb * ctx, return CUBEB_ERROR; } @@ -580,12 +582,12 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 if (r < 0) { return CUBEB_ERROR; } -@@ -963,34 +1132,34 @@ alsa_get_preferred_sample_rate(cubeb * c +@@ -963,34 +1134,34 @@ alsa_get_preferred_sample_rate(cubeb * c /* get a pcm, disabling resampling, so we get a rate the * hardware/dmix/pulse/etc. supports. */ -- r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); -+ r = WRAP(snd_pcm_open)(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); +- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); ++ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); if (r < 0) { return CUBEB_ERROR; } @@ -623,7 +625,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 return CUBEB_OK; } -@@ -1014,7 +1183,7 @@ alsa_stream_start(cubeb_stream * stm) +@@ -1014,7 +1185,7 @@ alsa_stream_start(cubeb_stream * stm) ctx = stm->context; pthread_mutex_lock(&stm->mutex); @@ -632,7 +634,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 gettimeofday(&stm->last_activity, NULL); pthread_mutex_unlock(&stm->mutex); -@@ -1048,7 +1217,7 @@ alsa_stream_stop(cubeb_stream * stm) +@@ -1048,7 +1219,7 @@ alsa_stream_stop(cubeb_stream * stm) pthread_mutex_unlock(&ctx->mutex); pthread_mutex_lock(&stm->mutex); @@ -641,7 +643,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 pthread_mutex_unlock(&stm->mutex); return CUBEB_OK; -@@ -1064,14 +1233,17 @@ alsa_stream_get_position(cubeb_stream * +@@ -1064,14 +1235,17 @@ alsa_stream_get_position(cubeb_stream * pthread_mutex_lock(&stm->mutex); delay = -1; @@ -662,7 +664,7 @@ $NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.2 2015/07/09 15:17:3 *position = 0; if (stm->write_position >= (snd_pcm_uframes_t) delay) { -@@ -1090,7 +1262,7 @@ alsa_stream_get_latency(cubeb_stream * s +@@ -1090,7 +1264,7 @@ alsa_stream_get_latency(cubeb_stream * s snd_pcm_sframes_t delay; /* This function returns the delay in frames until a frame written using snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ diff --git a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c index 4ea994c7b61..70b4e8e4c03 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c +++ b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__oss.c,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__oss.c,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libcubeb/src/cubeb_oss.c.orig 2015-07-06 19:52:50.000000000 +0000 +--- mozilla/media/libcubeb/src/cubeb_oss.c.orig 2016-04-17 13:47:46.296872813 +0000 +++ mozilla/media/libcubeb/src/cubeb_oss.c @@ -0,0 +1,402 @@ +/* diff --git a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_moz.build b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_moz.build index ee3cc7eef4d..5c878087b20 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_moz.build @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libcubeb_src_moz.build,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libcubeb_src_moz.build,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libcubeb/src/moz.build.orig 2015-06-08 17:49:22.000000000 +0000 +--- mozilla/media/libcubeb/src/moz.build.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libcubeb/src/moz.build @@ -17,6 +17,12 @@ if CONFIG['MOZ_ALSA']: ] @@ -23,8 +23,8 @@ $NetBSD: patch-mozilla_media_libcubeb_src_moz.build,v 1.2 2015/07/09 15:17:34 ry +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': SOURCES += [ 'cubeb_audiounit.c', - 'cubeb_osx_run_loop.c' -@@ -65,6 +71,9 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']: + ] +@@ -64,6 +70,9 @@ if CONFIG['OS_TARGET'] == 'Android': FINAL_LIBRARY = 'gkmedias' @@ -32,14 +32,11 @@ $NetBSD: patch-mozilla_media_libcubeb_src_moz.build,v 1.2 2015/07/09 15:17:34 ry + SOURCES['cubeb_resampler.cpp'].flags += CONFIG['MOZ_SPEEX_CFLAGS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - CFLAGS += [ - '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ -@@ -73,7 +82,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk + if CONFIG['ANDROID_VERSION'] >= '17': + LOCAL_INCLUDES += [ +@@ -74,5 +83,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk + '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'], ] - ] - -+CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] - FAIL_ON_WARNINGS = True +CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] diff --git a/mail/thunderbird/patches/patch-mozilla_media_libpng_pngpriv.h b/mail/thunderbird/patches/patch-mozilla_media_libpng_pngpriv.h index 55803620fd8..061a3378c0d 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libpng_pngpriv.h +++ b/mail/thunderbird/patches/patch-mozilla_media_libpng_pngpriv.h @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_media_libpng_pngpriv.h,v 1.2 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_media_libpng_pngpriv.h,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libpng/pngpriv.h.orig 2014-07-18 00:05:38.000000000 +0000 +--- mozilla/media/libpng/pngpriv.h.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libpng/pngpriv.h -@@ -38,6 +38,7 @@ +@@ -36,6 +36,7 @@ * still required (as of 2011-05-02.) */ #define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */ diff --git a/mail/thunderbird/patches/patch-mozilla_media_libsoundtouch_src_cpu__detect__x86.cpp b/mail/thunderbird/patches/patch-mozilla_media_libsoundtouch_src_cpu__detect__x86.cpp index 9d9c07aa32e..4d657813412 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libsoundtouch_src_cpu__detect__x86.cpp +++ b/mail/thunderbird/patches/patch-mozilla_media_libsoundtouch_src_cpu__detect__x86.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libsoundtouch_src_cpu__detect__x86.cpp,v 1.2 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_media_libsoundtouch_src_cpu__detect__x86.cpp,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libsoundtouch/src/cpu_detect_x86.cpp.orig 2014-07-18 00:05:38.000000000 +0000 +--- mozilla/media/libsoundtouch/src/cpu_detect_x86.cpp.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libsoundtouch/src/cpu_detect_x86.cpp @@ -125,7 +125,9 @@ uint detectCPUextensions(void) #endif diff --git a/mail/thunderbird/patches/patch-mozilla_media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h b/mail/thunderbird/patches/patch-mozilla_media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h new file mode 100644 index 00000000000..bf520b2c7e5 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h @@ -0,0 +1,12 @@ +$NetBSD: patch-mozilla_media_libstagefright_frameworks_av_include_media_stagefright_foundation_AString.h,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h.orig 2016-04-07 21:33:21.000000000 +0000 ++++ mozilla/media/libstagefright/frameworks/av/include/media/stagefright/foundation/AString.h +@@ -18,6 +18,7 @@ + + #define A_STRING_H_ + ++#include <cctype> + #include <sys/types.h> + + namespace stagefright { diff --git a/mail/thunderbird/patches/patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp b/mail/thunderbird/patches/patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp index c31e52fc217..bde1e40da1b 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp +++ b/mail/thunderbird/patches/patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libstagefright_frameworks_av_media_libstagefright_foundation_AString.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libstagefright/frameworks/av/media/libstagefright/foundation/AString.cpp @@ -23,6 +23,17 @@ #include "ADebug.h" diff --git a/mail/thunderbird/patches/patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c b/mail/thunderbird/patches/patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c index 2a4e2674468..376bc6a620e 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c +++ b/mail/thunderbird/patches/patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libstagefright_system_core_liblog_fake__log__device.c,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libstagefright/system/core/liblog/fake_log_device.c.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/media/libstagefright/system/core/liblog/fake_log_device.c.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libstagefright/system/core/liblog/fake_log_device.c @@ -231,11 +231,11 @@ static void configureInitialState(const char tagName[kMaxTagLen]; diff --git a/mail/thunderbird/patches/patch-mozilla_media_libstagefright_system_core_liblog_logprint.c b/mail/thunderbird/patches/patch-mozilla_media_libstagefright_system_core_liblog_logprint.c index 5bd93aa8382..76660a0eeca 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libstagefright_system_core_liblog_logprint.c +++ b/mail/thunderbird/patches/patch-mozilla_media_libstagefright_system_core_liblog_logprint.c @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libstagefright_system_core_liblog_logprint.c,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libstagefright_system_core_liblog_logprint.c,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libstagefright/system/core/liblog/logprint.c.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/media/libstagefright/system/core/liblog/logprint.c.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libstagefright/system/core/liblog/logprint.c @@ -103,7 +103,7 @@ static android_LogPriority filterCharToP { diff --git a/mail/thunderbird/patches/patch-mozilla_media_libtheora_lib_arm_armcpu.c b/mail/thunderbird/patches/patch-mozilla_media_libtheora_lib_arm_armcpu.c index 25a342c44b6..fb589f1baef 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libtheora_lib_arm_armcpu.c +++ b/mail/thunderbird/patches/patch-mozilla_media_libtheora_lib_arm_armcpu.c @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libtheora_lib_arm_armcpu.c,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libtheora_lib_arm_armcpu.c,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libtheora/lib/arm/armcpu.c.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/media/libtheora/lib/arm/armcpu.c.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libtheora/lib/arm/armcpu.c @@ -107,6 +107,18 @@ ogg_uint32_t oc_cpu_flags_get(void){ return flags; diff --git a/mail/thunderbird/patches/patch-mozilla_media_libtheora_lib_info.c b/mail/thunderbird/patches/patch-mozilla_media_libtheora_lib_info.c index 50e3c4b954e..59cda061e09 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libtheora_lib_info.c +++ b/mail/thunderbird/patches/patch-mozilla_media_libtheora_lib_info.c @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libtheora_lib_info.c,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libtheora_lib_info.c,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libtheora/lib/info.c.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/media/libtheora/lib/info.c.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libtheora/lib/info.c @@ -29,7 +29,7 @@ static int oc_tagcompare(const char *_s1,const char *_s2,int _n){ diff --git a/mail/thunderbird/patches/patch-mozilla_media_libtheora_moz.build b/mail/thunderbird/patches/patch-mozilla_media_libtheora_moz.build index e789cb4976e..f2264daaeff 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libtheora_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_media_libtheora_moz.build @@ -1,10 +1,14 @@ -$NetBSD: patch-mozilla_media_libtheora_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libtheora_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libtheora/moz.build.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/media/libtheora/moz.build.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libtheora/moz.build -@@ -93,3 +93,5 @@ if CONFIG['GNU_AS']: - if CONFIG['OS_TARGET'] == 'Android': - DEFINES['__linux__'] = True +@@ -21,6 +21,9 @@ FINAL_LIBRARY = 'gkmedias' + # The encoder is currently not included. + DEFINES['THEORA_DISABLE_ENCODE'] = True +if CONFIG['MOZ_NATIVE_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] ++ + # Suppress warnings in third-party code. + if CONFIG['GNU_CC']: + CFLAGS += ['-Wno-type-limits'] diff --git a/mail/thunderbird/patches/patch-mozilla_media_libtremor_Makefile.in b/mail/thunderbird/patches/patch-mozilla_media_libtremor_Makefile.in index 186c2931aa8..fab82aed223 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libtremor_Makefile.in +++ b/mail/thunderbird/patches/patch-mozilla_media_libtremor_Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libtremor_Makefile.in,v 1.1 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_media_libtremor_Makefile.in,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libtremor/Makefile.in.orig 2014-07-27 06:20:09.000000000 +0000 +--- mozilla/media/libtremor/Makefile.in.orig 2016-04-17 13:47:46.300311547 +0000 +++ mozilla/media/libtremor/Makefile.in @@ -0,0 +1,9 @@ +# This Source Code Form is subject to the terms of the Mozilla Public diff --git a/mail/thunderbird/patches/patch-mozilla_media_libtremor_moz.build b/mail/thunderbird/patches/patch-mozilla_media_libtremor_moz.build index c50e1066a19..6bb920ffae1 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libtremor_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_media_libtremor_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_media_libtremor_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libtremor_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libtremor/moz.build.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/media/libtremor/moz.build.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libtremor/moz.build -@@ -6,3 +6,5 @@ +@@ -9,3 +9,5 @@ with Files('*'): DIRS += ['include/tremor', 'lib'] diff --git a/mail/thunderbird/patches/patch-mozilla_media_libvorbis_Makefile.in b/mail/thunderbird/patches/patch-mozilla_media_libvorbis_Makefile.in index 33cda215ef8..c9c6cea3774 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libvorbis_Makefile.in +++ b/mail/thunderbird/patches/patch-mozilla_media_libvorbis_Makefile.in @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libvorbis_Makefile.in,v 1.1 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_media_libvorbis_Makefile.in,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libvorbis/Makefile.in.orig 2014-07-27 06:20:09.000000000 +0000 +--- mozilla/media/libvorbis/Makefile.in.orig 2016-04-17 13:47:46.301306422 +0000 +++ mozilla/media/libvorbis/Makefile.in @@ -0,0 +1,9 @@ +# This Source Code Form is subject to the terms of the Mozilla Public diff --git a/mail/thunderbird/patches/patch-mozilla_media_libvorbis_lib_vorbis__info.c b/mail/thunderbird/patches/patch-mozilla_media_libvorbis_lib_vorbis__info.c index cd47d11cfd2..202e5c6397f 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libvorbis_lib_vorbis__info.c +++ b/mail/thunderbird/patches/patch-mozilla_media_libvorbis_lib_vorbis__info.c @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_media_libvorbis_lib_vorbis__info.c,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libvorbis_lib_vorbis__info.c,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libvorbis/lib/vorbis_info.c.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/media/libvorbis/lib/vorbis_info.c.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libvorbis/lib/vorbis_info.c -@@ -87,7 +87,7 @@ void vorbis_comment_add_tag(vorbis_comme +@@ -77,7 +77,7 @@ void vorbis_comment_add_tag(vorbis_comme static int tagcompare(const char *s1, const char *s2, int n){ int c=0; while(c < n){ diff --git a/mail/thunderbird/patches/patch-mozilla_media_libvorbis_moz.build b/mail/thunderbird/patches/patch-mozilla_media_libvorbis_moz.build index b87f8d4dccc..65593c5535c 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libvorbis_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_media_libvorbis_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_media_libvorbis_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libvorbis_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libvorbis/moz.build.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/media/libvorbis/moz.build.orig 2016-04-07 21:33:21.000000000 +0000 +++ mozilla/media/libvorbis/moz.build -@@ -55,3 +55,6 @@ FINAL_LIBRARY = 'gkmedias' +@@ -56,3 +56,6 @@ FINAL_LIBRARY = 'gkmedias' # Suppress warnings in third-party code. if CONFIG['GNU_CC']: CFLAGS += ['-Wno-uninitialized'] diff --git a/mail/thunderbird/patches/patch-mozilla_media_libyuv_include_libyuv_scale__row.h b/mail/thunderbird/patches/patch-mozilla_media_libyuv_include_libyuv_scale__row.h index 697a0a38776..abab917bfb9 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_libyuv_include_libyuv_scale__row.h +++ b/mail/thunderbird/patches/patch-mozilla_media_libyuv_include_libyuv_scale__row.h @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_libyuv_include_libyuv_scale__row.h,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_libyuv_include_libyuv_scale__row.h,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/libyuv/include/libyuv/scale_row.h.orig 2015-06-08 17:49:23.000000000 +0000 +--- mozilla/media/libyuv/include/libyuv/scale_row.h.orig 2016-04-07 21:33:22.000000000 +0000 +++ mozilla/media/libyuv/include/libyuv/scale_row.h @@ -219,10 +219,10 @@ void ScaleARGBFilterCols_SSSE3(uint8* ds void ScaleARGBColsUp2_SSE2(uint8* dst_argb, const uint8* src_argb, diff --git a/mail/thunderbird/patches/patch-mozilla_media_mtransport_third__party_nICEr_src_util_mbslen.c b/mail/thunderbird/patches/patch-mozilla_media_mtransport_third__party_nICEr_src_util_mbslen.c index ca371fc75b9..f7df8b8e4cd 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_mtransport_third__party_nICEr_src_util_mbslen.c +++ b/mail/thunderbird/patches/patch-mozilla_media_mtransport_third__party_nICEr_src_util_mbslen.c @@ -1,9 +1,9 @@ -$NetBSD: patch-mozilla_media_mtransport_third__party_nICEr_src_util_mbslen.c,v 1.2 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_media_mtransport_third__party_nICEr_src_util_mbslen.c,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c.orig 2014-07-18 00:05:39.000000000 +0000 +--- mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c.orig 2016-04-07 21:33:22.000000000 +0000 +++ mozilla/media/mtransport/third_party/nICEr/src/util/mbslen.c -@@ -54,6 +54,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE - # endif +@@ -47,6 +47,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE + #define HAVE_XLOCALE #endif +#ifdef __DragonFly__ diff --git a/mail/thunderbird/patches/patch-mozilla_media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h b/mail/thunderbird/patches/patch-mozilla_media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h index fb6d33642b6..2354370971c 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h +++ b/mail/thunderbird/patches/patch-mozilla_media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.2 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_media_mtransport_third__party_nrappkit_src_port_generic_include_sys_queue.h,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.orig 2014-07-18 00:05:39.000000000 +0000 +--- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.orig 2016-04-07 21:33:22.000000000 +0000 +++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h @@ -30,7 +30,13 @@ * $FreeBSD: src/sys/sys/queue.h,v 1.58 2004/04/07 04:19:49 imp Exp $ diff --git a/mail/thunderbird/patches/patch-mozilla_media_openmax__dl_dl_api_armCOMM__s.h b/mail/thunderbird/patches/patch-mozilla_media_openmax__dl_dl_api_armCOMM__s.h new file mode 100644 index 00000000000..d5b8d328ef3 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_media_openmax__dl_dl_api_armCOMM__s.h @@ -0,0 +1,37 @@ +$NetBSD: patch-mozilla_media_openmax__dl_dl_api_armCOMM__s.h,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/media/openmax_dl/dl/api/armCOMM_s.h.orig 2016-04-07 21:33:22.000000000 +0000 ++++ mozilla/media/openmax_dl/dl/api/armCOMM_s.h +@@ -11,6 +11,12 @@ + @// This file was originally licensed as follows. It has been + @// relicensed with permission from the copyright holders. + @// ++ ++#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__) ++#define UNWIND ++#else ++#define UNWIND @ ++#endif + + @// + @// File Name: armCOMM_s.h +@@ -175,7 +181,8 @@ + .object_arch armv4 + .align 2 + \name : +-.fnstart ++ .cfi_startproc ++ UNWIND .fnstart + @ Save specified R registers + _M_GETRREGLIST \rreg + _M_PUSH_RREG +@@ -202,7 +209,8 @@ + .endif + @ Restore any saved R or D registers. + _M_RET +- .fnend ++ UNWIND .fnend ++ .cfi_endproc + .endfunc + @ Reset the global stack tracking variables back to their + @ initial values. diff --git a/mail/thunderbird/patches/patch-mozilla_media_webrtc_signaling_test_moz.build b/mail/thunderbird/patches/patch-mozilla_media_webrtc_signaling_test_common.build index fa42ba7fca0..3cc1f56a82b 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_webrtc_signaling_test_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_media_webrtc_signaling_test_common.build @@ -1,10 +1,10 @@ -$NetBSD: patch-mozilla_media_webrtc_signaling_test_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_signaling_test_common.build,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/webrtc/signaling/test/moz.build.orig 2015-06-08 17:49:23.000000000 +0000 -+++ mozilla/media/webrtc/signaling/test/moz.build -@@ -109,15 +109,19 @@ if CONFIG['JS_SHARED_LIBRARY']: - 'js', - ] +--- mozilla/media/webrtc/signaling/test/common.build.orig 2016-04-07 21:33:22.000000000 +0000 ++++ mozilla/media/webrtc/signaling/test/common.build +@@ -99,15 +99,19 @@ if CONFIG['JS_SHARED_LIBRARY']: + + USE_LIBS += ['mozglue'] +OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS'] OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] diff --git a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi index 7f5b409011d..e1d1c29c083 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi +++ b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi,v 1.2 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_build_common.gypi,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/build/common.gypi.orig 2014-07-18 00:05:42.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/build/common.gypi.orig 2016-04-07 21:33:23.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/build/common.gypi -@@ -256,7 +256,7 @@ +@@ -335,7 +335,7 @@ }], ['OS=="dragonfly" or OS=="netbsd"', { 'defines': [ diff --git a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi deleted file mode 100644 index c3c414b6cbb..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_codecs_opus_opus.gypi,v 1.2 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi.orig 2015-06-08 17:49:24.000000000 +0000 -+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi -@@ -17,18 +17,11 @@ - 'conditions': [ - ['build_with_mozilla==1', { - # Mozilla provides its own build of the opus library. -- 'include_dirs': [ -- '/media/libopus/include', -- '/media/libopus/src', -- '/media/libopus/celt', -+ 'cflags_mozilla': [ -+ '$(filter -I%, $(MOZ_CELT_CFLAGS))/celt', -+ '$(MOZ_OPUS_CFLAGS)', -+ '$(filter -I%, $(MOZ_OPUS_CFLAGS))/../src', - ], -- 'direct_dependent_settings': { -- 'include_dirs': [ -- '/media/libopus/include', -- '/media/libopus/src', -- '/media/libopus/celt', -- ], -- }, - }, { - 'dependencies': [ - '<(DEPTH)/third_party/opus/opus.gyp:opus' diff --git a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi index ecaa697f6ba..862326e9b57 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi +++ b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_audio__coding_neteq_neteq.gypi,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi.orig 2015-06-08 17:49:24.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi.orig 2016-04-07 21:33:23.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi -@@ -84,19 +84,11 @@ +@@ -85,19 +85,11 @@ ], }], ['build_with_mozilla==1', { diff --git a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc index 3b2f6451777..8bf47e42480 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc +++ b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.cc,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc.orig 2015-06-08 17:49:25.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc @@ -18,7 +18,7 @@ ScreenCapturer* ScreenCapturer::Create() return Create(DesktopCaptureOptions::CreateDefault()); diff --git a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h index 9037405c8e8..c1a656882f5 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h +++ b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_desktop__capture_screen__capturer.h,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h.orig 2015-06-08 17:49:25.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h @@ -63,7 +63,7 @@ class ScreenCapturer : public DesktopCap static ScreenCapturer* Create(const DesktopCaptureOptions& options); diff --git a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc index 068437b8691..e7ae8c05b71 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc +++ b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.2 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2014-07-18 00:05:42.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc @@ -25,10 +25,21 @@ #else diff --git a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc index 17b6db4e235..df4ee284b69 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc +++ b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.2 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2014-07-18 00:05:42.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/video_capture_linux.cc @@ -25,6 +25,9 @@ #else @@ -12,8 +12,8 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_linux_vi #include <new> -@@ -34,6 +37,15 @@ - #include "webrtc/system_wrappers/interface/thread_wrapper.h" +@@ -33,6 +36,15 @@ + #include "webrtc/system_wrappers/interface/ref_count.h" #include "webrtc/system_wrappers/interface/trace.h" +#ifdef HAVE_LIBV4L2 diff --git a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi index 1d8c696c8c3..ec8ce153b2b 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi +++ b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2015-06-08 17:49:25.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi @@ -7,6 +7,9 @@ # be found in the AUTHORS file in the root of the source tree. @@ -12,10 +12,12 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__c 'targets': [ { # Note this library is missing an implementation for the video capture. -@@ -69,6 +72,19 @@ - 'linux/video_capture_linux.cc', - 'linux/video_capture_linux.h', +@@ -64,8 +67,32 @@ + 'video_capture_module', + '<(webrtc_root)/common.gyp:webrtc_common', ], +- 'cflags_mozilla': [ +- '$(NSPR_CFLAGS)', + 'conditions': [ + ['use_libv4l2==1', { + 'defines': [ @@ -29,6 +31,19 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_modules_video__capture_video__c + ], + }], + ], - }], # linux - ['OS=="mac"', { - 'sources': [ ++ }], # linux ++ ['OS=="mac"', { ++ 'sources': [ ++ 'mac/qtkit/video_capture_qtkit.h', ++ 'mac/qtkit/video_capture_qtkit.mm', ++ 'mac/qtkit/video_capture_qtkit_info.h', ++ 'mac/qtkit/video_capture_qtkit_info.mm', ++ 'mac/qtkit/video_capture_qtkit_info_objc.h', ++ 'mac/qtkit/video_capture_qtkit_info_objc.mm', ++ 'mac/qtkit/video_capture_qtkit_objc.h', ++ 'mac/qtkit/video_capture_qtkit_objc.mm', ++ 'mac/qtkit/video_capture_qtkit_utility.h', ++ 'mac/video_capture_mac.mm', + ], + 'conditions': [ + ['include_v4l2_video_capture==1', { diff --git a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp index 44ddf443d3d..7fdbc688d48 100644 --- a/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp +++ b/mail/thunderbird/patches/patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp,v 1.3 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreadsortlib_spreadsort.hpp,v 1.4 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig 2015-06-08 17:49:25.000000000 +0000 +--- mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig 2016-04-07 21:33:24.000000000 +0000 +++ mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp @@ -14,6 +14,13 @@ Cygwin fix provided by:
Scott McMurray
@@ -16,7 +16,7 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreads #ifndef BOOST_SPREAD_SORT_H
#define BOOST_SPREAD_SORT_H
#include <algorithm>
-@@ -21,6 +28,13 @@ Scott McMurray
+@@ -21,10 +28,24 @@ Scott McMurray
#include <vector>
#include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"
@@ -30,3 +30,14 @@ $NetBSD: patch-mozilla_media_webrtc_trunk_webrtc_system__wrappers_source_spreads #ifdef getchar
#undef getchar
#endif
+
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 900506
++# define getchar boost_getchar
++# endif
++#endif
++
+ namespace boost {
+ namespace detail {
+ //This only works on unsigned data types
diff --git a/mail/thunderbird/patches/patch-mozilla_memory_build_mozjemalloc__compat.c b/mail/thunderbird/patches/patch-mozilla_memory_build_mozjemalloc__compat.c index bbe91049b92..7b6974e5112 100644 --- a/mail/thunderbird/patches/patch-mozilla_memory_build_mozjemalloc__compat.c +++ b/mail/thunderbird/patches/patch-mozilla_memory_build_mozjemalloc__compat.c @@ -1,9 +1,9 @@ -$NetBSD: patch-mozilla_memory_build_mozjemalloc__compat.c,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_memory_build_mozjemalloc__compat.c,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/memory/build/mozjemalloc_compat.c.orig 2015-06-08 17:49:26.000000000 +0000 +--- mozilla/memory/build/mozjemalloc_compat.c.orig 2016-04-07 21:33:25.000000000 +0000 +++ mozilla/memory/build/mozjemalloc_compat.c -@@ -131,6 +131,48 @@ compute_bin_unused(unsigned int narenas) - return bin_unused; +@@ -131,6 +131,48 @@ compute_bin_unused_and_bookkeeping(jemal + stats->bin_unused = bin_unused; } +static size_t diff --git a/mail/thunderbird/patches/patch-mozilla_memory_jemalloc_Makefile.in b/mail/thunderbird/patches/patch-mozilla_memory_jemalloc_Makefile.in deleted file mode 100644 index b254ae55891..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_memory_jemalloc_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-mozilla_memory_jemalloc_Makefile.in,v 1.1 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/memory/jemalloc/Makefile.in.orig 2014-07-18 00:05:43.000000000 +0000 -+++ mozilla/memory/jemalloc/Makefile.in -@@ -12,3 +12,7 @@ include $(topsrcdir)/config/rules.mk - ifdef GNU_CC - CFLAGS += -std=gnu99 - endif -+ -+# XXX startup crash workaround for gcc47 on amd64 -+jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS)) -+jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS= diff --git a/mail/thunderbird/patches/patch-mozilla_memory_jemalloc_src_configure b/mail/thunderbird/patches/patch-mozilla_memory_jemalloc_src_configure deleted file mode 100644 index 8602ac2847d..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_memory_jemalloc_src_configure +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_memory_jemalloc_src_configure,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/memory/jemalloc/src/configure.orig 2015-06-08 17:49:26.000000000 +0000 -+++ mozilla/memory/jemalloc/src/configure -@@ -6566,7 +6566,7 @@ else - LG_PAGE="detect" - fi - --if test "x$LG_PAGE" == "xdetect"; then -+if test "x$LG_PAGE" = "xdetect"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LG_PAGE" >&5 - $as_echo_n "checking LG_PAGE... " >&6; } - if ${je_cv_lg_page+:} false; then : diff --git a/mail/thunderbird/patches/patch-mozilla_memory_mozalloc_mozalloc__abort.cpp b/mail/thunderbird/patches/patch-mozilla_memory_mozalloc_mozalloc__abort.cpp index ce15dd61027..cc6269a9912 100644 --- a/mail/thunderbird/patches/patch-mozilla_memory_mozalloc_mozalloc__abort.cpp +++ b/mail/thunderbird/patches/patch-mozilla_memory_mozalloc_mozalloc__abort.cpp @@ -1,11 +1,11 @@ -$NetBSD: patch-mozilla_memory_mozalloc_mozalloc__abort.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_memory_mozalloc_mozalloc__abort.cpp,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/memory/mozalloc/mozalloc_abort.cpp.orig 2015-06-08 17:49:26.000000000 +0000 +--- mozilla/memory/mozalloc/mozalloc_abort.cpp.orig 2016-04-07 21:33:25.000000000 +0000 +++ mozilla/memory/mozalloc/mozalloc_abort.cpp -@@ -63,7 +63,11 @@ void fillAbortMessage(char (&msg)[N], ui - // Define abort() here, so that it is used instead of the system abort(). This - // lets us control the behavior when aborting, in order to get better results - // on *NIX platforms. See mozalloc_abort for details. +@@ -68,7 +68,11 @@ void fillAbortMessage(char (&msg)[N], ui + // + // That segmentation fault will be interpreted as another bug by ASan and as a + // result, ASan will just exit(1) instead of aborting. +#if defined(SOLARIS) +void std::abort(void) +#else diff --git a/mail/thunderbird/patches/patch-mozilla_memory_volatile_VolatileBufferOSX.cpp b/mail/thunderbird/patches/patch-mozilla_memory_volatile_VolatileBufferOSX.cpp index 4c5264ce53d..d3217aa9d87 100644 --- a/mail/thunderbird/patches/patch-mozilla_memory_volatile_VolatileBufferOSX.cpp +++ b/mail/thunderbird/patches/patch-mozilla_memory_volatile_VolatileBufferOSX.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_memory_volatile_VolatileBufferOSX.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_memory_volatile_VolatileBufferOSX.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/memory/volatile/VolatileBufferOSX.cpp.orig 2015-06-08 17:49:26.000000000 +0000 +--- mozilla/memory/volatile/VolatileBufferOSX.cpp.orig 2016-04-07 21:33:25.000000000 +0000 +++ mozilla/memory/volatile/VolatileBufferOSX.cpp @@ -47,7 +47,14 @@ VolatileBuffer::Init(size_t aSize, size_ } diff --git a/mail/thunderbird/patches/patch-mozilla_mfbt_Alignment.h b/mail/thunderbird/patches/patch-mozilla_mfbt_Alignment.h deleted file mode 100644 index 77dc4880794..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_mfbt_Alignment.h +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-mozilla_mfbt_Alignment.h,v 1.1 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/mfbt/Alignment.h.orig 2014-07-18 00:05:43.000000000 +0000 -+++ mozilla/mfbt/Alignment.h -@@ -9,11 +9,20 @@ - #ifndef mozilla_Alignment_h - #define mozilla_Alignment_h - -+#include "mozilla/Attributes.h" -+ - #include <stddef.h> - #include <stdint.h> - - namespace mozilla { - -+#if defined(MOZ_HAVE_CXX11_ALIGNAS) -+#define MOZ_ALIGNOF(T) alignof(T) -+#elif defined(__GNUC__) -+#define MOZ_ALIGNOF(T) __alignof__(T) -+#elif defined(_MSC_VER) -+#define MOZ_ALIGNOF(T) __alignof(T) -+#else - /* - * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many - * bytes of alignment a given type needs. -@@ -32,6 +41,7 @@ class AlignmentFinder - }; - - #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment -+#endif - - /* - * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types. -@@ -43,7 +53,10 @@ class AlignmentFinder - * will declare a two-character array |arr| aligned to 8 bytes. - */ - --#if defined(__GNUC__) -+#if defined(MOZ_HAVE_CXX11_ALIGNAS) -+# define MOZ_ALIGNED_DECL(_type, _align) \ -+ alignas(_align) _type -+#elif defined(__GNUC__) - # define MOZ_ALIGNED_DECL(_type, _align) \ - _type __attribute__((aligned(_align))) - #elif defined(_MSC_VER) diff --git a/mail/thunderbird/patches/patch-mozilla_mfbt_Attributes.h b/mail/thunderbird/patches/patch-mozilla_mfbt_Attributes.h index d828dfb6d20..3a7b929ffbb 100644 --- a/mail/thunderbird/patches/patch-mozilla_mfbt_Attributes.h +++ b/mail/thunderbird/patches/patch-mozilla_mfbt_Attributes.h @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_mfbt_Attributes.h,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_mfbt_Attributes.h,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/mfbt/Attributes.h.orig 2015-06-08 17:49:26.000000000 +0000 +--- mozilla/mfbt/Attributes.h.orig 2016-04-07 21:33:25.000000000 +0000 +++ mozilla/mfbt/Attributes.h @@ -50,6 +50,7 @@ * don't indicate support for them here, due to @@ -9,8 +9,8 @@ $NetBSD: patch-mozilla_mfbt_Attributes.h,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +# define MOZ_HAVE_CXX11_ALIGNAS # define MOZ_HAVE_NEVER_INLINE __declspec(noinline) # define MOZ_HAVE_NORETURN __declspec(noreturn) - # ifdef __clang__ -@@ -70,6 +71,9 @@ + # if _MSC_VER >= 1900 +@@ -75,6 +76,9 @@ # ifndef __has_extension # define __has_extension __has_feature /* compatibility, for older versions of clang */ # endif @@ -20,13 +20,11 @@ $NetBSD: patch-mozilla_mfbt_Attributes.h,v 1.2 2015/07/09 15:17:34 ryoon Exp $ # if __has_extension(cxx_constexpr) # define MOZ_HAVE_CXX11_CONSTEXPR # endif -@@ -84,6 +88,9 @@ - # endif - #elif defined(__GNUC__) +@@ -91,6 +95,7 @@ # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L -+# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0) + # define MOZ_HAVE_CXX11_CONSTEXPR + # if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0) +# define MOZ_HAVE_CXX11_ALIGNAS -+# endif - # define MOZ_HAVE_CXX11_CONSTEXPR - # define MOZ_HAVE_EXPLICIT_CONVERSION - # endif + # define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES + # endif + # define MOZ_HAVE_EXPLICIT_CONVERSION diff --git a/mail/thunderbird/patches/patch-mozilla_mfbt_Poison.cpp b/mail/thunderbird/patches/patch-mozilla_mfbt_Poison.cpp index 462b996257b..6c2650bb787 100644 --- a/mail/thunderbird/patches/patch-mozilla_mfbt_Poison.cpp +++ b/mail/thunderbird/patches/patch-mozilla_mfbt_Poison.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_mfbt_Poison.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_mfbt_Poison.cpp,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/mfbt/Poison.cpp.orig 2015-06-08 17:49:26.000000000 +0000 +--- mozilla/mfbt/Poison.cpp.orig 2016-04-07 21:33:25.000000000 +0000 +++ mozilla/mfbt/Poison.cpp @@ -129,7 +129,11 @@ ReleaseRegion(void* aRegion, uintptr_t a static bool diff --git a/mail/thunderbird/patches/patch-mozilla_mobile_android_installer_Makefile.in b/mail/thunderbird/patches/patch-mozilla_mobile_android_installer_Makefile.in deleted file mode 100644 index c052762b370..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_mobile_android_installer_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mozilla_mobile_android_installer_Makefile.in,v 1.1 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/mobile/android/installer/Makefile.in.orig 2014-07-18 00:05:44.000000000 +0000 -+++ mozilla/mobile/android/installer/Makefile.in -@@ -41,6 +41,10 @@ BINPATH = bin - endif - DEFINES += -DBINPATH=$(BINPATH) - -+ifdef MOZ_DEBUG -+DEFINES += -DMOZ_DEBUG=1 -+endif -+ - ifdef ENABLE_MARIONETTE - DEFINES += -DENABLE_MARIONETTE=1 - endif diff --git a/mail/thunderbird/patches/patch-mozilla_mobile_android_installer_package-manifest.in b/mail/thunderbird/patches/patch-mozilla_mobile_android_installer_package-manifest.in deleted file mode 100644 index 238e221aee2..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_mobile_android_installer_package-manifest.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_mobile_android_installer_package-manifest.in,v 1.1 2014/07/27 20:04:59 ryoon Exp $ - ---- mozilla/mobile/android/installer/package-manifest.in.orig 2014-07-18 00:05:44.000000000 +0000 -+++ mozilla/mobile/android/installer/package-manifest.in -@@ -424,7 +424,7 @@ - @BINPATH@/components/dom_webspeechsynth.xpt - #endif - --#ifdef MOZ_DEBUG -+#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) - @BINPATH@/components/TestInterfaceJS.js - @BINPATH@/components/TestInterfaceJS.manifest - #endif diff --git a/mail/thunderbird/patches/patch-mozilla_modules_libjar_nsZipArchive.cpp b/mail/thunderbird/patches/patch-mozilla_modules_libjar_nsZipArchive.cpp index f8e9df04bd6..6312d62f945 100644 --- a/mail/thunderbird/patches/patch-mozilla_modules_libjar_nsZipArchive.cpp +++ b/mail/thunderbird/patches/patch-mozilla_modules_libjar_nsZipArchive.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_modules_libjar_nsZipArchive.cpp,v 1.1 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_modules_libjar_nsZipArchive.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/modules/libjar/nsZipArchive.cpp.orig 2013-10-23 22:09:14.000000000 +0000 +--- mozilla/modules/libjar/nsZipArchive.cpp.orig 2016-04-07 21:33:29.000000000 +0000 +++ mozilla/modules/libjar/nsZipArchive.cpp -@@ -590,7 +590,9 @@ MOZ_WIN_MEM_TRY_BEGIN +@@ -626,7 +626,9 @@ MOZ_WIN_MEM_TRY_BEGIN // Success means optimized jar layout from bug 559961 is in effect uint32_t readaheadLength = xtolong(startp); if (readaheadLength) { diff --git a/mail/thunderbird/patches/patch-mozilla_modules_libpref_init_all.js b/mail/thunderbird/patches/patch-mozilla_modules_libpref_init_all.js new file mode 100644 index 00000000000..3f0b05c0929 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_modules_libpref_init_all.js @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_modules_libpref_init_all.js,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/modules/libpref/init/all.js.orig 2016-04-07 21:33:29.000000000 +0000 ++++ mozilla/modules/libpref/init/all.js +@@ -4332,7 +4332,7 @@ pref("layers.max-active", -1); + pref("layers.tiles.adjust", true); + + // Set the default values, and then override per-platform as needed +-pref("layers.offmainthreadcomposition.enabled", true); ++pref("layers.offmainthreadcomposition.enabled", false); + // Compositor target frame rate. NOTE: If vsync is enabled the compositor + // frame rate will still be capped. + // -1 -> default (match layout.frame_rate or 60 FPS) diff --git a/mail/thunderbird/patches/patch-mozilla_mozglue_build_arm.cpp b/mail/thunderbird/patches/patch-mozilla_mozglue_build_arm.cpp new file mode 100644 index 00000000000..e74d5c77e34 --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_mozglue_build_arm.cpp @@ -0,0 +1,57 @@ +$NetBSD: patch-mozilla_mozglue_build_arm.cpp,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/mozglue/build/arm.cpp.orig 2016-04-07 21:33:29.000000000 +0000 ++++ mozilla/mozglue/build/arm.cpp +@@ -102,10 +102,13 @@ check_neon(void) + } + # endif // !MOZILLA_PRESUME_NEON + +-# elif defined(__linux__) || defined(ANDROID) ++# elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) + # include <stdio.h> + # include <stdlib.h> + # include <string.h> ++# if defined(__NetBSD__) ++# include <sys/sysctl.h> ++# endif + + enum{ + MOZILLA_HAS_EDSP_FLAG=1, +@@ -114,6 +117,29 @@ enum{ + MOZILLA_HAS_NEON_FLAG=8 + }; + ++# if defined(__NetBSD__) ++static unsigned ++get_arm_cpu_flags(void) ++{ ++ unsigned flags = 0; ++ size_t len; ++ int flag; ++ ++ len = sizeof(flag); ++ if (sysctlbyname("machdep.simdex_present", &flag, &len, NULL, 0) == 0 && flag) { ++ flags |= MOZILLA_HAS_ARMV6_FLAG; ++ flags |= MOZILLA_HAS_EDSP_FLAG; ++ } ++ ++ len = sizeof(flag); ++ if (sysctlbyname("machdep.neon_present", &flag, &len, NULL, 0) == 0 && flag) { ++ flags |= MOZILLA_HAS_ARMV7_FLAG; ++ flags |= MOZILLA_HAS_NEON_FLAG; ++ } ++ ++ return flags; ++} ++# else + static unsigned + get_arm_cpu_flags(void) + { +@@ -178,6 +204,7 @@ get_arm_cpu_flags(void) + } + return flags; + } ++# endif + + // Cache a local copy so we only have to read /proc/cpuinfo once. + static unsigned arm_cpu_flags = get_arm_cpu_flags(); diff --git a/mail/thunderbird/patches/patch-mozilla_mozglue_build_arm.h b/mail/thunderbird/patches/patch-mozilla_mozglue_build_arm.h new file mode 100644 index 00000000000..f274ae1bdcc --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_mozglue_build_arm.h @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_mozglue_build_arm.h,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/mozglue/build/arm.h.orig 2016-04-07 21:33:29.000000000 +0000 ++++ mozilla/mozglue/build/arm.h +@@ -76,7 +76,7 @@ + # endif + + // Currently we only have CPU detection for Linux via /proc/cpuinfo +-# if defined(__linux__) || defined(ANDROID) ++# if defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) + # define MOZILLA_ARM_HAVE_CPUID_DETECTION 1 + # endif + diff --git a/mail/thunderbird/patches/patch-mozilla_netwerk_base_nsNetUtil.h b/mail/thunderbird/patches/patch-mozilla_netwerk_base_nsNetUtil.h deleted file mode 100644 index c685234f61f..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_netwerk_base_nsNetUtil.h +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-mozilla_netwerk_base_nsNetUtil.h,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/netwerk/base/nsNetUtil.h.orig 2015-06-08 17:49:29.000000000 +0000 -+++ mozilla/netwerk/base/nsNetUtil.h -@@ -13,6 +13,7 @@ - #include "nsMemory.h" - #include "nsCOMPtr.h" - #include "prio.h" // for read/write flags, permissions, etc. -+#include "prnetdb.h" - #include "nsHashKeys.h" - - #include "plstr.h" -@@ -2828,6 +2829,26 @@ NS_IsSrcdocChannel(nsIChannel *aChannel) - bool NS_IsReasonableHTTPHeaderValue(const nsACString& aValue); - - /** -+ * Return a host endian value decoded from network byte order, -+ * accessed in an alignement safe way. -+ */ -+inline uint16_t NS_decodeN16(const void *bytes) -+{ -+ uint16_t tmp; -+ -+ memcpy(&tmp, bytes, sizeof tmp); -+ return PR_ntohs(tmp); -+} -+ -+inline uint32_t NS_decodeN32(const void *bytes) -+{ -+ uint32_t tmp; -+ -+ memcpy(&tmp, bytes, sizeof tmp); -+ return PR_ntohl(tmp); -+} -+ -+/** - * Return true if the given string is a valid HTTP token per RFC 2616 section - * 2.2. - */ diff --git a/mail/thunderbird/patches/patch-mozilla_netwerk_dns_moz.build b/mail/thunderbird/patches/patch-mozilla_netwerk_dns_moz.build index b08e1ef8ea8..e260aec39e5 100644 --- a/mail/thunderbird/patches/patch-mozilla_netwerk_dns_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_netwerk_dns_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_netwerk_dns_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_netwerk_dns_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/netwerk/dns/moz.build.orig 2015-06-08 17:49:29.000000000 +0000 +--- mozilla/netwerk/dns/moz.build.orig 2016-04-07 21:33:29.000000000 +0000 +++ mozilla/netwerk/dns/moz.build -@@ -68,5 +68,8 @@ LOCAL_INCLUDES += [ +@@ -66,6 +66,9 @@ LOCAL_INCLUDES += [ '/netwerk/base', ] @@ -10,4 +10,5 @@ $NetBSD: patch-mozilla_netwerk_dns_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19': - CXXFLAGS += ['-I%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']] + LOCAL_INCLUDES += ['%' + '%s/bionic/libc/dns/include' % CONFIG['ANDROID_SOURCE']] + diff --git a/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_Http2Session.cpp b/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_Http2Session.cpp deleted file mode 100644 index 23784fcb712..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_Http2Session.cpp +++ /dev/null @@ -1,91 +0,0 @@ -$NetBSD: patch-mozilla_netwerk_protocol_http_Http2Session.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/netwerk/protocol/http/Http2Session.cpp.orig 2015-06-08 17:49:29.000000000 +0000 -+++ mozilla/netwerk/protocol/http/Http2Session.cpp -@@ -32,7 +32,6 @@ - #include "nsStandardURL.h" - #include "nsURLHelper.h" - #include "prprf.h" --#include "prnetdb.h" - #include "sslt.h" - - #ifdef DEBUG -@@ -1385,7 +1384,7 @@ Http2Session::RecvPriority(Http2Session - return rv; - - uint32_t newPriorityDependency = -- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes)); -+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes); - bool exclusive = !!(newPriorityDependency & 0x80000000); - newPriorityDependency &= 0x7fffffff; - uint8_t newPriorityWeight = *(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4); -@@ -1416,7 +1415,7 @@ Http2Session::RecvRstStream(Http2Session - } - - self->mDownstreamRstReason = -- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes)); -+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes); - - LOG3(("Http2Session::RecvRstStream %p RST_STREAM Reason Code %u ID %x\n", - self, self->mDownstreamRstReason, self->mInputFrameID)); -@@ -1477,8 +1476,8 @@ Http2Session::RecvSettings(Http2Session - uint8_t *setting = reinterpret_cast<uint8_t *> - (self->mInputFrameBuffer.get()) + kFrameHeaderBytes + index * 6; - -- uint16_t id = PR_ntohs(*reinterpret_cast<uint16_t *>(setting)); -- uint32_t value = PR_ntohl(*reinterpret_cast<uint32_t *>(setting + 2)); -+ uint16_t id = NS_decodeN16(setting); -+ uint32_t value = NS_decodeN32(setting + 2); - LOG3(("Settings ID %u, Value %u", id, value)); - - switch (id) -@@ -1565,7 +1564,7 @@ Http2Session::RecvPushPromise(Http2Sessi - } - promiseLen = 4; - promisedID = -- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes + paddingControlBytes)); -+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes + paddingControlBytes); - promisedID &= 0x7fffffff; - } - -@@ -1828,11 +1827,11 @@ Http2Session::RecvGoAway(Http2Session *s - - self->mShouldGoAway = true; - self->mGoAwayID = -- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes)); -+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes); - self->mGoAwayID &= 0x7fffffff; - self->mCleanShutdown = true; - uint32_t statusCode = -- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4)); -+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4); - - // Find streams greater than the last-good ID and mark them for deletion - // in the mGoAwayStreamsToRestart queue with the GoAwayEnumerator. The -@@ -1906,7 +1905,7 @@ Http2Session::RecvWindowUpdate(Http2Sess - } - - uint32_t delta = -- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes)); -+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes); - delta &= 0x7fffffff; - - LOG3(("Http2Session::RecvWindowUpdate %p len=%d Stream 0x%X.\n", -@@ -2543,7 +2542,7 @@ Http2Session::WriteSegments(nsAHttpSegme - - // 3 bytes of length, 1 type byte, 1 flag byte, 1 unused bit, 31 bits of ID - uint8_t totallyWastedByte = mInputFrameBuffer.get()[0]; -- mInputFrameDataSize = PR_ntohs(*reinterpret_cast<uint16_t *>(mInputFrameBuffer.get() + 1)); -+ mInputFrameDataSize = NS_decodeN16(mInputFrameBuffer.get() + 1); - if (totallyWastedByte || (mInputFrameDataSize > kMaxFrameData)) { - LOG3(("Got frame too large 0x%02X%04X", totallyWastedByte, mInputFrameDataSize)); - RETURN_SESSION_ERROR(this, PROTOCOL_ERROR); -@@ -2551,7 +2550,7 @@ Http2Session::WriteSegments(nsAHttpSegme - mInputFrameType = *reinterpret_cast<uint8_t *>(mInputFrameBuffer.get() + kFrameLengthBytes); - mInputFrameFlags = *reinterpret_cast<uint8_t *>(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes); - mInputFrameID = -- PR_ntohl(*reinterpret_cast<uint32_t *>(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes + kFrameFlagBytes)); -+ NS_decodeN32(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes + kFrameFlagBytes); - mInputFrameID &= 0x7fffffff; - mInputFrameDataRead = 0; - diff --git a/mail/thunderbird/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp b/mail/thunderbird/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp deleted file mode 100644 index 0c5f0a7cf0c..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent.cpp,v 1.2 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig 2015-06-08 17:49:16.000000000 +0000 -+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp -@@ -43,6 +43,7 @@ - #include "nss.h" - #include "pkix/pkixnss.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "secerr.h" diff --git a/mail/thunderbird/patches/patch-bg b/mail/thunderbird/patches/patch-mozilla_storage_SQLiteMutex.h index 0ca96ca62c7..ac15b742ae8 100644 --- a/mail/thunderbird/patches/patch-bg +++ b/mail/thunderbird/patches/patch-mozilla_storage_SQLiteMutex.h @@ -1,8 +1,8 @@ -$NetBSD: patch-bg,v 1.6 2014/07/27 20:04:59 ryoon Exp $ +$NetBSD: patch-mozilla_storage_SQLiteMutex.h,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/storage/src/SQLiteMutex.h.orig 2014-07-18 00:05:51.000000000 +0000 -+++ mozilla/storage/src/SQLiteMutex.h -@@ -108,15 +108,19 @@ public: +--- mozilla/storage/SQLiteMutex.h.orig 2016-04-07 21:33:16.000000000 +0000 ++++ mozilla/storage/SQLiteMutex.h +@@ -107,15 +107,19 @@ public: void assertCurrentThreadOwns() { NS_ASSERTION(mMutex, "No mutex associated with this wrapper!"); diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm b/mail/thunderbird/patches/patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm deleted file mode 100644 index 732a04072b8..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm,v 1.1 2014/07/27 20:05:00 ryoon Exp $ - ---- mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm.orig 2014-07-18 00:05:52.000000000 +0000 -+++ mozilla/toolkit/components/osfile/modules/osfile_unix_back.jsm -@@ -228,8 +228,8 @@ - let statvfs = new SharedAll.HollowStructure("statvfs", - Const.OSFILE_SIZEOF_STATVFS); - -- statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BSIZE, -- "f_bsize", Type.unsigned_long.implementation); -+ statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_FRSIZE, -+ "f_frsize", Type.unsigned_long.implementation); - statvfs.add_field_at(Const.OSFILE_OFFSETOF_STATVFS_F_BAVAIL, - "f_bavail", Type.fsblkcnt_t.implementation); - -@@ -632,21 +632,22 @@ - return Stat.fxstat(ver, fd, buf); - }; - } else if (OS.Constants.Sys.Name == "NetBSD") { -- // NetBSD 5.0 and newer -- libc.declareLazyFFI(SysFile, "stat", -- "__stat50", ctypes.default_abi, -+ // NetBSD 5.0 uses *30, and netbsd-6 uses *50 -+ let v = OS.Constants.libc.OSFILE_SIZEOF_TIME_T < 8 ? "30" : "50"; -+ libc.declareLazyFFI(SysFile, "stat", -+ "__stat"+v, ctypes.default_abi, - /*return*/ Type.negativeone_or_nothing, - /*path*/ Type.path, - /*buf*/ Type.stat.out_ptr - ); - libc.declareLazyFFI(SysFile, "lstat", -- "__lstat50", ctypes.default_abi, -+ "__lstat"+v, ctypes.default_abi, - /*return*/ Type.negativeone_or_nothing, - /*path*/ Type.path, - /*buf*/ Type.stat.out_ptr - ); -- libc.declareLazyFFI(SysFile, "fstat", -- "__fstat50", ctypes.default_abi, -+ libc.declareLazyFFI(SysFile, "fstat", libc, -+ "__fstat"+v, ctypes.default_abi, - /*return*/ Type.negativeone_or_nothing, - /*fd*/ Type.fd, - /*buf*/ Type.stat.out_ptr diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm b/mail/thunderbird/patches/patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm deleted file mode 100644 index f3e2f440a76..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm,v 1.2 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/toolkit/components/osfile/modules/osfile_unix_front.jsm.orig 2015-06-08 17:49:29.000000000 +0000 -+++ mozilla/toolkit/components/osfile/modules/osfile_unix_front.jsm -@@ -399,7 +399,7 @@ - throw_on_negative("statvfs", (UnixFile.statvfs || UnixFile.statfs)(sourcePath, fileSystemInfoPtr)); - - let bytes = new Type.uint64_t.implementation( -- fileSystemInfo.f_bsize * fileSystemInfo.f_bavail); -+ fileSystemInfo.f_frsize * fileSystemInfo.f_bavail); - - return bytes.value; - }; diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h b/mail/thunderbird/patches/patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h new file mode 100644 index 00000000000..4cf21e221ae --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h @@ -0,0 +1,20 @@ +$NetBSD: patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h.orig 2016-04-07 21:33:32.000000000 +0000 ++++ mozilla/toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h +@@ -76,9 +76,15 @@ typedef intptr_t Atomic64; + #endif + #endif + ++#if defined(__NetBSD__) && defined(__arm__) ++// NetBSD/arm uses long for intptr_t, which fails -fpermissive checks. So ++// explicitly use int32 here instead. ++typedef int32 AtomicWord; ++#else + // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or + // Atomic64 routines below, depending on your architecture. + typedef intptr_t AtomicWord; ++#endif + + // Atomically execute: + // result = *ptr; diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h b/mail/thunderbird/patches/patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h new file mode 100644 index 00000000000..c38d7ad664f --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_platform__macros.h,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2016-04-07 21:33:32.000000000 +0000 ++++ mozilla/toolkit/components/protobuf/src/google/protobuf/stubs/platform_macros.h +@@ -67,7 +67,7 @@ + #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 + #elif defined(sparc) + #define GOOGLE_PROTOBUF_ARCH_SPARC 1 +-#ifdef SOLARIS_64BIT_ENABLED ++#if (defined(sun) && defined(SOLARIS_64BIT_ENABLED)) || __LP64__ + #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 + #else + #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_library_moz.build b/mail/thunderbird/patches/patch-mozilla_toolkit_library_moz.build index cb636babbdd..141128dc091 100644 --- a/mail/thunderbird/patches/patch-mozilla_toolkit_library_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_toolkit_library_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/toolkit/library/moz.build.orig 2015-06-08 17:49:31.000000000 +0000 +--- mozilla/toolkit/library/moz.build.orig 2016-04-07 21:33:33.000000000 +0000 +++ mozilla/toolkit/library/moz.build -@@ -214,6 +214,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF +@@ -211,6 +211,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF ] OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] @@ -10,7 +10,7 @@ $NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.1 2015/07/09 15:17:34 ryoon OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] if CONFIG['MOZ_NATIVE_JPEG']: -@@ -225,6 +226,30 @@ if CONFIG['MOZ_NATIVE_PNG']: +@@ -222,6 +223,30 @@ if CONFIG['MOZ_NATIVE_PNG']: if CONFIG['MOZ_NATIVE_HUNSPELL']: OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] @@ -41,7 +41,7 @@ $NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.1 2015/07/09 15:17:34 ryoon if CONFIG['MOZ_NATIVE_LIBEVENT']: OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] -@@ -234,8 +259,14 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: +@@ -231,8 +256,14 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: if not CONFIG['MOZ_TREE_PIXMAN']: OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] @@ -58,7 +58,7 @@ $NetBSD: patch-mozilla_toolkit_library_moz.build,v 1.1 2015/07/09 15:17:34 ryoon if CONFIG['HAVE_CLOCK_MONOTONIC']: OS_LIBS += CONFIG['REALTIME_LIBS'] -@@ -365,7 +396,7 @@ if CONFIG['OS_ARCH'] == 'WINNT': +@@ -368,7 +399,7 @@ if CONFIG['OS_ARCH'] == 'WINNT': if CONFIG['MOZ_ENABLE_QT']: OS_LIBS += CONFIG['XEXT_LIBS'] diff --git a/mail/thunderbird/patches/patch-ao b/mail/thunderbird/patches/patch-mozilla_toolkit_mozapps_installer_packager.mk index f4be2b30bb3..81b4c822cac 100644 --- a/mail/thunderbird/patches/patch-ao +++ b/mail/thunderbird/patches/patch-mozilla_toolkit_mozapps_installer_packager.mk @@ -1,14 +1,12 @@ -$NetBSD: patch-ao,v 1.11 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_toolkit_mozapps_installer_packager.mk,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/toolkit/mozapps/installer/packager.mk.orig 2015-06-08 17:49:32.000000000 +0000 +--- mozilla/toolkit/mozapps/installer/packager.mk.orig 2016-04-07 21:33:34.000000000 +0000 +++ mozilla/toolkit/mozapps/installer/packager.mk -@@ -122,8 +122,8 @@ endif - (cd $(DESTDIR)$(installdir) && tar -xf -) +@@ -133,7 +133,7 @@ endif $(NSINSTALL) -D $(DESTDIR)$(bindir) $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) -- ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) + ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) -ifdef INSTALL_SDK # Here comes the hard part -+ ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME) +ifeq ($(MOZ_APP_NAME),xulrunner) $(NSINSTALL) -D $(DESTDIR)$(includedir) (cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_xre_glxtest.cpp b/mail/thunderbird/patches/patch-mozilla_toolkit_xre_glxtest.cpp new file mode 100644 index 00000000000..ab5adffdd2b --- /dev/null +++ b/mail/thunderbird/patches/patch-mozilla_toolkit_xre_glxtest.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-mozilla_toolkit_xre_glxtest.cpp,v 1.1 2016/04/17 18:33:50 ryoon Exp $ + +--- mozilla/toolkit/xre/glxtest.cpp.orig 2016-04-07 21:33:34.000000000 +0000 ++++ mozilla/toolkit/xre/glxtest.cpp +@@ -163,7 +163,7 @@ void glxtest() + fatal_error("The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined"); + + ///// Open libGL and load needed symbols ///// +-#ifdef __OpenBSD__ ++#if defined(__OpenBSD__) || defined(__NetBSD__) + #define LIBGL_FILENAME "libGL.so" + #else + #define LIBGL_FILENAME "libGL.so.1" diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_xre_nsAppRunner.cpp b/mail/thunderbird/patches/patch-mozilla_toolkit_xre_nsAppRunner.cpp index a46802d6e3f..94889cd4356 100644 --- a/mail/thunderbird/patches/patch-mozilla_toolkit_xre_nsAppRunner.cpp +++ b/mail/thunderbird/patches/patch-mozilla_toolkit_xre_nsAppRunner.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_toolkit_xre_nsAppRunner.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_toolkit_xre_nsAppRunner.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/toolkit/xre/nsAppRunner.cpp.orig 2015-06-08 17:49:32.000000000 +0000 +--- mozilla/toolkit/xre/nsAppRunner.cpp.orig 2016-04-07 21:33:34.000000000 +0000 +++ mozilla/toolkit/xre/nsAppRunner.cpp -@@ -1808,6 +1808,18 @@ static nsresult LaunchChild(nsINativeApp +@@ -1893,6 +1893,18 @@ static nsresult LaunchChild(nsINativeApp if (NS_FAILED(rv)) return rv; @@ -21,7 +21,7 @@ $NetBSD: patch-mozilla_toolkit_xre_nsAppRunner.cpp,v 1.1 2015/07/09 15:17:34 ryo #if defined(XP_UNIX) if (execv(exePath.get(), gRestartArgv) == -1) return NS_ERROR_FAILURE; -@@ -1821,6 +1833,7 @@ static nsresult LaunchChild(nsINativeApp +@@ -1906,6 +1918,7 @@ static nsresult LaunchChild(nsINativeApp if (failed || exitCode) return NS_ERROR_FAILURE; #endif // XP_UNIX diff --git a/mail/thunderbird/patches/patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp b/mail/thunderbird/patches/patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp index 82e5eac3c28..f2fc8742161 100644 --- a/mail/thunderbird/patches/patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp +++ b/mail/thunderbird/patches/patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp,v 1.1 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/toolkit/xre/nsEmbedFunctions.cpp.orig 2013-10-23 22:09:20.000000000 +0000 +--- mozilla/toolkit/xre/nsEmbedFunctions.cpp.orig 2016-04-07 21:33:34.000000000 +0000 +++ mozilla/toolkit/xre/nsEmbedFunctions.cpp -@@ -234,7 +234,7 @@ XRE_SetRemoteExceptionHandler(const char +@@ -259,7 +259,7 @@ XRE_SetRemoteExceptionHandler(const char { #if defined(XP_WIN) || defined(XP_MACOSX) return CrashReporter::SetRemoteExceptionHandler(nsDependentCString(aPipe)); @@ -11,7 +11,7 @@ $NetBSD: patch-mozilla_toolkit_xre_nsEmbedFunctions.cpp,v 1.1 2013/11/12 20:50:5 return CrashReporter::SetRemoteExceptionHandler(); #else # error "OOP crash reporter unsupported on this platform" -@@ -372,7 +372,7 @@ XRE_InitChildProcess(int aArgc, +@@ -449,7 +449,7 @@ XRE_InitChildProcess(int aArgc, // Bug 684322 will add better visibility into this condition NS_WARNING("Could not setup crash reporting\n"); } diff --git a/mail/thunderbird/patches/patch-mozilla_webapprt_moz.build b/mail/thunderbird/patches/patch-mozilla_webapprt_moz.build index 18e0d686d8f..b181bf90c41 100644 --- a/mail/thunderbird/patches/patch-mozilla_webapprt_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_webapprt_moz.build @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_webapprt_moz.build,v 1.2 2015/07/09 15:17:34 ryoon Exp $ +$NetBSD: patch-mozilla_webapprt_moz.build,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/webapprt/moz.build.orig 2015-06-08 17:49:33.000000000 +0000 +--- mozilla/webapprt/moz.build.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/webapprt/moz.build -@@ -6,7 +6,7 @@ +@@ -9,7 +9,7 @@ with Files('**'): if CONFIG['OS_ARCH'] == 'WINNT': DIRS += ['win'] diff --git a/mail/thunderbird/patches/patch-mozilla_widget_gtk_gtk2drawing.c b/mail/thunderbird/patches/patch-mozilla_widget_gtk_gtk2drawing.c deleted file mode 100644 index aabaf457d94..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_widget_gtk_gtk2drawing.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-mozilla_widget_gtk_gtk2drawing.c,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/widget/gtk/gtk2drawing.c.orig 2015-06-08 17:49:33.000000000 +0000 -+++ mozilla/widget/gtk/gtk2drawing.c -@@ -831,7 +831,7 @@ moz_gtk_get_focus_outline_size(gint* foc - return MOZ_GTK_SUCCESS; - } - --gint -+static gint - moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus, - gint* focus_width, gint* focus_pad) - { -@@ -928,7 +928,7 @@ moz_gtk_splitter_get_metrics(gint orient - return MOZ_GTK_SUCCESS; - } - --gint -+static gint - moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border) - { - static const GtkBorder default_inner_border = { 1, 1, 1, 1 }; diff --git a/mail/thunderbird/patches/patch-mozilla_widget_gtk_gtk3drawing.c b/mail/thunderbird/patches/patch-mozilla_widget_gtk_gtk3drawing.c deleted file mode 100644 index 5853622c2f2..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_widget_gtk_gtk3drawing.c +++ /dev/null @@ -1,833 +0,0 @@ -$NetBSD: patch-mozilla_widget_gtk_gtk3drawing.c,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/widget/gtk/gtk3drawing.c.orig 2015-06-08 17:49:33.000000000 +0000 -+++ mozilla/widget/gtk/gtk3drawing.c -@@ -65,6 +65,7 @@ static GtkWidget* gScrolledWindowWidget; - static style_prop_t style_prop_func; - static gboolean have_arrow_scaling; - static gboolean checkbox_check_state; -+static gboolean notebook_has_tab_gap; - static gboolean is_initialized; - - #define ARROW_UP 0 -@@ -725,6 +726,14 @@ moz_gtk_init() - else - checkbox_check_state = GTK_STATE_FLAG_ACTIVE; - -+ if(!gtk_check_version(3, 12, 0)) { -+ ensure_tab_widget(); -+ gtk_widget_style_get(gTabWidget, "has-tab-gap", ¬ebook_has_tab_gap, NULL); -+ } -+ else { -+ notebook_has_tab_gap = TRUE; -+ } -+ - /* Add style property to GtkEntry. - * Adding the style property to the normal GtkEntry class means that it - * will work without issues inside GtkComboBox and for Spinbuttons. */ -@@ -762,37 +771,17 @@ moz_gtk_radio_get_metrics(gint* indicato - gint - moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width) - { -- gboolean interior_focus; -- gint focus_width = 0; -+ GtkBorder border; -+ GtkBorder padding; -+ GtkStyleContext *style; - - ensure_entry_widget(); -- gtk_widget_style_get(gEntryWidget, -- "interior-focus", &interior_focus, -- "focus-line-width", &focus_width, -- NULL); -- if (interior_focus) { -- GtkBorder border; -- GtkStyleContext *style = gtk_widget_get_style_context(gEntryWidget); -- gtk_style_context_get_border(style, 0, &border); -- *focus_h_width = border.left + focus_width; -- *focus_v_width = border.top + focus_width; -- } else { -- *focus_h_width = focus_width; -- *focus_v_width = focus_width; -- } -- return MOZ_GTK_SUCCESS; --} -- --gint --moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus, -- gint* focus_width, gint* focus_pad) --{ -- gtk_widget_style_get (widget, -- "interior-focus", interior_focus, -- "focus-line-width", focus_width, -- "focus-padding", focus_pad, -- NULL); -+ style = gtk_widget_get_style_context(gEntryWidget); - -+ gtk_style_context_get_border(style, 0, &border); -+ gtk_style_context_get_padding(style, 0, &padding); -+ *focus_h_width = border.left + padding.left; -+ *focus_v_width = border.top + padding.top; - return MOZ_GTK_SUCCESS; - } - -@@ -880,24 +869,6 @@ moz_gtk_splitter_get_metrics(gint orient - return MOZ_GTK_SUCCESS; - } - --gint --moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border) --{ -- static const GtkBorder default_inner_border = { 1, 1, 1, 1 }; -- GtkBorder *tmp_border; -- -- gtk_widget_style_get (widget, "inner-border", &tmp_border, NULL); -- -- if (tmp_border) { -- *inner_border = *tmp_border; -- gtk_border_free(tmp_border); -- } -- else -- *inner_border = default_inner_border; -- -- return MOZ_GTK_SUCCESS; --} -- - static gint - moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect, - GtkWidgetState* state, -@@ -908,19 +879,8 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec - GtkStyleContext* style = gtk_widget_get_style_context(widget); - gint x = rect->x, y=rect->y, width=rect->width, height=rect->height; - -- gboolean interior_focus; -- gint focus_width, focus_pad; -- -- moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad); - gtk_widget_set_direction(widget, direction); -- -- if (!interior_focus && state->focused) { -- x += focus_width + focus_pad; -- y += focus_width + focus_pad; -- width -= 2 * (focus_width + focus_pad); -- height -= 2 * (focus_width + focus_pad); -- } -- -+ - gtk_style_context_save(style); - gtk_style_context_set_state(style, state_flags); - -@@ -953,20 +913,12 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec - } - - if (state->focused) { -- if (interior_focus) { -- GtkBorder border; -- gtk_style_context_get_border(style, state_flags, &border); -- x += border.left + focus_pad; -- y += border.top + focus_pad; -- width -= 2 * (border.left + focus_pad); -- height -= 2 * (border.top + focus_pad); -- } else { -- x -= focus_width + focus_pad; -- y -= focus_width + focus_pad; -- width += 2 * (focus_width + focus_pad); -- height += 2 * (focus_width + focus_pad); -- } -- -+ GtkBorder border; -+ gtk_style_context_get_border(style, state_flags, &border); -+ x += border.left; -+ y += border.top; -+ width -= (border.left + border.right); -+ height -= (border.top + border.bottom); - gtk_render_focus(style, cr, x, y, width, height); - } - gtk_style_context_restore(style); -@@ -1056,33 +1008,23 @@ calculate_button_inner_rect(GtkWidget* b - GtkTextDirection direction, - gboolean ignore_focus) - { -- GtkBorder inner_border; -- gboolean interior_focus; -- gint focus_width, focus_pad; - GtkStyleContext* style; - GtkBorder border; -+ GtkBorder padding = {0, 0, 0, 0}; - - style = gtk_widget_get_style_context(button); - - /* This mirrors gtkbutton's child positioning */ -- moz_gtk_button_get_inner_border(button, &inner_border); -- moz_gtk_widget_get_focus(button, &interior_focus, -- &focus_width, &focus_pad); -- -- if (ignore_focus) -- focus_width = focus_pad = 0; -- - gtk_style_context_get_border(style, 0, &border); -+ if (!ignore_focus) -+ gtk_style_context_get_padding(style, 0, &padding); - -- inner_rect->x = rect->x + border.left + focus_width + focus_pad; -- inner_rect->x += direction == GTK_TEXT_DIR_LTR ? -- inner_border.left : inner_border.right; -- inner_rect->y = rect->y + inner_border.top + border.top + -- focus_width + focus_pad; -- inner_rect->width = MAX(1, rect->width - inner_border.left - -- inner_border.right - (border.left + focus_pad + focus_width) * 2); -- inner_rect->height = MAX(1, rect->height - inner_border.top - -- inner_border.bottom - (border.top + focus_pad + focus_width) * 2); -+ inner_rect->x = rect->x + border.left + padding.left; -+ inner_rect->y = rect->y + padding.top + border.top; -+ inner_rect->width = MAX(1, rect->width - padding.left - -+ padding.right - border.left * 2); -+ inner_rect->height = MAX(1, rect->height - padding.top - -+ padding.bottom - border.top * 2); - - return MOZ_GTK_SUCCESS; - } -@@ -1230,6 +1172,7 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi - GtkStyleContext* style; - GtkScrollbar *scrollbar; - GtkAdjustment *adj; -+ GtkBorder margin; - - ensure_scrollbar_widget(); - -@@ -1239,15 +1182,20 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi - scrollbar = GTK_SCROLLBAR(gVertScrollbarWidget); - - gtk_widget_set_direction(GTK_WIDGET(scrollbar), direction); -- -+ - style = gtk_widget_get_style_context(GTK_WIDGET(scrollbar)); - gtk_style_context_save(style); -- -+ - gtk_style_context_add_class(style, GTK_STYLE_CLASS_SLIDER); - gtk_style_context_set_state(style, state_flags); - -- gtk_render_slider(style, cr, rect->x, rect->y, -- rect->width, rect->height, -+ gtk_style_context_get_margin (style, state_flags, &margin); -+ -+ gtk_render_slider(style, cr, -+ rect->x + margin.left, -+ rect->y + margin.top, -+ rect->width - margin.left - margin.right, -+ rect->height - margin.top - margin.bottom, - (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ? - GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); - -@@ -1451,19 +1399,12 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect - { - gint x = rect->x, y = rect->y, width = rect->width, height = rect->height; - GtkStyleContext* style; -- gboolean interior_focus; -- gint focus_width; - int draw_focus_outline_only = state->depressed; // NS_THEME_FOCUS_OUTLINE - - gtk_widget_set_direction(widget, direction); - - style = gtk_widget_get_style_context(widget); - -- gtk_widget_style_get(widget, -- "interior-focus", &interior_focus, -- "focus-line-width", &focus_width, -- NULL); -- - if (draw_focus_outline_only) { - // Inflate the given 'rect' with the focus outline size. - gint h, v; -@@ -1495,14 +1436,6 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect - /* This will get us the lit borders that focused textboxes enjoy on - * some themes. */ - gtk_style_context_set_state(style, GTK_STATE_FLAG_FOCUSED); -- if (!interior_focus) { -- /* Indent the border a little bit if we have exterior focus -- (this is what GTK does to draw native entries) */ -- x += focus_width; -- y += focus_width; -- width -= 2 * focus_width; -- height -= 2 * focus_width; -- } - } - - if (state->disabled) { -@@ -1514,11 +1447,6 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect - } - gtk_render_frame(style, cr, x, y, width, height); - -- if (state->focused && !state->disabled) { -- if (!interior_focus) { -- gtk_render_focus(style, cr, rect->x, rect->y, rect->width, rect->height); -- } -- } - gtk_style_context_restore(style); - - return MOZ_GTK_SUCCESS; -@@ -1823,8 +1751,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk - GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); - GtkStyleContext* style; - GtkWidget *widget; -- gboolean interior_focus; -- gint focus_width, focus_pad; - - if (isradio) { - ensure_radiobutton_widget(); -@@ -1837,7 +1763,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk - - style = gtk_widget_get_style_context(widget); - gtk_style_context_save(style); -- moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad); - gtk_style_context_set_state(style, state_flags); - - /* this is for drawing a prelight box */ -@@ -1846,10 +1771,6 @@ moz_gtk_container_paint(cairo_t *cr, Gdk - rect->x, rect->y, rect->width, rect->height); - } - -- if (state->focused && !interior_focus) { -- gtk_render_focus(style, cr, -- rect->x, rect->y, rect->width, rect->height); -- } - gtk_style_context_restore(style); - - return MOZ_GTK_SUCCESS; -@@ -1862,7 +1783,6 @@ moz_gtk_toggle_label_paint(cairo_t *cr, - { - GtkStyleContext *style; - GtkWidget *widget; -- gboolean interior_focus; - - if (!state->focused) - return MOZ_GTK_SUCCESS; -@@ -1883,10 +1803,6 @@ moz_gtk_toggle_label_paint(cairo_t *cr, - } - gtk_widget_set_direction(widget, direction); - -- gtk_widget_style_get(widget, "interior-focus", &interior_focus, NULL); -- if (!interior_focus) -- return MOZ_GTK_SUCCESS; -- - gtk_style_context_set_state(style, GetStateFlagsFromGtkWidgetState(state)); - gtk_render_focus(style, cr, - rect->x, rect->y, rect->width, rect->height); -@@ -2105,6 +2021,9 @@ moz_gtk_get_tab_thickness(void) - GtkStyleContext * style; - - ensure_tab_widget(); -+ if (!notebook_has_tab_gap) -+ return 0; /* tabs do not overdraw the tabpanel border with "no gap" style */ -+ - style = gtk_widget_get_style_context(gTabWidget); - gtk_style_context_add_class(style, GTK_STYLE_CLASS_NOTEBOOK); - gtk_style_context_get_border(style, 0, &border); -@@ -2150,7 +2069,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan - ensure_tab_widget(); - gtk_widget_set_direction(gTabWidget, direction); - -- style = gtk_widget_get_style_context(gTabWidget); -+ style = gtk_widget_get_style_context(gTabWidget); - gtk_style_context_save(style); - moz_gtk_tab_prepare_style_context(style, flags); - -@@ -2167,143 +2086,155 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan - - focusRect = backRect = tabRect; - -- if ((flags & MOZ_GTK_TAB_SELECTED) == 0) { -- /* Only draw the tab */ -- gtk_render_extension(style, cr, -- tabRect.x, tabRect.y, tabRect.width, tabRect.height, -- (flags & MOZ_GTK_TAB_BOTTOM) ? -- GTK_POS_TOP : GTK_POS_BOTTOM ); -- } else { -- /* Draw the tab and the gap -- * We want the gap to be positioned exactly on the tabpanel top -- * border; since tabbox.css may set a negative margin so that the tab -- * frame rect already overlaps the tabpanel frame rect, we need to take -- * that into account when drawing. To that effect, nsNativeThemeGTK -- * passes us this negative margin (bmargin in the graphic below) in the -- * lowest bits of |flags|. We use it to set gap_voffset, the distance -- * between the top of the gap and the bottom of the tab (resp. the -- * bottom of the gap and the top of the tab when we draw a bottom tab), -- * while ensuring that the gap always touches the border of the tab, -- * i.e. 0 <= gap_voffset <= gap_height, to avoid surprinsing results -- * with big negative or positive margins. -- * Here is a graphical explanation in the case of top tabs: -- * ___________________________ -- * / \ -- * | T A B | -- * ----------|. . . . . . . . . . . . . . .|----- top of tabpanel -- * : ^ bmargin : ^ -- * : | (-negative margin, : | -- * bottom : v passed in flags) : | gap_height -- * of -> :.............................: | (the size of the -- * the tab . part of the gap . | tabpanel top border) -- * . outside of the tab . v -- * ---------------------------------------------- -- * -- * To draw the gap, we use gtk_paint_box_gap(), see comment in -- * moz_gtk_tabpanels_paint(). This box_gap is made 3 * gap_height tall, -- * which should suffice to ensure that the only visible border is the -- * pierced one. If the tab is in the middle, we make the box_gap begin -- * a bit to the left of the tab and end a bit to the right, adjusting -- * the gap position so it still is under the tab, because we want the -- * rendering of a gap in the middle of a tabpanel. This is the role of -- * the gints gap_{l,r}_offset. On the contrary, if the tab is the -- * first, we align the start border of the box_gap with the start -- * border of the tab (left if LTR, right if RTL), by setting the -- * appropriate offset to 0.*/ -- gint gap_loffset, gap_roffset, gap_voffset, gap_height; -- -- /* Get height needed by the gap */ -- gap_height = moz_gtk_get_tab_thickness(); -- -- /* Extract gap_voffset from the first bits of flags */ -- gap_voffset = flags & MOZ_GTK_TAB_MARGIN_MASK; -- if (gap_voffset > gap_height) -- gap_voffset = gap_height; -- -- /* Set gap_{l,r}_offset to appropriate values */ -- gap_loffset = gap_roffset = 20; /* should be enough */ -- if (flags & MOZ_GTK_TAB_FIRST) { -- if (direction == GTK_TEXT_DIR_RTL) -- gap_roffset = initial_gap; -- else -- gap_loffset = initial_gap; -- } -- -- if (flags & MOZ_GTK_TAB_BOTTOM) { -- /* Draw the tab on bottom */ -- focusRect.y += gap_voffset; -- focusRect.height -= gap_voffset; -- -+ if (notebook_has_tab_gap) { -+ if ((flags & MOZ_GTK_TAB_SELECTED) == 0) { -+ /* Only draw the tab */ - gtk_render_extension(style, cr, -- tabRect.x, tabRect.y + gap_voffset, tabRect.width, -- tabRect.height - gap_voffset, GTK_POS_TOP); -- -- gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB); -- -- backRect.y += (gap_voffset - gap_height); -- backRect.height = gap_height; -- -- /* Draw the gap; erase with background color before painting in -- * case theme does not */ -- gtk_render_background(style, cr, backRect.x, backRect.y, -- backRect.width, backRect.height); -- cairo_save(cr); -- cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height); -- cairo_clip(cr); -- -- gtk_render_frame_gap(style, cr, -- tabRect.x - gap_loffset, -- tabRect.y + gap_voffset - 3 * gap_height, -- tabRect.width + gap_loffset + gap_roffset, -- 3 * gap_height, GTK_POS_BOTTOM, -- gap_loffset, gap_loffset + tabRect.width); -- cairo_restore(cr); -+ tabRect.x, tabRect.y, tabRect.width, tabRect.height, -+ (flags & MOZ_GTK_TAB_BOTTOM) ? -+ GTK_POS_TOP : GTK_POS_BOTTOM ); - } else { -- /* Draw the tab on top */ -- focusRect.height -= gap_voffset; -- gtk_render_extension(style, cr, -- tabRect.x, tabRect.y, tabRect.width, -- tabRect.height - gap_voffset, GTK_POS_BOTTOM); -- -- gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB); -- -- backRect.y += (tabRect.height - gap_voffset); -- backRect.height = gap_height; -+ /* Draw the tab and the gap -+ * We want the gap to be positioned exactly on the tabpanel top -+ * border; since tabbox.css may set a negative margin so that the tab -+ * frame rect already overlaps the tabpanel frame rect, we need to take -+ * that into account when drawing. To that effect, nsNativeThemeGTK -+ * passes us this negative margin (bmargin in the graphic below) in the -+ * lowest bits of |flags|. We use it to set gap_voffset, the distance -+ * between the top of the gap and the bottom of the tab (resp. the -+ * bottom of the gap and the top of the tab when we draw a bottom tab), -+ * while ensuring that the gap always touches the border of the tab, -+ * i.e. 0 <= gap_voffset <= gap_height, to avoid surprinsing results -+ * with big negative or positive margins. -+ * Here is a graphical explanation in the case of top tabs: -+ * ___________________________ -+ * / \ -+ * | T A B | -+ * ----------|. . . . . . . . . . . . . . .|----- top of tabpanel -+ * : ^ bmargin : ^ -+ * : | (-negative margin, : | -+ * bottom : v passed in flags) : | gap_height -+ * of -> :.............................: | (the size of the -+ * the tab . part of the gap . | tabpanel top border) -+ * . outside of the tab . v -+ * ---------------------------------------------- -+ * -+ * To draw the gap, we use gtk_paint_box_gap(), see comment in -+ * moz_gtk_tabpanels_paint(). This box_gap is made 3 * gap_height tall, -+ * which should suffice to ensure that the only visible border is the -+ * pierced one. If the tab is in the middle, we make the box_gap begin -+ * a bit to the left of the tab and end a bit to the right, adjusting -+ * the gap position so it still is under the tab, because we want the -+ * rendering of a gap in the middle of a tabpanel. This is the role of -+ * the gints gap_{l,r}_offset. On the contrary, if the tab is the -+ * first, we align the start border of the box_gap with the start -+ * border of the tab (left if LTR, right if RTL), by setting the -+ * appropriate offset to 0.*/ -+ gint gap_loffset, gap_roffset, gap_voffset, gap_height; -+ -+ /* Get height needed by the gap */ -+ gap_height = moz_gtk_get_tab_thickness(); -+ -+ /* Extract gap_voffset from the first bits of flags */ -+ gap_voffset = flags & MOZ_GTK_TAB_MARGIN_MASK; -+ if (gap_voffset > gap_height) -+ gap_voffset = gap_height; -+ -+ /* Set gap_{l,r}_offset to appropriate values */ -+ gap_loffset = gap_roffset = 20; /* should be enough */ -+ if (flags & MOZ_GTK_TAB_FIRST) { -+ if (direction == GTK_TEXT_DIR_RTL) -+ gap_roffset = initial_gap; -+ else -+ gap_loffset = initial_gap; -+ } - -- /* Draw the gap; erase with background color before painting in -- * case theme does not */ -- gtk_render_background(style, cr, backRect.x, backRect.y, -- backRect.width, backRect.height); -- -- cairo_save(cr); -- cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height); -- cairo_clip(cr); -- -- gtk_render_frame_gap(style, cr, -- tabRect.x - gap_loffset, -- tabRect.y + tabRect.height - gap_voffset, -- tabRect.width + gap_loffset + gap_roffset, -- 3 * gap_height, GTK_POS_TOP, -- gap_loffset, gap_loffset + tabRect.width); -- cairo_restore(cr); -+ if (flags & MOZ_GTK_TAB_BOTTOM) { -+ /* Draw the tab on bottom */ -+ focusRect.y += gap_voffset; -+ focusRect.height -= gap_voffset; -+ -+ gtk_render_extension(style, cr, -+ tabRect.x, tabRect.y + gap_voffset, tabRect.width, -+ tabRect.height - gap_voffset, GTK_POS_TOP); -+ -+ gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB); -+ -+ backRect.y += (gap_voffset - gap_height); -+ backRect.height = gap_height; -+ -+ /* Draw the gap; erase with background color before painting in -+ * case theme does not */ -+ gtk_render_background(style, cr, backRect.x, backRect.y, -+ backRect.width, backRect.height); -+ cairo_save(cr); -+ cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height); -+ cairo_clip(cr); -+ -+ gtk_render_frame_gap(style, cr, -+ tabRect.x - gap_loffset, -+ tabRect.y + gap_voffset - 3 * gap_height, -+ tabRect.width + gap_loffset + gap_roffset, -+ 3 * gap_height, GTK_POS_BOTTOM, -+ gap_loffset, gap_loffset + tabRect.width); -+ cairo_restore(cr); -+ } else { -+ /* Draw the tab on top */ -+ focusRect.height -= gap_voffset; -+ gtk_render_extension(style, cr, -+ tabRect.x, tabRect.y, tabRect.width, -+ tabRect.height - gap_voffset, GTK_POS_BOTTOM); -+ -+ gtk_style_context_remove_region(style, GTK_STYLE_REGION_TAB); -+ -+ backRect.y += (tabRect.height - gap_voffset); -+ backRect.height = gap_height; -+ -+ /* Draw the gap; erase with background color before painting in -+ * case theme does not */ -+ gtk_render_background(style, cr, backRect.x, backRect.y, -+ backRect.width, backRect.height); -+ -+ cairo_save(cr); -+ cairo_rectangle(cr, backRect.x, backRect.y, backRect.width, backRect.height); -+ cairo_clip(cr); -+ -+ gtk_render_frame_gap(style, cr, -+ tabRect.x - gap_loffset, -+ tabRect.y + tabRect.height - gap_voffset, -+ tabRect.width + gap_loffset + gap_roffset, -+ 3 * gap_height, GTK_POS_TOP, -+ gap_loffset, gap_loffset + tabRect.width); -+ cairo_restore(cr); -+ } - } -+ } else { -+ gtk_render_background(style, cr, tabRect.x, tabRect.y, tabRect.width, tabRect.height); -+ gtk_render_frame(style, cr, tabRect.x, tabRect.y, tabRect.width, tabRect.height); - } - -+ gtk_style_context_restore(style); -+ - if (state->focused) { - /* Paint the focus ring */ -- GtkBorder border; -- gtk_style_context_get_border(style, GetStateFlagsFromGtkWidgetState(state), &border); -+ GtkBorder padding; -+ -+ gtk_style_context_save(style); -+ moz_gtk_tab_prepare_style_context(style, flags); - -- focusRect.x += border.left; -- focusRect.width -= (border.left + border.right); -- focusRect.y += border.top; -- focusRect.height -= (border.top + border.bottom); -+ gtk_style_context_get_padding(style, GetStateFlagsFromGtkWidgetState(state), &padding); -+ -+ focusRect.x += padding.left; -+ focusRect.width -= (padding.left + padding.right); -+ focusRect.y += padding.top; -+ focusRect.height -= (padding.top + padding.bottom); - - gtk_render_focus(style, cr, - focusRect.x, focusRect.y, focusRect.width, focusRect.height); -+ -+ gtk_style_context_restore(style); - } - -- gtk_style_context_restore(style); - - return MOZ_GTK_SUCCESS; - } -@@ -2684,26 +2615,18 @@ moz_gtk_get_widget_border(GtkThemeWidget - switch (widget) { - case MOZ_GTK_BUTTON: - { -- GtkBorder inner_border; -- gboolean interior_focus; -- gint focus_width, focus_pad; -- - ensure_button_widget(); -+ style = gtk_widget_get_style_context(gButtonWidget); -+ - *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gButtonWidget)); - - /* Don't add this padding in HTML, otherwise the buttons will - become too big and stuff the layout. */ - if (!inhtml) { -- moz_gtk_widget_get_focus(gButtonWidget, &interior_focus, &focus_width, &focus_pad); -- moz_gtk_button_get_inner_border(gButtonWidget, &inner_border); -- *left += focus_width + focus_pad + inner_border.left; -- *right += focus_width + focus_pad + inner_border.right; -- *top += focus_width + focus_pad + inner_border.top; -- *bottom += focus_width + focus_pad + inner_border.bottom; -+ moz_gtk_add_style_padding(style, left, top, right, bottom); - } - -- moz_gtk_add_style_border(gtk_widget_get_style_context(gButtonWidget), -- left, top, right, bottom); -+ moz_gtk_add_style_border(style, left, top, right, bottom); - return MOZ_GTK_SUCCESS; - } - case MOZ_GTK_ENTRY: -@@ -2711,7 +2634,13 @@ moz_gtk_get_widget_border(GtkThemeWidget - ensure_entry_widget(); - style = gtk_widget_get_style_context(gEntryWidget); - moz_gtk_add_style_border(style, left, top, right, bottom); -- moz_gtk_add_style_padding(style, left, top, right, bottom); -+ -+ /* Use the document padding in HTML -+ and GTK style padding in XUL. */ -+ if (!inhtml) { -+ moz_gtk_add_style_padding(style, left, top, right, bottom); -+ } -+ - return MOZ_GTK_SUCCESS; - } - case MOZ_GTK_TREEVIEW: -@@ -2731,23 +2660,15 @@ moz_gtk_get_widget_border(GtkThemeWidget - * assigned. - * That is why the following code is the same as for MOZ_GTK_BUTTON. - * */ -- -- GtkBorder inner_border; -- gboolean interior_focus; -- gint focus_width, focus_pad; -+ GtkStyleContext *style; - - ensure_tree_header_cell_widget(); - *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gTreeHeaderCellWidget)); - -- moz_gtk_widget_get_focus(gTreeHeaderCellWidget, &interior_focus, &focus_width, &focus_pad); -- moz_gtk_button_get_inner_border(gTreeHeaderCellWidget, &inner_border); -- *left += focus_width + focus_pad + inner_border.left; -- *right += focus_width + focus_pad + inner_border.right; -- *top += focus_width + focus_pad + inner_border.top; -- *bottom += focus_width + focus_pad + inner_border.bottom; -- -- moz_gtk_add_style_border(gtk_widget_get_style_context(gTreeHeaderCellWidget), -- left, top, right, bottom); -+ style = gtk_widget_get_style_context(gTreeHeaderCellWidget); -+ -+ moz_gtk_add_style_border(style, left, top, right, bottom); -+ moz_gtk_add_style_padding(style, left, top, right, bottom); - return MOZ_GTK_SUCCESS; - } - case MOZ_GTK_TREE_HEADER_SORTARROW: -@@ -2767,29 +2688,23 @@ moz_gtk_get_widget_border(GtkThemeWidget - /* We need to account for the arrow on the dropdown, so text - * doesn't come too close to the arrow, or in some cases spill - * into the arrow. */ -- gboolean ignored_interior_focus, wide_separators; -- gint focus_width, focus_pad, separator_width; -+ gboolean wide_separators; -+ gint separator_width; - GtkRequisition arrow_req; - GtkBorder border; - - ensure_combo_box_widgets(); - -- *left = gtk_container_get_border_width(GTK_CONTAINER(gComboBoxButtonWidget)); -+ *left = *top = *right = *bottom = -+ gtk_container_get_border_width(GTK_CONTAINER(gComboBoxButtonWidget)); -+ -+ style = gtk_widget_get_style_context(gComboBoxButtonWidget); - - if (!inhtml) { -- moz_gtk_widget_get_focus(gComboBoxButtonWidget, -- &ignored_interior_focus, -- &focus_width, &focus_pad); -- *left += focus_width + focus_pad; -+ moz_gtk_add_style_padding(style, left, top, right, bottom); - } - -- style = gtk_widget_get_style_context(gComboBoxButtonWidget); -- gtk_style_context_get_border(style, 0, &border); -- -- *top = *left + border.top; -- *left += border.left; -- -- *right = *left; *bottom = *top; -+ moz_gtk_add_style_border(style, left, top, right, bottom); - - /* If there is no separator, don't try to count its width. */ - separator_width = 0; -@@ -2841,60 +2756,23 @@ moz_gtk_get_widget_border(GtkThemeWidget - ensure_frame_widget(); - w = gFrameWidget; - break; -- case MOZ_GTK_CHECKBUTTON_LABEL: -- case MOZ_GTK_RADIOBUTTON_LABEL: -- { -- gboolean interior_focus; -- gint focus_width, focus_pad; -- -- /* If the focus is interior, then the label has a border of -- (focus_width + focus_pad). */ -- if (widget == MOZ_GTK_CHECKBUTTON_LABEL) { -- ensure_checkbox_widget(); -- moz_gtk_widget_get_focus(gCheckboxWidget, &interior_focus, -- &focus_width, &focus_pad); -- } -- else { -- ensure_radiobutton_widget(); -- moz_gtk_widget_get_focus(gRadiobuttonWidget, &interior_focus, -- &focus_width, &focus_pad); -- } -- -- if (interior_focus) -- *left = *top = *right = *bottom = (focus_width + focus_pad); -- -- return MOZ_GTK_SUCCESS; -- } -- - case MOZ_GTK_CHECKBUTTON_CONTAINER: - case MOZ_GTK_RADIOBUTTON_CONTAINER: - { -- gboolean interior_focus; -- gint focus_width, focus_pad; -- -- /* If the focus is _not_ interior, then the container has a border -- of (focus_width + focus_pad). */ - if (widget == MOZ_GTK_CHECKBUTTON_CONTAINER) { - ensure_checkbox_widget(); -- moz_gtk_widget_get_focus(gCheckboxWidget, &interior_focus, -- &focus_width, &focus_pad); - w = gCheckboxWidget; - } else { - ensure_radiobutton_widget(); -- moz_gtk_widget_get_focus(gRadiobuttonWidget, &interior_focus, -- &focus_width, &focus_pad); - w = gRadiobuttonWidget; - } -+ style = gtk_widget_get_style_context(w); - - *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(w)); -- -- if (!interior_focus) { -- *left += (focus_width + focus_pad); -- *right += (focus_width + focus_pad); -- *top += (focus_width + focus_pad); -- *bottom += (focus_width + focus_pad); -- } -- -+ moz_gtk_add_style_border(style, -+ left, top, right, bottom); -+ moz_gtk_add_style_padding(style, -+ left, top, right, bottom); - return MOZ_GTK_SUCCESS; - } - case MOZ_GTK_MENUPOPUP: -@@ -2921,6 +2799,8 @@ moz_gtk_get_widget_border(GtkThemeWidget - return MOZ_GTK_SUCCESS; - } - /* These widgets have no borders, since they are not containers. */ -+ case MOZ_GTK_CHECKBUTTON_LABEL: -+ case MOZ_GTK_RADIOBUTTON_LABEL: - case MOZ_GTK_SPLITTER_HORIZONTAL: - case MOZ_GTK_SPLITTER_VERTICAL: - case MOZ_GTK_CHECKBUTTON: -@@ -2975,11 +2855,7 @@ moz_gtk_get_tab_border(gint* left, gint* - gtk_style_context_save(style); - moz_gtk_tab_prepare_style_context(style, flags); - -- // TODO add_style_border() should be replaced -- // with focus-line-width and focus-padding -- // see Bug 877605 - *left = *top = *right = *bottom = 0; -- moz_gtk_add_style_border(style, left, top, right, bottom); - moz_gtk_add_style_padding(style, left, top, right, bottom); - - gtk_widget_style_get (gTabWidget, "tab-curvature", &tab_curvature, NULL); -@@ -2990,16 +2866,9 @@ moz_gtk_get_tab_border(gint* left, gint* - int initial_gap; - gtk_widget_style_get (gTabWidget, "initial-gap", &initial_gap, NULL); - if (direction == GTK_TEXT_DIR_RTL) -- *right += initial_gap; -+ *right += initial_gap; - else -- *left += initial_gap; -- } -- -- // Top tabs have no bottom border, bottom tabs have no top border -- if (flags & MOZ_GTK_TAB_BOTTOM) { -- *top = 0; -- } else { -- *bottom = 0; -+ *left += initial_gap; - } - - gtk_style_context_restore(style); diff --git a/mail/thunderbird/patches/patch-mozilla_widget_gtk_gtkdrawing.h b/mail/thunderbird/patches/patch-mozilla_widget_gtk_gtkdrawing.h deleted file mode 100644 index ed06f077cd5..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_widget_gtk_gtkdrawing.h +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-mozilla_widget_gtk_gtkdrawing.h,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/widget/gtk/gtkdrawing.h.orig 2015-06-08 17:49:33.000000000 +0000 -+++ mozilla/widget/gtk/gtkdrawing.h -@@ -293,16 +293,6 @@ moz_gtk_checkbox_get_metrics(gint* indic - gint - moz_gtk_radio_get_metrics(gint* indicator_size, gint* indicator_spacing); - --/** -- * Get the inner-border value for a GtkButton widget (button or tree header) -- * widget: [IN] the widget to get the border value for -- * inner_border: [OUT] the inner border -- * -- * returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise -- */ --gint --moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border); -- - /** Get the extra size for the focus ring for outline:auto. - * widget: [IN] the widget to get the focus metrics for - * focus_h_width: [OUT] the horizontal width -@@ -313,19 +303,6 @@ moz_gtk_button_get_inner_border(GtkWidge - gint - moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width); - --/** Get the focus metrics for a treeheadercell, button, checkbox, or radio button. -- * widget: [IN] the widget to get the focus metrics for -- * interior_focus: [OUT] whether the focus is drawn around the -- * label (TRUE) or around the whole container (FALSE) -- * focus_width: [OUT] the width of the focus line -- * focus_pad: [OUT] the padding between the focus line and children -- * -- * returns: MOZ_GTK_SUCCESS if there was no error, an error code otherwise -- */ --gint --moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus, -- gint* focus_width, gint* focus_pad); -- - /** Get the horizontal padding for the menuitem widget or checkmenuitem widget. - * horizontal_padding: [OUT] The left and right padding of the menuitem or checkmenuitem - * diff --git a/mail/thunderbird/patches/patch-mozilla_widget_gtk_nsNativeThemeGTK.cpp b/mail/thunderbird/patches/patch-mozilla_widget_gtk_nsNativeThemeGTK.cpp deleted file mode 100644 index 211e1b9d0e9..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_widget_gtk_nsNativeThemeGTK.cpp +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-mozilla_widget_gtk_nsNativeThemeGTK.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $ - ---- mozilla/widget/gtk/nsNativeThemeGTK.cpp.orig 2015-06-08 17:49:33.000000000 +0000 -+++ mozilla/widget/gtk/nsNativeThemeGTK.cpp -@@ -761,6 +761,8 @@ nsNativeThemeGTK::GetExtraSizeForWidget( - return false; - - gint gap_height = moz_gtk_get_tab_thickness(); -+ if (!gap_height) -+ return false; - - int32_t extra = gap_height - GetTabMarginPixels(aFrame); - if (extra <= 0) -@@ -1528,9 +1530,15 @@ nsNativeThemeGTK::GetWidgetTransparency( - case NS_THEME_MENUPOPUP: - case NS_THEME_WINDOW: - case NS_THEME_DIALOG: -- // Tooltips use gtk_paint_flat_box(). -+ return eOpaque; -+ // Tooltips use gtk_paint_flat_box() on Gtk2 -+ // but are shaped on Gtk3 - case NS_THEME_TOOLTIP: -+#if (MOZ_WIDGET_GTK == 2) - return eOpaque; -+#else -+ return eTransparent; -+#endif - } - - return eUnknownTransparency; diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_base_nscore.h b/mail/thunderbird/patches/patch-mozilla_xpcom_base_nscore.h index 056df3600c9..191242db9c3 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_base_nscore.h +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_base_nscore.h @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_xpcom_base_nscore.h,v 1.1 2014/07/27 20:05:00 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_base_nscore.h,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/base/nscore.h.orig 2014-07-18 00:05:57.000000000 +0000 +--- mozilla/xpcom/base/nscore.h.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/base/nscore.h -@@ -114,7 +114,7 @@ +@@ -76,7 +76,7 @@ * NS_HIDDEN_(int) NS_FASTCALL func2(char *foo); */ diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_build_PoisonIOInterposer.h b/mail/thunderbird/patches/patch-mozilla_xpcom_build_PoisonIOInterposer.h index 16390251d8f..d521f95aa07 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_build_PoisonIOInterposer.h +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_build_PoisonIOInterposer.h @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_build_PoisonIOInterposer.h,v 1.2 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_build_PoisonIOInterposer.h,v 1.3 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/build/PoisonIOInterposer.h.orig 2015-06-08 17:49:33.000000000 +0000 +--- mozilla/xpcom/build/PoisonIOInterposer.h.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/build/PoisonIOInterposer.h @@ -36,7 +36,7 @@ void MozillaUnRegisterDebugFILE(FILE* aF diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_build_XPCOMInit.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_build_XPCOMInit.cpp deleted file mode 100644 index 2f46ee3fa93..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_build_XPCOMInit.cpp +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-mozilla_xpcom_build_XPCOMInit.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $ - ---- mozilla/xpcom/build/XPCOMInit.cpp.orig 2015-06-08 17:49:33.000000000 +0000 -+++ mozilla/xpcom/build/XPCOMInit.cpp -@@ -141,7 +141,9 @@ extern nsresult nsStringInputStreamConst - #include "mozilla/VisualEventTracer.h" - #endif - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - #include "ogg/ogg.h" -+#endif - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - #if defined(HAVE_STDINT_H) - // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in -@@ -669,11 +671,13 @@ NS_InitXPCOM2(nsIServiceManager** aResul - // this oddness. - mozilla::SetICUMemoryFunctions(); - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - // Do the same for libogg. - ogg_set_mem_functions(OggReporter::CountingMalloc, - OggReporter::CountingCalloc, - OggReporter::CountingRealloc, - OggReporter::CountingFree); -+#endif - - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - // And for VPX. diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_components_Module.h b/mail/thunderbird/patches/patch-mozilla_xpcom_components_Module.h index a20034dd249..718bc6468c8 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_components_Module.h +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_components_Module.h @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_xpcom_components_Module.h,v 1.1 2016/02/09 21:20:16 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_components_Module.h,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/components/Module.h.orig 2015-12-21 22:33:10.000000000 +0000 +--- mozilla/xpcom/components/Module.h.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/components/Module.h -@@ -124,7 +124,7 @@ struct Module +@@ -125,7 +125,7 @@ struct Module # define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport) # elif defined(__GNUC__) # if defined(__ELF__) diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_glue_standalone_nsXPCOMGlue.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_glue_standalone_nsXPCOMGlue.cpp deleted file mode 100644 index 9766e47fd08..00000000000 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_glue_standalone_nsXPCOMGlue.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mozilla_xpcom_glue_standalone_nsXPCOMGlue.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $ - ---- mozilla/xpcom/glue/standalone/nsXPCOMGlue.cpp.orig 2015-06-08 17:49:33.000000000 +0000 -+++ mozilla/xpcom/glue/standalone/nsXPCOMGlue.cpp -@@ -30,7 +30,7 @@ static bool do_preload = false; - #endif - - #if defined(SUNOS4) || defined(NEXTSTEP) || \ -- defined(XP_DARWIN) || \ -+ defined(XP_MACOSX) || \ - (defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__) - #define LEADING_UNDERSCORE "_" - #else diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_Makefile.in index 83ba18ce7fa..9fece87964a 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_Makefile.in +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_Makefile.in @@ -1,11 +1,15 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_Makefile.in,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_Makefile.in,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/Makefile.in.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/Makefile.in.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/Makefile.in -@@ -56,6 +56,39 @@ endif - # SPARC - ###################################################################### - # +@@ -42,6 +42,43 @@ ifeq ($(OS_ARCH),AIX) + CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS)) + endif + ++###################################################################### ++# SPARC ++###################################################################### ++# +# Linux/SPARC +# +ifeq ($(OS_ARCH),Linux) @@ -38,7 +42,7 @@ $NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_Makefile.in,v 1.1 2015/07/0 +CPPSRCS := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_openbsd.cpp +ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_netbsd.s +endif -+# - # Solaris/SPARC - # - ifeq ($(OS_ARCH),SunOS) ++ + include $(topsrcdir)/config/rules.mk + + ifeq ($(OS_ARCH),Linux) diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build index b536989bfd9..a177ec6962b 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/moz.build.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/moz.build.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/moz.build @@ -9,7 +9,7 @@ if CONFIG['OS_ARCH'] == 'Darwin': 'xptcinvoke_darwin.cpp', @@ -9,9 +9,9 @@ $NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_moz.build,v 1.1 2015/07/09 - if CONFIG['OS_TEST'] == 'powerpc': + if CONFIG['OS_TEST'] == 'ppc': SOURCES += [ + '!xptcstubs_asm_ppc_darwin.s', 'xptcinvoke_asm_ppc_rhapsody.s', - ] -@@ -26,7 +26,7 @@ if CONFIG['OS_ARCH'] == 'GNU': +@@ -24,7 +24,7 @@ if CONFIG['OS_ARCH'] == 'GNU': 'xptcstubs_gcc_x86_unix.cpp' ] diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp index 50269689d71..a1d0b6c4a98 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__arm__netbsd.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm_netbsd.cpp.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm_netbsd.cpp.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm_netbsd.cpp @@ -7,82 +7,92 @@ diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S index 1501dfb7226..4e8bdb089ab 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S @@ -16,6 +16,47 @@ #include <sys/asm.h> diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s index 74f44a46b20..563b35b7638 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__ppc__netbsd.s,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_netbsd.s @@ -20,15 +20,15 @@ diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp index bf9ef6ef356..3e84374e7a4 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp @@ -9,7 +9,7 @@ #include "xptc_gcc_x86_unix.h" diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp index 122dd28a48a..3f1e236d616 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__netbsd__m68k.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_netbsd_m68k.cpp @@ -100,6 +100,15 @@ extern "C" { } diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp index 025ee61aecd..6aa5f4596be 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__ppc__netbsd.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_netbsd.cpp @@ -5,9 +5,9 @@ diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp index 74f0f2ee060..258fc2c4e9b 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig 2015-07-06 19:52:50.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig 2016-04-17 13:47:46.349377857 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_netbsd.cpp @@ -0,0 +1,84 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp index 3204c0f0e66..a99e61a312a 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__arm__netbsd.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp @@ -6,15 +6,32 @@ /* Implement shared vtbl methods. */ diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S index cc251d21244..371b8ba8609 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S @@ -14,6 +14,47 @@ #include <sys/asm.h> diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s index 7ee77cea133..ae683dbef27 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig 2015-07-06 19:52:50.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig 2016-04-17 13:47:46.350069203 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc64_netbsd.s @@ -0,0 +1,66 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp index efaaabdd763..88c469d1846 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__gcc__x86__unix.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_gcc_x86_unix.cpp.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_gcc_x86_unix.cpp.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_gcc_x86_unix.cpp @@ -10,7 +10,7 @@ #include "xptc_gcc_x86_unix.h" diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp index e5640629908..166cce6b89d 100644 --- a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp +++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp @@ -1,6 +1,6 @@ -$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp,v 1.1 2015/07/09 15:17:35 ryoon Exp $ +$NetBSD: patch-mozilla_xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2015-06-08 17:49:34.000000000 +0000 +--- mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xpcom/reflect/xptcall/md/unix/xptcstubs_netbsd_m68k.cpp @@ -91,17 +91,27 @@ extern "C" { } diff --git a/mail/thunderbird/patches/patch-mozilla_xulrunner_installer_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xulrunner_installer_Makefile.in index 2f47a89754f..f4601fb6076 100644 --- a/mail/thunderbird/patches/patch-mozilla_xulrunner_installer_Makefile.in +++ b/mail/thunderbird/patches/patch-mozilla_xulrunner_installer_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-mozilla_xulrunner_installer_Makefile.in,v 1.1 2013/11/12 20:50:51 ryoon Exp $ +$NetBSD: patch-mozilla_xulrunner_installer_Makefile.in,v 1.2 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xulrunner/installer/Makefile.in.orig 2013-10-23 22:09:22.000000000 +0000 +--- mozilla/xulrunner/installer/Makefile.in.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xulrunner/installer/Makefile.in -@@ -96,7 +96,7 @@ endif +@@ -88,7 +88,7 @@ endif install:: $(pkg_config_files) @echo pkg_config_file: $(pkg_config_files) diff --git a/mail/thunderbird/patches/patch-pc b/mail/thunderbird/patches/patch-mozilla_xulrunner_installer_libxul-embedding.pc.in index bf98cf255c6..09d67ef18b9 100644 --- a/mail/thunderbird/patches/patch-pc +++ b/mail/thunderbird/patches/patch-mozilla_xulrunner_installer_libxul-embedding.pc.in @@ -1,6 +1,6 @@ -$NetBSD: patch-pc,v 1.9 2014/07/27 20:05:00 ryoon Exp $ +$NetBSD: patch-mozilla_xulrunner_installer_libxul-embedding.pc.in,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig 2014-07-18 00:05:57.000000000 +0000 +--- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xulrunner/installer/libxul-embedding.pc.in @@ -6,5 +6,6 @@ idldir=%idldir% Name: libxul-embedding diff --git a/mail/thunderbird/patches/patch-pb b/mail/thunderbird/patches/patch-mozilla_xulrunner_installer_libxul.pc.in index bc733963b47..5a35ea4c2d5 100644 --- a/mail/thunderbird/patches/patch-pb +++ b/mail/thunderbird/patches/patch-mozilla_xulrunner_installer_libxul.pc.in @@ -1,6 +1,6 @@ -$NetBSD: patch-pb,v 1.9 2014/07/27 20:05:00 ryoon Exp $ +$NetBSD: patch-mozilla_xulrunner_installer_libxul.pc.in,v 1.1 2016/04/17 18:33:50 ryoon Exp $ ---- mozilla/xulrunner/installer/libxul.pc.in.orig 2014-07-18 00:05:57.000000000 +0000 +--- mozilla/xulrunner/installer/libxul.pc.in.orig 2016-04-07 21:33:35.000000000 +0000 +++ mozilla/xulrunner/installer/libxul.pc.in @@ -7,5 +7,5 @@ Name: libxul Description: The Mozilla Runtime and Embedding Engine |