Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
sambuc
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/thunderbird/patches/patch-al
-16
View File
@@ -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;
}
mail/thunderbird/patches/patch-ax
-56
View File
@@ -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,
mail/thunderbird/patches/patch-ay
-33
View File
@@ -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;
mail/thunderbird/patches/patch-calendar_lightning_Makefile.in
+4 -4
View File
@@ -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)
mail/thunderbird/patches/patch-calendar_lightning_build_universal.mk
+2 -2
View File
@@ -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
mail/thunderbird/patches/patch-calendar_providers_gdata_Makefile.in
+5 -5
View File
@@ -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)
mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc
-48
View File
@@ -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
mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
-28
View File
@@ -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 "";
mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h → mail/thunderbird/patches/patch-ldap_c-sdk_include_portable.h
+4 -8
View File
@@ -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
mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk
-39
View File
@@ -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)
mail/thunderbird/patches/patch-zc → mail/thunderbird/patches/patch-mail_app_nsMailApp.cpp
+3 -3
View File
@@ -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)
{
mail/thunderbird/patches/patch-mail_components_shell_nsMailGNOMEIntegration.cpp
+2 -4
View File
@@ -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 {
mail/thunderbird/patches/patch-mail_installer_package-manifest.in
+3 -3
View File
@@ -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
mail/thunderbird/patches/patch-mail_installer_removed-files.in
+4 -4
View File
@@ -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
mail/thunderbird/patches/patch-ml
-16
View File
@@ -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)
mail/thunderbird/patches/patch-mozilla_accessible_atk_Platform.cpp
-98
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_b2g_installer_Makefile.in
-15
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_b2g_installer_package-manifest.in
-13
View File
@@ -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
mail/thunderbird/patches/patch-rc → mail/thunderbird/patches/patch-mozilla_browser_branding_unofficial_locales_en-US_brand.dtd
+6 -6
View File
@@ -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 " ">
mail/thunderbird/patches/patch-mozilla_browser_installer_package-manifest.in
+5 -5
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_build_autoconf_compiler-opts.m4
+2 -2
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4
+2 -2
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_build_gyp.mozbuild
+5 -5
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_build_pgo_profileserver.py
+3 -3
View File
@@ -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"]
mail/thunderbird/patches/patch-mozilla_config_Makefile.in
+3 -3
View File
@@ -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) \
mail/thunderbird/patches/patch-mozilla_config_baseconfig.mk
+5 -5
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_config_external_moz.build
+6 -18
View File
@@ -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',
mail/thunderbird/patches/patch-mk → mail/thunderbird/patches/patch-mozilla_config_rules.mk
+3 -5
View File
@@ -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)
mail/thunderbird/patches/patch-mozilla_config_stl__wrappers_ios
+2 -2
View File
@@ -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)
mail/thunderbird/patches/patch-mozilla_config_stl__wrappers_ostream
+2 -2
View File
@@ -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)
mail/thunderbird/patches/patch-mozilla_config_system-headers
+36 -40
View File
@@ -1,54 +1,50 @@
$NetBSD: patch-mozilla_config_system-headers,v 1.6 2015/09/07 15:19:10 ryoon Exp $
$NetBSD: patch-mozilla_config_system-headers,v 1.10 2016/04/17 18:33:50 ryoon Exp $
--- mozilla/config/system-headers.orig 2015-08-13 14:57:14.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
@@ -471,6 +470,7 @@ freetype/ftbitmap.h
freetype/ftxf86.h
freetype.h
ftcache.h
+ftfntfmt.h
ftglyph.h
ftsynth.h
ftoutln.h
@@ -636,6 +636,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
@@ -1266,7 +1267,6 @@ X11/Xlocale.h
X11/Xos.h
X11/Xutil.h
zmouse.h
-soundtouch/SoundTouch.h
#if MOZ_NATIVE_PNG==1
png.h
@@ -722,6 +723,7 @@ mapiutil.h
mapix.h
Math64.h
math.h
+complex
mbstring.h
#ifdef ANDROID
media/AudioEffect.h
@@ -1314,6 +1316,25 @@ vpx/vp8cx.h
vpx/vp8dx.h
vpx_mem/vpx_mem.h
#endif
@@ -1328,10 +1328,13 @@ 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
+#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
#endif
+ogg/ogg.h
+ogg/os_types.h
+nestegg/nestegg.h
+cubeb/cubeb.h
+speex/speex_resampler.h
+soundtouch/SoundTouch.h
+#endif
gst/gst.h
gst/app/gstappsink.h
@@ -1360,3 +1363,43 @@ unicode/utypes.h
gst/app/gstappsrc.h
@@ -1344,3 +1365,43 @@ unicode/utypes.h
#endif
libutil.h
unwind.h
mail/thunderbird/patches/patch-mozilla_config_system__wrappers_unwind.h
-9
View File
@@ -1,9 +0,0 @@
$NetBSD: patch-mozilla_config_system__wrappers_unwind.h,v 1.1 2013/05/14 12:41:02 joerg Exp $
--- mozilla/config/system_wrappers/unwind.h.orig 2013-05-13 19:56:18.000000000 +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
mail/thunderbird/patches/patch-aa → mail/thunderbird/patches/patch-mozilla_configure.in
+23 -73
View File
@@ -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 ========================================================
mail/thunderbird/patches/patch-mozilla_dom_base_DOMRequest.cpp
+12
View File
@@ -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)
mail/thunderbird/patches/patch-mozilla_dom_base_moz.build
+3 -3
View File
@@ -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']
mail/thunderbird/patches/patch-mozilla_dom_media_AudioStream.h
-13
View File
@@ -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 {
mail/thunderbird/patches/patch-mozilla_dom_media_gmp_GMPChild.cpp
-30
View File
@@ -1,30 +0,0 @@
$NetBSD: patch-mozilla_dom_media_gmp_GMPChild.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $
--- mozilla/dom/media/gmp/GMPChild.cpp.orig 2015-06-08 17:49:28.000000000 +0000
+++ mozilla/dom/media/gmp/GMPChild.cpp
@@ -79,21 +79,14 @@ GetFileBase(const std::string& aPluginPa
}
#endif
- nsCOMPtr<nsIFile> parent;
- rv = aFileBase->GetParent(getter_AddRefs(parent));
- if (NS_FAILED(rv)) {
- return false;
- }
-
- nsAutoString parentLeafName;
- rv = parent->GetLeafName(parentLeafName);
- if (NS_FAILED(rv)) {
+ nsAutoString leafName;
+ if (NS_FAILED(aFileBase->GetLeafName(leafName))) {
return false;
}
- aBaseName = Substring(parentLeafName,
+ aBaseName = Substring(leafName,
4,
- parentLeafName.Length() - 1);
+ leafName.Length() - 1);
return true;
}
mail/thunderbird/patches/patch-mozilla_dom_media_gmp_GMPParent.cpp
-33
View File
@@ -1,33 +0,0 @@
$NetBSD: patch-mozilla_dom_media_gmp_GMPParent.cpp,v 1.1 2015/07/09 15:17:34 ryoon Exp $
--- mozilla/dom/media/gmp/GMPParent.cpp.orig 2015-06-08 17:49:28.000000000 +0000
+++ mozilla/dom/media/gmp/GMPParent.cpp
@@ -100,23 +100,16 @@ GMPParent::Init(GeckoMediaPluginService
mService = aService;
mDirectory = aPluginDir;
- // aPluginDir is <profile-dir>/<gmp-plugin-id>/<version>
- // where <gmp-plugin-id> should be gmp-gmpopenh264
- nsCOMPtr<nsIFile> parent;
- nsresult rv = aPluginDir->GetParent(getter_AddRefs(parent));
- if (NS_FAILED(rv)) {
- return rv;
- }
- nsAutoString parentLeafName;
- rv = parent->GetLeafName(parentLeafName);
+ nsAutoString leafname;
+ nsresult rv = aPluginDir->GetLeafName(leafname);
if (NS_FAILED(rv)) {
return rv;
}
LOGD(("%s::%s: %p for %s", __CLASS__, __FUNCTION__, this,
- NS_LossyConvertUTF16toASCII(parentLeafName).get()));
+ NS_LossyConvertUTF16toASCII(leafname).get()));
- MOZ_ASSERT(parentLeafName.Length() > 4);
- mName = Substring(parentLeafName, 4);
+ MOZ_ASSERT(leafname.Length() > 4);
+ mName = Substring(leafname, 4);
return ReadGMPMetaData();
}
mail/thunderbird/patches/patch-mozilla_dom_media_gstreamer_GStreamerAllocator.cpp
+2 -2
View File
@@ -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"
mail/thunderbird/patches/patch-mozilla_dom_media_moz.build
+3 -3
View File
@@ -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']
mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
+5 -5
View File
@@ -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;
mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h
+3 -3
View File
@@ -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;
mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginProcessChild.cpp
+3 -3
View File
@@ -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");
mail/thunderbird/patches/patch-mozilla_dom_system_OSFileConstants.cpp
+9 -22
View File
@@ -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)
mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_src_mozHunspell.cpp → mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp
+4 -4
View File
@@ -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
}
}
mail/thunderbird/patches/patch-mozilla_gfx_cairo_libpixman_src_pixman-arm-neon-asm.S
+37
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_gfx_gl_GLContextProviderGLX.cpp
+13
View File
@@ -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";
mail/thunderbird/patches/patch-mozilla_gfx_graphite2_moz-gr-update.sh
-20
View File
@@ -1,20 +0,0 @@
$NetBSD: patch-mozilla_gfx_graphite2_moz-gr-update.sh,v 1.1 2015/07/09 15:17:34 ryoon Exp $
--- mozilla/gfx/graphite2/moz-gr-update.sh.orig 2015-06-08 17:49:34.000000000 +0000
+++ mozilla/gfx/graphite2/moz-gr-update.sh
@@ -23,8 +23,14 @@ echo "\nSee" $0 "for update procedure.\n
find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
+# closest tag/release to require for system version
+TAG=$(cd ../graphitedev/ && hg parents --template {latesttag})
+
+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$TAG/ and tr/./,/ \
+ if /GR2_VERSION_REQUIRE/" configure.in
+
# summarize what's been touched
-echo Updated to $CHANGESET.
+echo Updated to $CHANGESET \($TAG for --with-system-graphite2\)
echo Here is what changed in the gfx/graphite2 directory:
echo
mail/thunderbird/patches/patch-mozilla_gfx_graphite2_src_Bidi.cpp
+3 -3
View File
@@ -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;
mail/thunderbird/patches/patch-mozilla_gfx_moz.build
+2 -2
View File
@@ -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']:
mail/thunderbird/patches/patch-mozilla_gfx_skia_generate__mozbuild.py
+8 -5
View File
@@ -1,11 +1,14 @@
$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']
+
mail/thunderbird/patches/patch-mozilla_gfx_skia_moz.build
+8 -5
View File
@@ -1,11 +1,14 @@
$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']
+
mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_core_SkUtilsArm.cpp
+45
View File
@@ -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.
mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_opts_SkBitmapProcState__opts__arm.cpp
+28
View File
@@ -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
);
}
mail/thunderbird/patches/patch-mozilla_gfx_skia_skia_src_opts_memset.arm.S
+49
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_gfx_thebes_moz.build
+11 -3
View File
@@ -1,8 +1,8 @@
$NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.1 2015/07/09 15:17:34 ryoon 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-06-08 17:49:17.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,3 +15,11 @@ $NetBSD: patch-mozilla_gfx_thebes_moz.build,v 1.1 2015/07/09 15:17:34 ryoon Exp
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
@@ -306,7 +312,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk
LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
-DEFINES['GRAPHITE2_STATIC'] = True
-
if CONFIG['OS_ARCH'] == 'WINNT':
del DEFINES['UNICODE']
mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_moz.build
+2 -2
View File
@@ -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:
mail/thunderbird/patches/patch-mozilla_gfx_ycbcr_yuv__row__arm.S
+2 -2
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_image_decoders_nsJPEGDecoder.cpp
+10 -9
View File
@@ -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 **************/
+
mail/thunderbird/patches/patch-mozilla_intl_hyphenation_glue_hnjalloc.h
+14
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_intl_hyphenation_hnjalloc.h
-14
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_intl_unicharutil_util_moz.build
-13
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
-13
View File
@@ -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)
mail/thunderbird/patches/patch-mozilla_ipc_chromium_moz.build
-16
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_atomicops.h
+2 -2
View File
@@ -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;
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util.h
-14
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__posix.cc
+21
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc
+4 -4
View File
@@ -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) {
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__pump__libevent.cc
+20
View File
@@ -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:
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h
+2 -2
View File
@@ -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__)
mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc → mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc
+5 -7
View File
@@ -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);
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
+2 -2
View File
@@ -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;
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
+7 -6
View File
@@ -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"
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc
+4 -4
View File
@@ -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() {
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_scoped__nsautorelease__pool.h
+2 -2
View File
@@ -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 @@
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_sys__info__posix.cc
+16
View File
@@ -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 "";
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc
+2 -2
View File
@@ -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
mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h → mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_build_build__config.h
+4 -4
View File
@@ -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.
mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h
+3 -3
View File
@@ -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;
mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp → mail/thunderbird/patches/patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp
+5 -5
View File
@@ -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,
mail/thunderbird/patches/patch-mozilla_ipc_glue_ScopedXREEmbed.cpp
-13
View File
@@ -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.
mail/thunderbird/patches/patch-mozilla_ipc_glue_StringUtil.cpp
+3 -3
View File
@@ -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.
mail/thunderbird/patches/patch-mozilla_ipc_glue_moz.build
+4 -4
View File
@@ -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'
mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_cxx_ast.py
-21
View File
@@ -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):
mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_cxx_cgen.py
-23
View File
@@ -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)
mail/thunderbird/patches/patch-mozilla_ipc_ipdl_ipdl_lower.py
-13
View File
@@ -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|
mail/thunderbird/patches/patch-mozilla_js_public_CallArgs.h
-13
View File
@@ -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);
};
mail/thunderbird/patches/patch-mozilla_js_src_asmjs_AsmJSSignalHandlers.cpp
-19
View File
@@ -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;
mail/thunderbird/patches/patch-as → mail/thunderbird/patches/patch-mozilla_js_src_configure.in
+7 -9
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_js_src_ctypes_CTypes.h
+3 -3
View File
@@ -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"
mail/thunderbird/patches/patch-mozilla_js_src_frontend_ParseMaps.cpp
+3 -3
View File
@@ -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
}
}
mail/thunderbird/patches/patch-mozilla_js_src_gc_Statistics.cpp
-15
View File
@@ -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 == '-')
mail/thunderbird/patches/patch-mozilla_js_src_jit_ExecutableAllocator.h
-16
View File
@@ -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)
{
mail/thunderbird/patches/patch-mozilla_js_src_jit_LIR.cpp
+5 -5
View File
@@ -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
mail/thunderbird/patches/patch-mozilla_js_src_jit_MIR.cpp
+5 -5
View File
@@ -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&
mail/thunderbird/patches/patch-mozilla_js_src_jit_arm_Architecture-arm.cpp
+3 -3
View File
@@ -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.
mail/thunderbird/patches/patch-mozilla_js_src_jsapi.cpp
-13
View File
@@ -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];
mail/thunderbird/patches/patch-mozilla_js_src_jsdate.cpp
+5 -10
View File
@@ -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]))) {
mail/thunderbird/patches/patch-mozilla_js_src_jskwgen.cpp
+2 -2
View File
@@ -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++ = '\\';
mail/thunderbird/patches/patch-mozilla_js_src_jsmath.cpp
+3 -3
View File
@@ -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

Some files were not shown because too many files have changed in this diff Show More