diff options
Diffstat (limited to 'www/libxul')
| -rw-r--r-- | www/libxul/Makefile | 6 | ||||
| -rw-r--r-- | www/libxul/distinfo | 4 | ||||
| -rw-r--r-- | www/libxul/files/patch-bug543241 | 11 | ||||
| -rw-r--r-- | www/libxul/files/patch-bug696030 | 34 | ||||
| -rw-r--r-- | www/libxul/files/patch-bug713802 | 176 | ||||
| -rw-r--r-- | www/libxul/files/patch-bug753046 | 3 | ||||
| -rw-r--r-- | www/libxul/files/patch-bug785638 | 168 | ||||
| -rw-r--r-- | www/libxul/files/patch-bug789693 | 108 | ||||
| -rw-r--r-- | www/libxul/files/patch-bug791305 | 107 | ||||
| -rw-r--r-- | www/libxul/files/patch-bug791366 | 124 | ||||
| -rw-r--r-- | www/libxul/files/patch-clang32-libc++-visibility-hack | 38 | ||||
| -rw-r--r-- | www/libxul/files/patch-clang32-visibility-hack | 20 | ||||
| -rw-r--r-- | www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp | 15 |
13 files changed, 603 insertions, 211 deletions
diff --git a/www/libxul/Makefile b/www/libxul/Makefile index 27adaa856207..21d1f8eb2ed5 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libxul -DISTVERSION= 10.0.7 +DISTVERSION= 10.0.8 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= firefox/releases/${DISTVERSION}esr/source @@ -16,7 +16,7 @@ MAINTAINER?= gecko@FreeBSD.org COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ - nss>=3.13.1:${PORTSDIR}/security/nss \ + nss>=3.13.6_1:${PORTSDIR}/security/nss \ sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -49,6 +49,8 @@ PLIST_DIRSTRY= share/idl MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js \ mozilla-plugin +OPTIONS_DEFAULT=GIO + .include "${.CURDIR}/../../www/firefox/Makefile.options" .include <bsd.port.pre.mk> diff --git a/www/libxul/distinfo b/www/libxul/distinfo index 4302c68e47ba..83c24e982d11 100644 --- a/www/libxul/distinfo +++ b/www/libxul/distinfo @@ -1,2 +1,2 @@ -SHA256 (firefox-10.0.7esr.source.tar.bz2) = 91b0dab3168d75a4f157dabfdf6a95367cd3a8767298d88fb43be251f37f4423 -SIZE (firefox-10.0.7esr.source.tar.bz2) = 75624327 +SHA256 (firefox-10.0.8esr.source.tar.bz2) = e908c51761b0143b9f5e8b045b8c91b624357eee8786cd861028e1df60da52f9 +SIZE (firefox-10.0.8esr.source.tar.bz2) = 75620783 diff --git a/www/libxul/files/patch-bug543241 b/www/libxul/files/patch-bug543241 index 73db2c3a785e..7cc0736c14b6 100644 --- a/www/libxul/files/patch-bug543241 +++ b/www/libxul/files/patch-bug543241 @@ -1,5 +1,16 @@ --- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 +@@ -12,6 +12,10 @@ + #include "nsAutoPtr.h" + #include "nsCycleCollectorUtils.h" + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#endif ++ + using namespace mozilla; + + #ifdef XP_WIN @@ -89,6 +89,11 @@ nsresult nsThreadManager::Init() diff --git a/www/libxul/files/patch-bug696030 b/www/libxul/files/patch-bug696030 new file mode 100644 index 000000000000..6845651544d7 --- /dev/null +++ b/www/libxul/files/patch-bug696030 @@ -0,0 +1,34 @@ +commit 5e354b9 +Author: Chris Coulson <chris.coulson@canonical.com> +Date: Thu Jan 5 11:19:50 2012 +1300 + + Bug 696030 - Use MonitorAutoLock rather than MonitorAutoEnter in nsGIOProtocolHandler r=karlt + + --HG-- + extra : rebase_source : 6f3d1a49a07affab679e41cd8cf968d62c072299 +--- + extensions/gio/nsGIOProtocolHandler.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git extensions/gio/nsGIOProtocolHandler.cpp extensions/gio/nsGIOProtocolHandler.cpp +index 9347b6e..e8f153d 100644 +--- extensions/gio/nsGIOProtocolHandler.cpp ++++ extensions/gio/nsGIOProtocolHandler.cpp +@@ -238,7 +238,7 @@ class nsGIOInputStream : public nsIInputStream + void + nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code) + { +- mozilla::MonitorAutoEnter mon(mMonitorMountInProgress); ++ mozilla::MonitorAutoLock mon(mMonitorMountInProgress); + mMountRes = result; + mMountErrorCode = error_code; + mon.Notify(); +@@ -263,7 +263,7 @@ nsGIOInputStream::MountVolume() { + NULL, + mount_enclosing_volume_finished, + this); +- mozilla::MonitorAutoEnter mon(mMonitorMountInProgress); ++ mozilla::MonitorAutoLock mon(mMonitorMountInProgress); + /* Waiting for finish of mount operation thread */ + while (mMountRes == MOUNT_OPERATION_IN_PROGRESS) + mon.Wait(); diff --git a/www/libxul/files/patch-bug713802 b/www/libxul/files/patch-bug713802 new file mode 100644 index 000000000000..956ed1cc8e97 --- /dev/null +++ b/www/libxul/files/patch-bug713802 @@ -0,0 +1,176 @@ +commit 20586fa +Author: Karl Tomlinson <karlt+@karlt.net> +Date: Thu Sep 27 18:35:06 2012 +1200 + + b=713802 default enable GIO support and disable GnomeVFS r=glandium + + --HG-- + extra : transplant_source : wk%ADr%CA%8EN%AE%C93p/p%0A%26%0E%1D0%F20 +--- + browser/confvars.sh | 2 +- + configure.in | 20 ++++++++++---------- + xulrunner/confvars.sh | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git browser/confvars.sh browser/confvars.sh +index 40ab494..eae5645 100755 +--- browser/confvars.sh ++++ browser/confvars.sh +@@ -21,7 +21,7 @@ MOZ_SERVICES_AITC=1 + MOZ_SERVICES_NOTIFICATIONS=1 + MOZ_SERVICES_SYNC=1 + MOZ_APP_VERSION=$FIREFOX_VERSION +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh + # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, + # because branding dependencies are broken. +--- browser/installer/package-manifest.in~ ++++ browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif +diff --git configure.in configure.in +index 87a9391..2118651 100644 +--- configure.in ++++ configure.in +@@ -4846,21 +4846,21 @@ dnl ======================================================== + + if test "$MOZ_X11" + then +- dnl build the gnomevfs extension by default only when the ++ dnl build the GIO extension by default only when the + dnl GTK2 toolkit is in use. + if test "$MOZ_ENABLE_GTK2" + then +- MOZ_ENABLE_GNOMEVFS=1 ++ MOZ_ENABLE_GIO=1 + MOZ_ENABLE_GCONF=1 + fi + + dnl ======================================================== + dnl = GnomeVFS support module + dnl ======================================================== +- MOZ_ARG_DISABLE_BOOL(gnomevfs, +- [ --disable-gnomevfs Disable GnomeVFS support ], +- MOZ_ENABLE_GNOMEVFS=, +- MOZ_ENABLE_GNOMEVFS=force) ++ MOZ_ARG_ENABLE_BOOL(gnomevfs, ++ [ --enable-gnomevfs Enable GnomeVFS support (default: disabled)], ++ MOZ_ENABLE_GNOMEVFS=force, ++ MOZ_ENABLE_GNOMEVFS=) + + if test "$MOZ_ENABLE_GNOMEVFS" + then +@@ -4884,10 +4884,10 @@ then + dnl ======================================================== + dnl = GIO support module + dnl ======================================================== +- MOZ_ARG_ENABLE_BOOL(gio, +- [ --enable-gio Enable GIO support (default: disabled)], +- MOZ_ENABLE_GIO=force, +- MOZ_ENABLE_GIO=) ++ MOZ_ARG_DISABLE_BOOL(gio, ++ [ --disable-gio Disable GIO support], ++ MOZ_ENABLE_GIO=, ++ MOZ_ENABLE_GIO=force) + + if test "$MOZ_ENABLE_GIO" -a "$MOZ_ENABLE_GTK2" + then +diff --git xulrunner/confvars.sh xulrunner/confvars.sh +index 2fa6ead..5fe2c3d 100755 +--- xulrunner/confvars.sh ++++ xulrunner/confvars.sh +@@ -10,5 +10,5 @@ MOZ_XULRUNNER=1 + MOZ_CHROME_FILE_FORMAT=omni + MOZ_APP_VERSION=$MOZILLA_VERSION + MOZ_PLACES=1 +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + MOZ_URL_CLASSIFIER=1 + +commit d884d75 +Author: Karl Tomlinson <karlt+@karlt.net> +Date: Thu Sep 27 18:34:44 2012 +1200 + + b=713802 disable gnomevfs extension without --enable-gnomevfs r=glandium + + --HG-- + extra : transplant_source : i%07%81%E9%90_%C1%05b%194%9B%1E%93%FC%03%279%F9%8A +--- + configure.in | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git configure.in configure.in +index f2b4041..87a9391 100644 +--- configure.in ++++ configure.in +@@ -4875,12 +4875,6 @@ then + fi + MOZ_ENABLE_GNOMEVFS= + ]) +- else +- if test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then +- PKG_CHECK_MODULES(MOZ_GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION,[ +- MOZ_GNOMEVFS_LIBS=`echo $MOZ_GNOMEVFS_LIBS | sed 's/-llinc\>//'` +- ]) +- fi + fi + + AC_SUBST(MOZ_ENABLE_GNOMEVFS) +@@ -5967,10 +5961,10 @@ MOZ_ARG_ENABLE_STRING(extensions, + done], + MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT") + +-if test -z "$MOZ_ENABLE_GNOMEVFS" -a -z "$MOZ_GNOMEVFS_LIBS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then ++if test -z "$MOZ_ENABLE_GNOMEVFS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gnomevfs without required libraries. Removing gnomevfs from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gnomevfs from MOZ_EXTENSIONS due to no --enable-gnomevfs.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` + fi +@@ -5983,7 +5977,7 @@ fi + if test -z "$MOZ_ENABLE_GIO" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gio without required libraries. Removing gio from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gio from MOZ_EXTENSIONS due to --disable-gio.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + +commit ddedeea +Author: Karl Tomlinson <karlt+@karlt.net> +Date: Thu Sep 27 13:47:19 2012 +1200 + + b=713802 link gio extension against libxul for tracemalloc stack functions r=bsmedberg + + --HG-- + extra : transplant_source : %C8%A3o%BE%A0z%F7%C8%8A%E6%0E%D4s%7D%90%9C%D9%0F%06%7E +--- + extensions/gio/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git extensions/gio/Makefile.in extensions/gio/Makefile.in +index 46412c4..ccf2846 100644 +--- extensions/gio/Makefile.in ++++ extensions/gio/Makefile.in +@@ -23,7 +23,7 @@ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + + EXTRA_DSO_LDOPTS = \ + $(XPCOM_GLUE_LDOPTS) \ +- $(NSPR_LIBS) \ ++ $(MOZ_COMPONENT_LIBS) \ + $(MOZ_GIO_LIBS) \ + $(NULL) + diff --git a/www/libxul/files/patch-bug753046 b/www/libxul/files/patch-bug753046 index 48c16e5db2e1..c606ab1f58bc 100644 --- a/www/libxul/files/patch-bug753046 +++ b/www/libxul/files/patch-bug753046 @@ -451,7 +451,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:0 --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ ipc/chromium/src/base/platform_thread.h -@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE +@@ -22,9 +22,12 @@ typedef void* PlatformThreadHandle; // HANDLE #elif defined(OS_POSIX) #include <pthread.h> typedef pthread_t PlatformThreadHandle; @@ -460,6 +460,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/06 12:34:0 #include <unistd.h> typedef pid_t PlatformThreadId; +#elif defined(OS_BSD) ++#include <sys/types.h> +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include <mach/mach.h> diff --git a/www/libxul/files/patch-bug785638 b/www/libxul/files/patch-bug785638 deleted file mode 100644 index 6e1f63d64971..000000000000 --- a/www/libxul/files/patch-bug785638 +++ /dev/null @@ -1,168 +0,0 @@ -diff --git configure.in configure.in -index cef992b..3bd39ca 100644 ---- configure.in -+++ configure.in -@@ -5353,22 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then - - dnl See if we have assembly on this platform. - case "$OS_ARCH:$CPU_ARCH" in -- Linux:x86) -- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -- VPX_X86_ASM=1 -- ;; -- Linux:x86_64) -- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -- VPX_X86_ASM=1 -- ;; -- SunOS:x86) -- VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -- VPX_X86_ASM=1 -- ;; -- SunOS:x86_64) -- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -- VPX_X86_ASM=1 -- ;; - Darwin:x86) - VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC" - VPX_X86_ASM=1 -@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then - VPX_ASM_SUFFIX="$ASM_SUFFIX" - VPX_ARM_ASM=1 - fi -+ ;; -+ *:x86) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" -+ VPX_X86_ASM=1 -+ fi -+ ;; -+ *:x86_64) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" -+ VPX_X86_ASM=1 -+ fi -+ ;; - esac - - if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then -@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then - - dnl Do we support libjpeg-turbo on this platform? - case "$OS_ARCH:$OS_TEST" in -- Linux:x86|Linux:i?86) -- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -- LIBJPEG_TURBO_X86_ASM=1 -- ;; -- Linux:x86_64) -- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -- LIBJPEG_TURBO_X64_ASM=1 -- ;; -- SunOS:i?86) -- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -- LIBJPEG_TURBO_X86_ASM=1 -- ;; -- SunOS:x86_64) -- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -- LIBJPEG_TURBO_X64_ASM=1 -- ;; - Darwin:i?86) - LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO" - LIBJPEG_TURBO_X86_ASM=1 -@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then - LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon" - LIBJPEG_TURBO_ARM_ASM=1 - ;; -+ *:x86|*:i?86) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" -+ LIBJPEG_TURBO_X86_ASM=1 -+ fi -+ ;; -+ *:x86_64) -+ if $CC -E -dM -</dev/null | grep -q __ELF__; then -+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" -+ LIBJPEG_TURBO_X64_ASM=1 -+ fi -+ ;; - esac - - fi -diff --git media/libvpx/update.sh media/libvpx/update.sh -index 79e0fb1..51956af 100755 ---- media/libvpx/update.sh -+++ media/libvpx/update.sh -@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h - # Should be same for all platforms... - cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h - --# Config files for x86-linux-gcc and Solaris x86 -+# Config files for x86-linux-gcc and other x86 elf platforms - cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c - cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm - cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h - --# Config files for x86_64-linux-gcc and Solaris x86_64 -+# Config files for x86_64-linux-gcc and other x86_64 elf platforms - cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c - cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm - cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h -diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h -index 55433f3..36e1780 100644 ---- media/libvpx/vpx_config.h -+++ media/libvpx/vpx_config.h -@@ -16,20 +16,12 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.h" - --#elif defined(__linux__) && defined(__i386__) --/* 32 bit Linux. */ -+#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) -+/* 32 bit ELF platforms. */ - #include "vpx_config_x86-linux-gcc.h" - --#elif defined(__linux__) && defined(__x86_64__) --/* 64 bit Linux. */ --#include "vpx_config_x86_64-linux-gcc.h" -- --#elif defined(__sun) && defined(__i386) --/* 32 bit Solaris. */ --#include "vpx_config_x86-linux-gcc.h" -- --#elif defined(__sun) && defined(__x86_64) --/* 64 bit Solaris. */ -+#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) -+/* 64 bit ELF platforms. */ - #include "vpx_config_x86_64-linux-gcc.h" - - #else -diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c -index eedd515..c8b5375 100644 ---- media/libvpx/vpx_config_c.c -+++ media/libvpx/vpx_config_c.c -@@ -12,22 +12,14 @@ - /* 32 bit MacOS. */ - #include "vpx_config_x86-darwin9-gcc.c" - --#elif defined(__linux__) && defined(__i386__) --/* 32 bit Linux. */ -+#elif defined(__ELF__) && (defined(__i386) || defined(__i386__)) -+/* 32 bit ELF platforms. */ - #include "vpx_config_x86-linux-gcc.c" - --#elif defined(__linux__) && defined(__x86_64__) --/* 64 bit Linux. */ -+#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__)) -+/* 64 bit ELF platforms. */ - #include "vpx_config_x86_64-linux-gcc.c" - --#elif defined(__sun) && defined(__i386) --/* 32 bit Solaris. */ --#include "vpx_config_x86-linux-gcc.h" -- --#elif defined(__sun) && defined(__x86_64) --/* 64 bit Solaris. */ --#include "vpx_config_x86_64-linux-gcc.h" -- - #elif defined(_MSC_VER) && defined(_M_X64) - #include "vpx_config_x86_64-win64-vs8.c" - diff --git a/www/libxul/files/patch-bug789693 b/www/libxul/files/patch-bug789693 new file mode 100644 index 000000000000..dee137ab64fe --- /dev/null +++ b/www/libxul/files/patch-bug789693 @@ -0,0 +1,108 @@ +--- toolkit/components/startup/nsAppStartup.cpp ++++ toolkit/components/startup/nsAppStartup.cpp +@@ -50,17 +50,40 @@ + #include <sys/syscall.h> + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include <sys/param.h> + #include <sys/sysctl.h> + #endif + +-#ifdef __OpenBSD__ +-#include <sys/param.h> +-#include <sys/sysctl.h> ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include <sys/user.h> + #endif + + #include "mozilla/Telemetry.h" + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + using namespace mozilla; +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ sizeof(KINFO_PROC), ++ 1, ++#endif ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[0]); + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- PRTime starttime = static_cast<PRTime>(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; +- starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &buffer_size, NULL, 0)) + return 0; + +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- PRTime starttime = static_cast<PRTime>(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast<PRTime>(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; + return starttime; + } + #else diff --git a/www/libxul/files/patch-bug791305 b/www/libxul/files/patch-bug791305 new file mode 100644 index 000000000000..534e7f2d9cac --- /dev/null +++ b/www/libxul/files/patch-bug791305 @@ -0,0 +1,107 @@ +commit c269a16 +Author: Jeff Muizelaar <jmuizelaar@mozilla.com> +Date: Fri Sep 14 15:54:55 2012 -0400 + + Bug 791305. Use libjpeg's color conversion code instead of our own. r=joe,r=khuey + + libjpeg-turbo supports converting directly to a format compatible with cairo's + FORMAT_RGB24. Use that instead of our own handcoded function. This also gives + us SSE2 and NEON version of this function. + + --HG-- + extra : rebase_source : 18f48925f023a33ec2a097d4f4e5cc2ab40be1e9 +--- + configure.in | 6 +- + image/decoders/nsJPEGDecoder.cpp | 311 ++------------------------------------- + 2 files changed, 20 insertions(+), 297 deletions(-) + +diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp +index c1fb515..1d2a259 100644 +--- image/decoders/nsJPEGDecoder.cpp ++++ image/decoders/nsJPEGDecoder.cpp +@@ -22,6 +22,13 @@ + extern "C" { + #include "iccjpeg.h" + ++#ifdef JCS_EXTENSIONS ++#if defined(IS_BIG_ENDIAN) ++#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB ++#else ++#define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX ++#endif ++#else + /* Colorspace conversion (copied from jpegint.h) */ + struct jpeg_color_deconverter { + JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); +@@ -34,6 +41,7 @@ METHODDEF(void) + ycc_rgb_convert_argb (j_decompress_ptr cinfo, + JSAMPIMAGE input_buf, JDIMENSION input_row, + JSAMPARRAY output_buf, int num_rows); ++#endif + } + + static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); +@@ -329,7 +340,18 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + case JCS_GRAYSCALE: + case JCS_RGB: + case JCS_YCbCr: ++#ifdef JCS_EXTENSIONS ++ // if we're not color managing we can decode directly to ++ // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB ++ if (mCMSMode != eCMSMode_All) { ++ mInfo.out_color_space = MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB; ++ mInfo.out_color_components = 4; ++ } else { ++ mInfo.out_color_space = JCS_RGB; ++ } ++#else + mInfo.out_color_space = JCS_RGB; ++#endif + break; + case JCS_CMYK: + case JCS_YCCK: +@@ -397,6 +419,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + return; /* I/O suspension */ + } + ++#ifndef JCS_EXTENSIONS + /* Force to use our YCbCr to Packed RGB converter when possible */ + if (!mTransform && (mCMSMode != eCMSMode_All) && + mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { +@@ -404,6 +427,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) + mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ + mInfo.cconvert->color_convert = ycc_rgb_convert_argb; + } ++#endif + + /* If this is a progressive JPEG ... */ + mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; +@@ -542,7 +566,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend) + PRUint32 *imageRow = ((PRUint32*)mImageData) + + (mInfo.output_scanline * mInfo.output_width); + ++#ifdef JCS_EXTENSIONS ++ if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) { ++#else + if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { ++#endif + /* Special case: scanline will be directly converted into packed ARGB */ + if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { + *suspend = true; /* suspend */ +@@ -858,6 +887,7 @@ term_source (j_decompress_ptr jd) + } // namespace mozilla + + ++#ifndef JCS_EXTENSIONS + /**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ + + /* +@@ -1130,7 +1160,8 @@ ycc_rgb_convert_argb (j_decompress_ptr cinfo, + } + } + } ++#endif + + + /**************** Inverted CMYK -> RGB conversion **************/ + /* diff --git a/www/libxul/files/patch-bug791366 b/www/libxul/files/patch-bug791366 new file mode 100644 index 000000000000..08a9181a33a7 --- /dev/null +++ b/www/libxul/files/patch-bug791366 @@ -0,0 +1,124 @@ +diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp +index a9aff58..674e757 100644 +--- xpcom/base/nsMemoryReporterManager.cpp ++++ xpcom/base/nsMemoryReporterManager.cpp +@@ -64,7 +64,7 @@ extern void jemalloc_stats(jemalloc_stat + # endif // XP_LINUX + #endif // MOZ_MEMORY + +-#if defined(XP_LINUX) || defined(XP_MACOSX) ++#ifdef XP_UNIX + + #include <sys/time.h> + #include <sys/resource.h> +@@ -122,6 +122,78 @@ static PRInt64 GetResident() + return GetProcSelfStatmField(1); + } + ++#elif defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++ ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include <sys/user.h> ++#endif ++ ++#include <unistd.h> ++ ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(__DragonFly__) ++#define KP_SIZE(kp) (kp.kp_vm_map_size) ++#define KP_RSS(kp) (kp.kp_vm_rssize * getpagesize()) ++#elif defined(__FreeBSD__) ++#define KP_SIZE(kp) (kp.ki_size) ++#define KP_RSS(kp) (kp.ki_rssize * getpagesize()) ++#elif defined(__NetBSD__) ++#define KP_SIZE(kp) (kp.p_vm_msize * getpagesize()) ++#define KP_RSS(kp) (kp.p_vm_rssize * getpagesize()) ++#elif defined(__OpenBSD__) ++#define KP_SIZE(kp) ((kp.p_vm_dsize + kp.p_vm_ssize \ ++ + kp.p_vm_tsize) * getpagesize()) ++#define KP_RSS(kp) (kp.p_vm_rssize * getpagesize()) ++#endif ++ ++static nsresult GetKinfoProcSelf(KINFO_PROC *proc) ++{ ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ sizeof(KINFO_PROC), ++ 1, ++#endif ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[0]); ++ size_t size = sizeof(KINFO_PROC); ++ if (sysctl(mib, miblen, proc, &size, NULL, 0)) ++ return NS_ERROR_FAILURE; ++ ++ return NS_OK; ++} ++ ++static PRInt64 GetVsize() ++{ ++ KINFO_PROC proc; ++ if (NS_SUCCEEDED(GetKinfoProcSelf(&proc))) ++ return KP_SIZE(proc); ++ ++ return -1; ++} ++ ++static PRInt64 GetResident() ++{ ++ KINFO_PROC proc; ++ if (NS_SUCCEEDED(GetKinfoProcSelf(&proc))) ++ return KP_RSS(proc); ++ ++ return -1; ++} ++ + #elif defined(XP_MACOSX) + + #include <mach/mach_init.h> +@@ -224,7 +297,7 @@ static PRInt64 GetResident() + + #endif + +-#if defined(XP_LINUX) || defined(XP_MACOSX) || defined(XP_WIN) ++#if defined(XP_UNIX) || defined(XP_WIN) + NS_MEMORY_REPORTER_IMPLEMENT(Vsize, + "vsize", + KIND_OTHER, +@@ -239,7 +312,7 @@ NS_MEMORY_REPORTER_IMPLEMENT(Vsize, + "measure of the memory resources used by the process.") + #endif + +-#if defined(XP_LINUX) || defined(XP_MACOSX) ++#if defined(XP_UNIX) + NS_MEMORY_REPORTER_IMPLEMENT(PageFaultsSoft, + "page-faults-soft", + KIND_OTHER, +@@ -457,11 +530,11 @@ nsMemoryReporterManager::Init() + REGISTER(HeapUnallocated); + REGISTER(Resident); + +-#if defined(XP_LINUX) || defined(XP_MACOSX) || defined(XP_WIN) ++#if defined(XP_UNIX) || defined(XP_WIN) + REGISTER(Vsize); + #endif + +-#if defined(XP_LINUX) || defined(XP_MACOSX) ++#if defined(XP_UNIX) + REGISTER(PageFaultsSoft); + REGISTER(PageFaultsHard); + #endif diff --git a/www/libxul/files/patch-clang32-libc++-visibility-hack b/www/libxul/files/patch-clang32-libc++-visibility-hack deleted file mode 100644 index ccada32cbee3..000000000000 --- a/www/libxul/files/patch-clang32-libc++-visibility-hack +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -2855,6 +2855,7 @@ EOF - #pragma GCC visibility push(hidden) - #pragma GCC visibility push(default) - #include <string.h> -+#include <iterator> - #pragma GCC visibility pop - - __attribute__ ((visibility ("default"))) void Func() { -@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { - } - EOF - ac_cv_have_visibility_builtin_bug=no -- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then -+ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then - ac_cv_have_visibility_builtin_bug=yes - else - if test `grep -c "@PLT" conftest.S` = 0; then ---- js/src/configure.in~ -+++ js/src/configure.in -@@ -2855,6 +2855,7 @@ EOF - #pragma GCC visibility push(hidden) - #pragma GCC visibility push(default) - #include <string.h> -+#include <iterator> - #pragma GCC visibility pop - - __attribute__ ((visibility ("default"))) void Func() { -@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { - } - EOF - ac_cv_have_visibility_builtin_bug=no -- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then -+ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then - ac_cv_have_visibility_builtin_bug=yes - else - if test `grep -c "@PLT" conftest.S` = 0; then diff --git a/www/libxul/files/patch-clang32-visibility-hack b/www/libxul/files/patch-clang32-visibility-hack new file mode 100644 index 000000000000..7744fed5e17e --- /dev/null +++ b/www/libxul/files/patch-clang32-visibility-hack @@ -0,0 +1,20 @@ +--- configure.in~ ++++ configure.in +@@ -3230,6 +3230,7 @@ EOF + ac_cv_have_visibility_class_bug, + [cat > conftest.c <<EOF + #pragma GCC visibility push(hidden) ++struct TestStruct; + struct __attribute__ ((visibility ("default"))) TestStruct { + static void Init(); + }; +--- js/src/configure.in~ ++++ js/src/configure.in +@@ -3230,6 +3230,7 @@ EOF + ac_cv_have_visibility_class_bug, + [cat > conftest.c <<EOF + #pragma GCC visibility push(hidden) ++struct TestStruct; + struct __attribute__ ((visibility ("default"))) TestStruct { + static void Init(); + }; diff --git a/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp b/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp new file mode 100644 index 000000000000..419955d77ff1 --- /dev/null +++ b/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr<nsISimpleEnumerator> dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, |