Date: Wed, 24 Oct 2012 16:12:06 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1080 - in trunk: . mail/thunderbird mail/thunderbird/files security/ca_root_nss security/nss www/firefox www/firefox-nightly www/firefox/files www/seamonkey www/seamonkey/files Message-ID: <201210241612.q9OGC6h2035090@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Oct 24 16:12:06 2012
New Revision: 1080
Log:
update
Added:
trunk/mail/thunderbird/files/patch-bug786690
trunk/mail/thunderbird/files/patch-bug803811
trunk/mail/thunderbird/files/patch-mozilla-config-baseconfig.mk
- copied, changed from r1079, trunk/mail/thunderbird/files/patch-config-baseconfig.mk
trunk/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in
- copied, changed from r1079, trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in
trunk/www/firefox/files/patch-bug786690
trunk/www/firefox/files/patch-js-src-js-confdefs.h.in
- copied, changed from r1079, trunk/www/firefox/files/patch-js-src-configure.in
trunk/www/seamonkey/files/patch-bug786690
trunk/www/seamonkey/files/patch-bug803811
Deleted:
trunk/Gecko_UPDATING
trunk/mail/thunderbird/files/patch-bug761077
trunk/mail/thunderbird/files/patch-bug774671
trunk/mail/thunderbird/files/patch-bug775257
trunk/mail/thunderbird/files/patch-bug777696
trunk/mail/thunderbird/files/patch-bug778056
trunk/mail/thunderbird/files/patch-bug779847
trunk/mail/thunderbird/files/patch-bug783571
trunk/mail/thunderbird/files/patch-bug784741
trunk/mail/thunderbird/files/patch-bug784776
trunk/mail/thunderbird/files/patch-config-autoconf.mk.in
trunk/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
trunk/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in
trunk/www/firefox/files/patch-bug761077
trunk/www/firefox/files/patch-bug774671
trunk/www/firefox/files/patch-bug775257
trunk/www/firefox/files/patch-bug777696
trunk/www/firefox/files/patch-bug778056
trunk/www/firefox/files/patch-bug779847
trunk/www/firefox/files/patch-bug784741
trunk/www/firefox/files/patch-bug784776
trunk/www/firefox/files/patch-js-src-configure.in
trunk/www/seamonkey/files/patch-bug761077
trunk/www/seamonkey/files/patch-bug774671
trunk/www/seamonkey/files/patch-bug775257
trunk/www/seamonkey/files/patch-bug777696
trunk/www/seamonkey/files/patch-bug778056
trunk/www/seamonkey/files/patch-bug779847
trunk/www/seamonkey/files/patch-bug784741
trunk/www/seamonkey/files/patch-bug784776
trunk/www/seamonkey/files/patch-config-autoconf.mk.in
trunk/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
trunk/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
trunk/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp
Modified:
trunk/Gecko_ChangeLog
trunk/mail/thunderbird/Makefile
trunk/mail/thunderbird/distinfo
trunk/mail/thunderbird/files/extra-bug780531
trunk/mail/thunderbird/files/patch-alsapulse
trunk/mail/thunderbird/files/patch-bug753046
trunk/mail/thunderbird/files/patch-bug783463
trunk/mail/thunderbird/files/patch-bug788039
trunk/mail/thunderbird/files/patch-bug788108
trunk/mail/thunderbird/files/patch-bug788955
trunk/mail/thunderbird/files/patch-config-baseconfig.mk
trunk/security/ca_root_nss/Makefile
trunk/security/ca_root_nss/distinfo
trunk/security/nss/Makefile
trunk/security/nss/distinfo
trunk/security/nss/pkg-plist
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
trunk/www/firefox/files/extra-bug780531
trunk/www/firefox/files/patch-alsapulse
trunk/www/firefox/files/patch-bug753046
trunk/www/firefox/files/patch-bug783463
trunk/www/firefox/files/patch-bug788039
trunk/www/firefox/files/patch-bug788108
trunk/www/firefox/files/patch-bug788955
trunk/www/seamonkey/Makefile
trunk/www/seamonkey/distinfo
trunk/www/seamonkey/files/extra-bug780531
trunk/www/seamonkey/files/patch-alsapulse
trunk/www/seamonkey/files/patch-bug753046
trunk/www/seamonkey/files/patch-bug783463
trunk/www/seamonkey/files/patch-bug788039
trunk/www/seamonkey/files/patch-bug788108
trunk/www/seamonkey/files/patch-bug788955
trunk/www/seamonkey/files/patch-config-baseconfig.mk
trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in
Modified: trunk/Gecko_ChangeLog
==============================================================================
--- trunk/Gecko_ChangeLog Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/Gecko_ChangeLog Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,22 +1,2 @@
-16.0:
-- integrate enigmail into thunderbird/seamonkey as an option
-- enable ENIGMAIL, LIGHTNING and GIO options by default
-- switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better
- latency during pause and seeking with HTML5 video
-- remove fedisableexcept() hacks, obsolete since FreeBSD 4.0
-- support system hunspell dictionaries [1]
-- unbreak -esr ports with clang3.2 [2]
-- unbreak nss build when CC contains full path [3]
-- remove GNOME option grouping [4]
-- add more reporters in about:memory: page-faults-hard, page-faults-soft,
- resident, vsize
-- use bundled jemalloc 3.0.0 on FreeBSD < 10.0 for gecko 16.0,
- only heap-allocated reporter works in about:memory (see bug 762445)
-- use lrintf() instead of slow C cast in bundled libopus
-- use libjpeg-turbo's faster color conversion if available during build
-- record startup time for telemetry
-- use -z origin instead of hardcoding path to gecko runtime
-- fail early if incompatible libxul version is installed (in USE_GECKO)
-- *miscellaneous cleanups and fixups*
-
-PR: ports/171534 [1], ports/171566 [2], ports/172164 [3], ports/172201 [4]
+17.0:
+- *misc*
Deleted: trunk/Gecko_UPDATING
==============================================================================
--- trunk/Gecko_UPDATING Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,8 +0,0 @@
-20121010:
- AFFECTS: users of www/firefox and www/seamonkey
- AUTHOR: gecko@FreeBSD.org
-
- When using Firefox or SeaMonkey compiled with ALSA option ON it may
- crash on assert in cubeb_refill_stream as described in ports/170473.
- To fix either set media.use_cubeb -> false in about:config or rebuild
- audio/alsa-plugins with ARIFF_OSS option disabled (default).
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/mail/thunderbird/Makefile Wed Oct 24 16:12:06 2012 (r1080)
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-DISTVERSION= 16.0
+DISTVERSION= 17.0b1
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@@ -61,7 +61,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC= ${WRKDIR}/comm-beta
MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi
Modified: trunk/mail/thunderbird/distinfo
==============================================================================
--- trunk/mail/thunderbird/distinfo Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/mail/thunderbird/distinfo Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-16.0b3.source.tar.bz2) = fc089c1a374ec6fb85f693286a2331e2161e4d53cf3e6cbb7cc377a5b8e7ec8c
-SIZE (thunderbird-16.0b3.source.tar.bz2) = 111775667
-SHA256 (enigmail-1.4.4.tar.gz) = ec62bb701968f72ad35546660132e6e47d4ebe684df1d27fc615cb9010a203b8
-SIZE (enigmail-1.4.4.tar.gz) = 1269444
+SHA256 (thunderbird-17.0b1.source.tar.bz2) = d563a9ea290e08e2b27de0d9c40403eec753d11cc1fdeed3b5f5b9a817d22a44
+SIZE (thunderbird-17.0b1.source.tar.bz2) = 113248011
+SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020
+SIZE (enigmail-1.4.5.tar.gz) = 1269207
Modified: trunk/mail/thunderbird/files/extra-bug780531
==============================================================================
--- trunk/mail/thunderbird/files/extra-bug780531 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/mail/thunderbird/files/extra-bug780531 Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,32 +1,22 @@
--- mozilla/configure.in~
+++ mozilla/configure.in
-@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then
- MOZ_SYDNEYAUDIO=1
- MOZ_CUBEB=1
- MOZ_MEDIA=1
-- case "$target_cpu" in
-+ case "$target" in
- arm*)
- MOZ_TREMOR=1
- ;;
-+ *-freebsd*)
-+ MOZ_TREMOR=1
-+ ;;
- *)
- MOZ_VORBIS=1
- ;;
-@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then
- MOZ_SYDNEYAUDIO=1
- MOZ_CUBEB=1
- MOZ_MEDIA=1
-- case "$target_cpu" in
-+ case "$target" in
- arm*)
- MOZ_TREMOR=1
- ;;
-+ *-freebsd*)
-+ MOZ_TREMOR=1
-+ ;;
- *)
- MOZ_VORBIS=1
- ;;
+@@ -5151,12 +5148,17 @@ fi
+
+ AC_SUBST(MOZ_WEBRTC)
+
+-case "$target_cpu" in
+-arm*)
++case "$target" in
++arm-*-linux*)
+ MOZ_SAMPLE_TYPE_S16LE=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
+ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
+ ;;
++*-freebsd*)
++ MOZ_SAMPLE_TYPE_S16LE=1
++ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
++ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
++;;
+ *)
+ MOZ_SAMPLE_TYPE_FLOAT32=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
Modified: trunk/mail/thunderbird/files/patch-alsapulse
==============================================================================
--- trunk/mail/thunderbird/files/patch-alsapulse Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/mail/thunderbird/files/patch-alsapulse Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,27 +1,8 @@
-diff --git mozilla/config/autoconf.mk.in mozilla/config/autoconf.mk.in
-index 44c0b06..748511b 100644
---- mozilla/config/autoconf.mk.in
-+++ mozilla/config/autoconf.mk.in
-@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@
- MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@
- MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@
-
-+MOZ_ALSA = @MOZ_ALSA@
- MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
- MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
-
-+MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@
-+MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@
-+MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@
-+
- GLIB_CFLAGS = @GLIB_CFLAGS@
- GLIB_LIBS = @GLIB_LIBS@
- GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
diff --git mozilla/configure.in mozilla/configure.in
index 5980b76..11f5f77 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5600,13 +5600,45 @@ dnl ========================================================
+@@ -5600,13 +5600,25 @@ dnl ========================================================
dnl = Check alsa availability on Linux if using sydneyaudio
dnl ========================================================
@@ -45,28 +26,8 @@
+AC_SUBST(MOZ_ALSA)
+
-+dnl ========================================================
-+dnl = Enable PulseAudio
-+dnl ========================================================
-+
-+MOZ_ARG_ENABLE_BOOL(pulseaudio,
-+[ --enable-pulseaudio Enable PulseAudio support],
-+MOZ_PULSEAUDIO=1,
-+MOZ_PULSEAUDIO=)
-+
-+if test -n "$MOZ_PULSEAUDIO"; then
-+ AC_DEFINE(MOZ_CUBEB)
-+ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
-+ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
-+ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])])
-+fi
-+
-+AC_SUBST(MOZ_PULSEAUDIO_CFLAGS)
-+AC_SUBST(MOZ_PULSEAUDIO_LIBS)
-+AC_SUBST(MOZ_PULSEAUDIO)
-+
dnl ========================================================
- dnl = Enable GStreamer
+ dnl = Enable PulseAudio
dnl ========================================================
diff --git mozilla/media/libcubeb/src/Makefile.in mozilla/media/libcubeb/src/Makefile.in
index 5ab4dd8..c8df26f 100644
@@ -83,7 +44,7 @@
endif
ifeq ($(OS_TARGET),Darwin)
-@@ -42,4 +38,16 @@ CSRCS = \
+@@ -42,6 +38,12 @@ CSRCS = \
$(NULL)
endif
@@ -93,25 +54,9 @@
+ $(NULL)
+endif
+
-+ifdef MOZ_PULSEAUDIO
-+CSRCS = \
-+ cubeb_pulse.c \
-+ $(NULL)
-+endif
-+
- include $(topsrcdir)/config/rules.mk
-diff --git mozilla/media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c
-index 599aea2..41fd5af 100644
---- mozilla/media/libcubeb/src/cubeb_alsa.c
-+++ mozilla/media/libcubeb/src/cubeb_alsa.c
-@@ -6,6 +6,6 @@
- #undef NDEBUG
- #define _BSD_SOURCE
--#define _POSIX_SOURCE
-+#define _XOPEN_SOURCE 500
- #include <pthread.h>
- #include <sys/time.h>
- #include <assert.h>
+ ifdef MOZ_PULSEAUDIO
+ CSRCS = \
+ cubeb_pulse.c \
diff --git mozilla/media/libsydneyaudio/src/Makefile.in mozilla/media/libsydneyaudio/src/Makefile.in
index 8dda8ce..b19641d 100644
--- mozilla/media/libsydneyaudio/src/Makefile.in
@@ -150,7 +95,7 @@
index 43384e9..e46a6e3 100644
--- mozilla/toolkit/library/Makefile.in
+++ mozilla/toolkit/library/Makefile.in
-@@ -379,10 +379,13 @@ endif
+@@ -370,14 +370,11 @@ endif
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
@@ -160,9 +105,10 @@
+ifdef MOZ_ALSA
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
endif
-+ifdef MOZ_PULSEAUDIO
-+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
-+endif
+-endif
+-
+ ifdef MOZ_PULSEAUDIO
+-ifdef MOZ_CUBEB
+ EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
+ endif
endif
-
- ifdef HAVE_CLOCK_MONOTONIC
Modified: trunk/mail/thunderbird/files/patch-bug753046
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug753046 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/mail/thunderbird/files/patch-bug753046 Wed Oct 24 16:12:06 2012 (r1080)
@@ -56,7 +56,7 @@
--- mozilla/ipc/chromium/Makefile.in.orig 2012-02-16 06:40:33.000000000 +0000
+++ mozilla/ipc/chromium/Makefile.in
-@@ -278,6 +278,34 @@ endif
+@@ -278,6 +278,33 @@ endif
endif # } OS_LINUX
@@ -64,7 +64,6 @@
+
+CPPSRCS += \
+ atomicops_internals_x86_gcc.cc \
-+ file_util_linux.cc \
+ process_util_bsd.cc \
+ time_posix.cc \
+ $(NULL)
@@ -404,19 +403,6 @@
#else
typedef DirReaderFallback DirReaderPosix;
#endif
-diff --git mozilla/ipc/chromium/src/base/file_util_linux.cc mozilla/ipc/chromium/src/base/file_util_linux.cc
-index 171e44f..0c6dfcc 100644
---- mozilla/ipc/chromium/src/base/file_util_linux.cc
-+++ mozilla/ipc/chromium/src/base/file_util_linux.cc
-@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) {
- }
-
- bool GetShmemTempDir(FilePath* path) {
--#ifdef ANDROID
-+#if defined(ANDROID) || defined(OS_BSD)
- return GetTempDir(path);
- #else
- *path = FilePath("/dev/shm");
$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $
--- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000
@@ -541,8 +527,7 @@
pthread_set_name_np(pthread_self(), name);
-#elif defined(__NetBSD__)
+#elif defined(OS_NETBSD)
-- pthread_setname_np(pthread_self(), "%s", name);
-+ pthread_setname_np(pthread_self(), "%s", (void *)name);
+ pthread_setname_np(pthread_self(), "%s", (void *)name);
#else
prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0);
$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
@@ -586,7 +571,7 @@
--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,318 @@
+@@ -0,0 +1,367 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -621,6 +606,20 @@
+#define HAVE_POSIX_SPAWN 1
+#endif
+
++/*
++ * On platforms that are not gonk based, we fall back to an arbitrary
++ * UID. This is generally the UID for user `nobody', albeit it is not
++ * always the case.
++ */
++
++#if defined(OS_NETBSD) || defined(OS_OPENBSD)
++# define CHILD_UNPRIVILEGED_UID 32767
++# define CHILD_UNPRIVILEGED_GID 32767
++#else
++# define CHILD_UNPRIVILEGED_UID 65534
++# define CHILD_UNPRIVILEGED_GID 65534
++#endif
++
+#ifndef __dso_public
+# ifdef __exported
+# define __dso_public __exported
@@ -669,6 +668,17 @@
+ const environment_map& env_vars_to_set,
+ bool wait, ProcessHandle* process_handle,
+ ProcessArchitecture arch) {
++ return LaunchApp(argv, fds_to_remap, env_vars_to_set,
++ SAME_PRIVILEGES_AS_PARENT,
++ wait, process_handle);
++}
++
++bool LaunchApp(const std::vector<std::string>& argv,
++ const file_handle_mapping_vector& fds_to_remap,
++ const environment_map& env_vars_to_set,
++ ChildPrivileges privs,
++ bool wait, ProcessHandle* process_handle,
++ ProcessArchitecture arch) {
+ bool retval = true;
+
+ char* argv_copy[argv.size() + 1];
@@ -783,6 +793,17 @@
+ const environment_map& env_vars_to_set,
+ bool wait, ProcessHandle* process_handle,
+ ProcessArchitecture arch) {
++ return LaunchApp(argv, fds_to_remap, env_vars_to_set,
++ SAME_PRIVILEGES_AS_PARENT,
++ wait, process_handle);
++}
++
++bool LaunchApp(const std::vector<std::string>& argv,
++ const file_handle_mapping_vector& fds_to_remap,
++ const environment_map& env_vars_to_set,
++ ChildPrivileges privs,
++ bool wait, ProcessHandle* process_handle,
++ ProcessArchitecture arch) {
+ scoped_array<char*> argv_cstr(new char*[argv.size() + 1]);
+ // Illegal to allocate memory after fork and before execvp
+ InjectiveMultimap fd_shuffle1, fd_shuffle2;
@@ -805,19 +826,32 @@
+
+ CloseSuperfluousFds(fd_shuffle2);
+
++ for (size_t i = 0; i < argv.size(); i++)
++ argv_cstr[i] = const_cast<char*>(argv[i].c_str());
++ argv_cstr[argv.size()] = NULL;
++
++ if (privs == UNPRIVILEGED) {
++ if (setgid(CHILD_UNPRIVILEGED_GID) != 0) {
++ DLOG(ERROR) << "FAILED TO setgid() CHILD PROCESS, path: " << argv_cstr[0];
++ _exit(127);
++ }
++ if (setuid(CHILD_UNPRIVILEGED_UID) != 0) {
++ DLOG(ERROR) << "FAILED TO setuid() CHILD PROCESS, path: " << argv_cstr[0];
++ _exit(127);
++ }
++ if (chdir("/") != 0)
++ gProcessLog.print("==> could not chdir()\n");
++ }
++
+ for (environment_map::const_iterator it = env_vars_to_set.begin();
+ it != env_vars_to_set.end(); ++it) {
+ if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/))
+ _exit(127);
+ }
-+
-+ for (size_t i = 0; i < argv.size(); i++)
-+ argv_cstr[i] = const_cast<char*>(argv[i].c_str());
-+ argv_cstr[argv.size()] = NULL;
-+ execvp(argv_cstr[0], argv_cstr.get());
++ execv(argv_cstr[0], argv_cstr.get());
+ // if we get here, we're in serious trouble and should complain loudly
+ DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0];
-+ exit(127);
++ _exit(127);
+ } else {
+ gProcessLog.print("==> process %d launched child process %d\n",
+ GetCurrentProcId(), pid);
@@ -1144,7 +1178,7 @@
base::LaunchApp(childArgv, mFileMap,
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- newEnvVars,
+ newEnvVars, privs,
#endif
false, &process, arch);
diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h
Deleted: trunk/mail/thunderbird/files/patch-bug761077
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug761077 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,88 +0,0 @@
-diff --git mozilla/xpcom/reflect/xptcall/public/genstubs.pl mozilla/xpcom/reflect/xptcall/public/genstubs.pl
-index b8a87a5..918c4cf 100644
---- mozilla/xpcom/reflect/xptcall/public/genstubs.pl
-+++ mozilla/xpcom/reflect/xptcall/public/genstubs.pl
-@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
- print OUTFILE "* 1 is AddRef\n";
- print OUTFILE "* 2 is Release\n";
- print OUTFILE "*/\n";
--print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
-+print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
- for($i = 0; $i < $entry_count; $i++) {
- print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
- }
-diff --git mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-index eb66761..807db26 100644
---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
-diff --git mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-index ae6ed66..2783957 100644
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -70,7 +70,7 @@ endif
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -269,7 +269,7 @@ endif
- #
- # Linux/PPC
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
-+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
- ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -278,7 +278,7 @@ endif
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@ endif
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
-diff --git mozilla/xpcom/reflect/xptcall/src/xptcprivate.h mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
-index d903ced..e4ec832 100644
---- mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
-+++ mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
-@@ -14,7 +14,7 @@
-
- class xptiInterfaceEntry;
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
-@@ -31,7 +31,7 @@ public:
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Deleted: trunk/mail/thunderbird/files/patch-bug774671
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug774671 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,40 +0,0 @@
-commit 7e9eda2
-Author: Rafael Ávila de Espíndola <respindola@mozilla.com>
-Date: Tue Jul 17 12:54:41 2012 -0400
-
- Bug 774671 - Fix mismatched declarations. r=luke.
----
- mozilla/js/src/jsproxy.h | 2 +-
- mozilla/js/src/jsprvtd.h | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git mozilla/js/src/jsproxy.h mozilla/js/src/jsproxy.h
-index ec26e3a..aa0e782 100644
---- mozilla/js/src/jsproxy.h
-+++ mozilla/js/src/jsproxy.h
-@@ -13,7 +13,7 @@
-
- namespace js {
-
--class Wrapper;
-+class JS_FRIEND_API(Wrapper);
-
- /*
- * A proxy is a JSObject that implements generic behavior by providing custom
-diff --git mozilla/js/src/jsprvtd.h mozilla/js/src/jsprvtd.h
-index 19b5aef..93e1216 100644
---- mozilla/js/src/jsprvtd.h
-+++ mozilla/js/src/jsprvtd.h
-@@ -146,9 +146,9 @@ struct TreeContext;
- class UpvarCookie;
-
- class Proxy;
--class BaseProxyHandler;
--class DirectWrapper;
--class CrossCompartmentWrapper;
-+class JS_FRIEND_API(BaseProxyHandler);
-+class JS_FRIEND_API(DirectWrapper);
-+class JS_FRIEND_API(CrossCompartmentWrapper);
-
- class TempAllocPolicy;
- class RuntimeAllocPolicy;
Deleted: trunk/mail/thunderbird/files/patch-bug775257
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug775257 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,27 +0,0 @@
-commit 8fc8b74
-Author: Oleg Romashin <oleg.romashin@nokia.com>
-Date: Wed Jul 18 22:46:11 2012 -0400
-
- Bug 775257 - Gstreamer backend on Meego N9 produce extra noise in audio playback.r=giles
----
- content/media/gstreamer/nsGStreamerReader.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-index c48f92e..0fb801a 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -130,8 +130,13 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor)
- gst_object_unref(sinkpad);
-
- mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! "
-+#ifndef MOZ_TREMOR
- "appsink name=audiosink sync=true caps=audio/x-raw-float,"
- "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL);
-+#else
-+ "appsink name=audiosink sync=true caps=audio/x-raw-int,"
-+ "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL);
-+#endif
- mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink),
- "audiosink"));
- gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks,
Deleted: trunk/mail/thunderbird/files/patch-bug777696
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug777696 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,32 +0,0 @@
-commit 0c0d1a8
-Author: Landry Breuil <landry@openbsd.org>
-Date: Mon Jul 30 17:57:15 2012 +0200
-
- Bug 777696: Fix gstreamer backend on big endian architectures. r=doublec
----
- content/media/gstreamer/nsGStreamerReader.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-index 0fb801a..4a69196 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -132,10 +132,18 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor)
- mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! "
- #ifdef MOZ_TREMOR
- "appsink name=audiosink sync=true caps=audio/x-raw-float,"
-+#ifdef IS_LITTLE_ENDIAN
- "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL);
- #else
-+ "channels={1,2},rate=44100,width=32,endianness=4321", TRUE, NULL);
-+#endif
-+#else
- "appsink name=audiosink sync=true caps=audio/x-raw-int,"
-+#ifdef IS_LITTLE_ENDIAN
- "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL);
-+#else
-+ "channels={1,2},rate=48000,width=16,endianness=4321", TRUE, NULL);
-+#endif
- #endif
- mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink),
- "audiosink"));
Deleted: trunk/mail/thunderbird/files/patch-bug778056
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug778056 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- mozilla/memory/mozalloc/mozalloc.cpp~
-+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -19,6 +19,9 @@
- #if defined(XP_UNIX)
- # include <unistd.h> // for valloc on *BSD
- #endif //if defined(XP_UNIX)
-+#if defined(__FreeBSD__)
-+# include <malloc_np.h> // for malloc_usable_size
-+#endif // if defined(__FreeBSD__)
-
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- # define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr)
-
- #if defined(XP_MACOSX)
- return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
-+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
- // Android bionic libc doesn't have malloc_usable_size.
- return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
Deleted: trunk/mail/thunderbird/files/patch-bug779847
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug779847 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,28 +0,0 @@
---- mozilla/gfx/ycbcr/Makefile.in
-+++ mozilla/gfx/ycbcr/Makefile.in
-@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
- $(NULL)
- endif
- else
--ifeq ($(OS_ARCH),Linux)
--CPPSRCS += yuv_row_posix.cpp \
-- $(NULL)
--else
--ifeq ($(OS_ARCH),SunOS)
--CPPSRCS += yuv_row_posix.cpp \
-- $(NULL)
--else
--ifeq ($(OS_ARCH),Darwin)
-+ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
- else
- CPPSRCS += yuv_row_other.cpp \
- $(NULL)
--endif # Darwin
--endif # SunOS
--endif # linux
-+endif # posix
- endif # windows
-
- ifeq (arm,$(findstring arm,$(OS_TEST)))
Modified: trunk/mail/thunderbird/files/patch-bug783463
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug783463 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/mail/thunderbird/files/patch-bug783463 Wed Oct 24 16:12:06 2012 (r1080)
@@ -12,23 +12,3 @@
SkTime_Unix.cpp \
$(NULL)
endif
---- mozilla/widget/qt/nsNativeThemeQt.cpp~
-+++ mozilla/widget/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,6 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
--#include <malloc.h>
-
-
- #include "gfxASurface.h"
---- mozilla/widget/qt/nsSound.cpp~
-+++ mozilla/widget/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Deleted: trunk/mail/thunderbird/files/patch-bug783571
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug783571 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
---- mail/components/Makefile.in~
-+++ mail/components/Makefile.in
-@@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk
- # least one module from search/ on all platforms
- DIRS = compose cloudfile preferences addrbook migration activity search about-support wintaskbar newmailaccount im
-
--ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
-+ifneq (,$(filter windows gtk2 cocoa qt, $(MOZ_WIDGET_TOOLKIT)))
- DIRS += shell
- endif
-
---- mail/components/build/Makefile.in~
-+++ mail/components/build/Makefile.in
-@@ -78,7 +78,7 @@ SHARED_LIBRARY_LIBS = \
- ../migration/src/$(LIB_PREFIX)profilemigration_s.$(LIB_SUFFIX) \
- $(NULL)
-
--ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
-+ifneq (,$(filter windows cocoa gtk2 qt, $(MOZ_WIDGET_TOOLKIT)))
- SHARED_LIBRARY_LIBS += ../shell/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
- endif
-
Deleted: trunk/mail/thunderbird/files/patch-bug784741
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug784741 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,43 +0,0 @@
-diff --git js/src/Makefile.in js/src/Makefile.in
-index 8eb385f..01bd8e3 100644
---- mozilla/js/src/Makefile.in
-+++ mozilla/js/src/Makefile.in
-@@ -323,6 +323,7 @@ endif
-
- ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
- ENABLE_YARR_JIT = 1
-+DEFINES += -DENABLE_YARR_JIT=1
-
- VPATH += $(srcdir)/assembler/assembler \
- $(srcdir)/methodjit \
-diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h
-index 6570f2d..0c84896 100644
---- mozilla/js/src/assembler/wtf/Platform.h
-+++ mozilla/js/src/assembler/wtf/Platform.h
-@@ -1102,9 +1102,7 @@
- #if WTF_PLATFORM_CHROMIUM
- #define ENABLE_YARR_JIT 0
-
--#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT)
--#define ENABLE_YARR_JIT 1
--
-+#elif ENABLE_YARR_JIT
- /* Setting this flag compares JIT results with interpreter results. */
- #define ENABLE_YARR_JIT_DEBUG 0
- #endif
-diff --git js/src/configure.in js/src/configure.in
-index c142eb7..34f98b9 100644
---- mozilla/js/src/configure.in
-+++ mozilla/js/src/configure.in
-@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug,
- (using compiler flags DBG)],
- [ if test "$enableval" != "no"; then
- MOZ_DEBUG=1
-- ENABLE_METHODJIT_SPEW=1
-+ if test "$ENABLE_METHODJIT"; then
-+ # needs MethodJIT or YarrJIT
-+ ENABLE_METHODJIT_SPEW=1
-+ fi
- if test -n "$enableval" -a "$enableval" != "yes"; then
- MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
- _MOZ_DEBUG_FLAGS_SET=1
Deleted: trunk/mail/thunderbird/files/patch-bug784776
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug784776 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,33 +0,0 @@
---- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~
-+++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp
-@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
- {
- if (mSharedHandle) {
- gl()->ReleaseSharedHandle(mShareType, mSharedHandle);
-- mSharedHandle = NULL;
-+ mSharedHandle = 0;
- }
-
- mYUVTexture[0].Release();
---- mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
-+++ mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp
-@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr
- struct tm *tmc;
- int i;
-
-- tt = time((time_t)NULL);
-+ tt = time(NULL);
- tmc = localtime(&tt);
-
- tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM
---- mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp~
-+++ mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp
-@@ -40,7 +40,7 @@ CrossProcessMutexHandle
- CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle)
- {
- NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!");
-- return NULL;
-+ return 0;
- }
-
- }
Added: trunk/mail/thunderbird/files/patch-bug786690
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug786690 Wed Oct 24 16:12:06 2012 (r1080)
@@ -0,0 +1,26 @@
+commit 38301c3
+Author: Michael Wu <mwu@mozilla.com>
+Date: Fri Aug 31 10:18:46 2012 -0300
+
+ Bug 786690 - Fix buffered streams on 16 bit outputs, r=kinetik
+---
+ content/media/nsAudioStream.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git content/media/nsAudioStream.cpp content/media/nsAudioStream.cpp
+index ac8ef58..8087d31 100644
+--- mozilla/content/media/nsAudioStream.cpp
++++ mozilla/content/media/nsAudioStream.cpp
+@@ -953,10 +953,11 @@ nsBufferedAudioStream::Init(int32_t aNumChannels, int32_t aRate)
+ params.channels = aNumChannels;
+ #ifdef MOZ_SAMPLE_TYPE_S16LE
+ params.format = CUBEB_SAMPLE_S16NE;
++ mBytesPerFrame = sizeof(int16_t) * aNumChannels;
+ #else /* MOZ_SAMPLE_TYPE_FLOAT32 */
+ params.format = CUBEB_SAMPLE_FLOAT32NE;
+-#endif
+ mBytesPerFrame = sizeof(float) * aNumChannels;
++#endif
+
+ {
+ cubeb_stream* stream;
Modified: trunk/mail/thunderbird/files/patch-bug788039
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug788039 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/mail/thunderbird/files/patch-bug788039 Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,16 +1,5 @@
# Bug 788039 - With no prefix search libevent via pkg-config.
---- mozilla/config/autoconf.mk.in~
-+++ mozilla/config/autoconf.mk.in
-@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
-
- MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
- MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
--MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
-+MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
-
- MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
- MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
--- mozilla/configure.in~
+++ mozilla/configure.in
@@ -3854,7 +3854,7 @@ fi
Modified: trunk/mail/thunderbird/files/patch-bug788108
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug788108 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/mail/thunderbird/files/patch-bug788108 Wed Oct 24 16:12:06 2012 (r1080)
@@ -7,7 +7,7 @@
-//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
-#ifdef __FreeBSD__
-#include <ieeefp.h>
--#ifdef __alpha__
+-#if !defined(__i386__) && !defined(__x86_64__)
-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-#else
-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Modified: trunk/mail/thunderbird/files/patch-bug788955
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug788955 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/mail/thunderbird/files/patch-bug788955 Wed Oct 24 16:12:06 2012 (r1080)
@@ -26,16 +26,6 @@
add_makefiles "
memory/jemalloc/Makefile
"
---- mozilla/config/autoconf.mk.in
-+++ mozilla/config/autoconf.mk.in
-@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@
- MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@
- MOZ_MEMORY = @MOZ_MEMORY@
- MOZ_JEMALLOC = @MOZ_JEMALLOC@
-+MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@
- MOZ_PROFILING = @MOZ_PROFILING@
- MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@
- MOZ_JPROF = @MOZ_JPROF@
diff --git configure.in configure.in
index bb05782..2f32516 100644
--- mozilla/configure.in
Added: trunk/mail/thunderbird/files/patch-bug803811
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug803811 Wed Oct 24 16:12:06 2012 (r1080)
@@ -0,0 +1,111 @@
+commit 4ff5f0c
+Author: Landry Breuil <landry@openbsd.org>
+Date: Wed Oct 24 09:56:51 2012 +0400
+
+ Bug 803811 - Fix system zlib detection by porting bug #763651
+---
+ aclocal.m4 | 1 +
+ configure.in | 46 ++++++----------------------------------------
+ 2 files changed, 7 insertions(+), 40 deletions(-)
+
+diff --git aclocal.m4 aclocal.m4
+index f5486dd..a3924d1 100644
+--- aclocal.m4
++++ aclocal.m4
+@@ -16,6 +16,7 @@ builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl
+ builtin(include, mozilla/build/autoconf/lto.m4)dnl
+ builtin(include, mozilla/build/autoconf/frameptr.m4)dnl
+ builtin(include, mozilla/build/autoconf/compiler-opts.m4)dnl
++builtin(include, mozilla/build/autoconf/zlib.m4)dnl
+
+ MOZ_PROG_CHECKMSYS()
+
+diff --git configure.in configure.in
+index be833e8..c90fe39 100644
+--- configure.in
++++ configure.in
+@@ -63,7 +63,6 @@ dnl Set the version number of the libs included with mozilla
+ dnl ========================================================
+ MOZJPEG=62
+ MOZPNG=10401
+-MOZZLIB=0x1230
+ NSPR_VERSION=4
+ NSS_VERSION=3
+
+@@ -868,8 +867,6 @@ MOZ_USER_DIR=".mozilla"
+
+ MOZ_JPEG_CFLAGS=
+ MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/mozilla/jpeg)'
+-MOZ_ZLIB_CFLAGS=
+-MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)'
+ MOZ_BZ2_CFLAGS=
+ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/mozilla/modules/libbz2/src)'
+ MOZ_PNG_CFLAGS=
+@@ -3957,47 +3954,19 @@ if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$MOZ_NATIVE_JPEG" = 1; then
+ MOZ_JPEG_CFLAGS="-I${JPEG_DIR}/include"
+ MOZ_JPEG_LIBS="-L${JPEG_DIR}/lib ${MOZ_JPEG_LIBS}"
+ fi
++fi # SKIP_LIBRARY_CHECKS
+
+ dnl system ZLIB support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-zlib,
+-[ --with-system-zlib[=PFX]
+- Use system libz [installed at prefix PFX]],
+- ZLIB_DIR=$withval)
+
+-_SAVE_CFLAGS=$CFLAGS
+-_SAVE_LDFLAGS=$LDFLAGS
+-_SAVE_LIBS=$LIBS
+-if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then
+- CFLAGS="-I${ZLIB_DIR}/include $CFLAGS"
+- LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS"
+-fi
+-if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then
+- MOZ_NATIVE_ZLIB=
+-else
+- AC_CHECK_LIB(z, gzread, [MOZ_NATIVE_ZLIB=1 MOZ_ZLIB_LIBS="-lz"],
+- [MOZ_NATIVE_ZLIB=])
+-fi
+-if test "$MOZ_NATIVE_ZLIB" = 1; then
+- MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'`
+- AC_TRY_COMPILE([ #include <stdio.h>
+- #include <string.h>
+- #include <zlib.h> ],
+- [ #if ZLIB_VERNUM < $MOZZLIBNUM
+- #error "Insufficient zlib version ($MOZZLIBNUM required)."
+- #endif ],
+- MOZ_NATIVE_ZLIB=1,
+-AC_MSG_ERROR([Insufficient zlib version for --with-system-zlib ($MOZZLIB required)]))
+-fi
+-CFLAGS=$_SAVE_CFLAGS
+-LDFLAGS=$_SAVE_LDFLAGS
+-LIBS=$_SAVE_LIBS
++MOZ_ZLIB_CHECK([1.2.3])
+
+-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then
+- MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
+- MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
++if test "$MOZ_NATIVE_ZLIB" != 1; then
++ MOZ_ZLIB_CFLAGS=
++ MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)'
+ fi
+
++if test -z "$SKIP_LIBRARY_CHECKS"; then
+ dnl system BZIP2 Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-bz2,
+@@ -6556,13 +6525,10 @@ AC_SUBST(MOZ_NATIVE_MAKEDEPEND)
+ AC_SUBST(SYSTEM_LIBXUL)
+ AC_SUBST(MOZ_NATIVE_JPEG)
+ AC_SUBST(MOZ_NATIVE_PNG)
+-AC_SUBST(MOZ_NATIVE_ZLIB)
+ AC_SUBST(MOZ_NATIVE_BZ2)
+
+ AC_SUBST(MOZ_JPEG_CFLAGS)
+ AC_SUBST(MOZ_JPEG_LIBS)
+-AC_SUBST(MOZ_ZLIB_CFLAGS)
+-AC_SUBST(MOZ_ZLIB_LIBS)
+ AC_SUBST(MOZ_BZ2_CFLAGS)
+ AC_SUBST(MOZ_BZ2_LIBS)
+ AC_SUBST(MOZ_PNG_CFLAGS)
Deleted: trunk/mail/thunderbird/files/patch-config-autoconf.mk.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-config-autoconf.mk.in Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200
-+++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200
-@@ -57,14 +57,14 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@/%%MOZILLA%%
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir = $(datadir)/idl/%%MOZILLA%%
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/%%MOZILLA%%
-+sdkdir = $(libdir)/%%MOZILLA%%
-
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
Modified: trunk/mail/thunderbird/files/patch-config-baseconfig.mk
==============================================================================
--- trunk/mail/thunderbird/files/patch-config-baseconfig.mk Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/mail/thunderbird/files/patch-config-baseconfig.mk Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,5 +1,5 @@
---- mozilla/config/baseconfig.mk~
-+++ mozilla/config/baseconfig.mk
+--- config/baseconfig.mk~
++++ config/baseconfig.mk
@@ -1,9 +1,9 @@
INCLUDED_AUTOCONF_MK = 1
@@ -11,6 +11,6 @@
+idldir = $(datadir)/idl/%%MOZILLA%%
+installdir = $(libdir)/%%MOZILLA%%
+sdkdir = $(libdir)/%%MOZILLA%%
- DIST = $(DEPTH)/dist
-
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+ MOZILLA_SRCDIR = $(topsrcdir)/mozilla
+ MOZDEPTH = $(DEPTH)/mozilla
+ DIST = $(MOZDEPTH)/dist
Deleted: trunk/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
==============================================================================
--- trunk/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- mailnews/addrbook/src/nsDirPrefs.cpp~
-+++ mailnews/addrbook/src/nsDirPrefs.cpp
-@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid
- DIR_Server *s=nsnull;
-
- switch (position) {
-- case DIR_POS_APPEND:
-+ case (PRInt32)DIR_POS_APPEND:
- /* Do nothing if the request is to append a server that is already
- * in the list.
- */
-@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid
- wholeList->AppendElement(server);
- break;
-
-- case DIR_POS_DELETE:
-+ case (PRInt32)DIR_POS_DELETE:
- /* Remove the prefs corresponding to the given server. If the prefName
- * value is nsnull, the server has never been saved and there are no
- * prefs to remove.
Deleted: trunk/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
==============================================================================
--- trunk/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,29 +0,0 @@
---- mailnews/compose/src/nsSmtpProtocol.cpp~
-+++ mailnews/compose/src/nsSmtpProtocol.cpp
-@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr
-
- switch (code)
- {
-- case NS_ERROR_SMTP_SERVER_ERROR:
-- case NS_ERROR_TCP_READ_ERROR:
-- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
-- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
-- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
-- case NS_ERROR_SENDING_FROM_COMMAND:
-- case NS_ERROR_SENDING_RCPT_COMMAND:
-- case NS_ERROR_SENDING_DATA_COMMAND:
-- case NS_ERROR_SENDING_MESSAGE:
-- case NS_ERROR_SMTP_GREETING:
-+ case (int)NS_ERROR_SMTP_SERVER_ERROR:
-+ case (int)NS_ERROR_TCP_READ_ERROR:
-+ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
-+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
-+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
-+ case (int)NS_ERROR_SENDING_FROM_COMMAND:
-+ case (int)NS_ERROR_SENDING_RCPT_COMMAND:
-+ case (int)NS_ERROR_SENDING_DATA_COMMAND:
-+ case (int)NS_ERROR_SENDING_MESSAGE:
-+ case (int)NS_ERROR_SMTP_GREETING:
- bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg));
- msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
- break;
Copied and modified: trunk/mail/thunderbird/files/patch-mozilla-config-baseconfig.mk (from r1079, trunk/mail/thunderbird/files/patch-config-baseconfig.mk)
==============================================================================
Deleted: trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100
-+++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100
-@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
- * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
- * is defined before <stdint.h> is included. */
- #define __STDC_LIMIT_MACROS
-+#define __STDC_CONSTANT_MACROS
-
- #endif /* _JS_CONFDEFS_H_ */
-
Copied and modified: trunk/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in (from r1079, trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in)
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in Wed Oct 24 16:11:46 2012 (r1079, copy source)
+++ trunk/mail/thunderbird/files/patch-mozilla-js-src-js-confdefs.h.in Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,6 +1,6 @@
---- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100
-+++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100
-@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+--- mozilla/js/src/js-confdefs.h.in~
++++ mozilla/js/src/js-confdefs.h.in
+@@ -12,6 +12,7 @@
* C++ implementations should define these macros only when __STDC_LIMIT_MACROS
* is defined before <stdint.h> is included. */
#define __STDC_LIMIT_MACROS
Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/security/ca_root_nss/Makefile Wed Oct 24 16:12:06 2012 (r1080)
@@ -29,7 +29,7 @@
# !!! Please DO NOT submit patches for new version until it has !!!
# !!! been committed there first. !!!
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS= 3.13.6
+VERSION_NSS= 3.14
CERTDATA_TXT_PATH= nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
BUNDLE_PROCESSOR= MAca-bundle.pl
Modified: trunk/security/ca_root_nss/distinfo
==============================================================================
--- trunk/security/ca_root_nss/distinfo Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/security/ca_root_nss/distinfo Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.13.6.tar.gz) = f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0
-SIZE (nss-3.13.6.tar.gz) = 6109538
+SHA256 (nss-3.14.tar.gz) = b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b
+SIZE (nss-3.14.tar.gz) = 6068755
Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/security/nss/Makefile Wed Oct 24 16:12:06 2012 (r1080)
@@ -6,8 +6,7 @@
# $MCom ports-experimental/security/nss/Makefile,v 1.4 2008/02/23 15:47:28 ahze Exp $
PORTNAME= nss
-PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH}
-PORTREVISION= 1
+PORTVERSION= ${_MAJOR}.${_MINOR} #.${_PATCH}
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
@@ -22,8 +21,8 @@
sqlite3.8:${PORTSDIR}/databases/sqlite3
_MAJOR= 3
-_MINOR= 13
-_PATCH= 6
+_MINOR= 14
+_PATCH= 0
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss
Modified: trunk/security/nss/distinfo
==============================================================================
--- trunk/security/nss/distinfo Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/security/nss/distinfo Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.13.6.tar.gz) = f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0
-SIZE (nss-3.13.6.tar.gz) = 6109538
+SHA256 (nss-3.14.tar.gz) = b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b
+SIZE (nss-3.14.tar.gz) = 6068755
Modified: trunk/security/nss/pkg-plist
==============================================================================
--- trunk/security/nss/pkg-plist Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/security/nss/pkg-plist Wed Oct 24 16:12:06 2012 (r1080)
@@ -114,6 +114,9 @@
include/nss/nss/sslerr.h
include/nss/nss/sslproto.h
include/nss/nss/sslt.h
+include/nss/nss/utilmodt.h
+include/nss/nss/utilpars.h
+include/nss/nss/utilparst.h
include/nss/nss/utilrename.h
lib/nss/libcrmf.a
lib/nss/libfreebl3.so
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox-nightly/Makefile Wed Oct 24 16:12:06 2012 (r1080)
@@ -18,7 +18,7 @@
COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.9.2:${PORTSDIR}/devel/nspr \
- nss>=3.13.6_1:${PORTSDIR}/security/nss \
+ nss>=3.14:${PORTSDIR}/security/nss \
sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox-nightly/Makefile.hgrev Wed Oct 24 16:12:06 2012 (r1080)
@@ -1 +1 @@
-HGREV= 110708:fd5556088388
+HGREV= 110988:acf7f73e8b18
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox-nightly/distinfo Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/fd5556088388.tar.bz2) = 65ce23d4b5c97d4c8bc3bf3bb7bdf842e67fd26b5b3747469c3b516948fb5c42
-SIZE (firefox-nightly/fd5556088388.tar.bz2) = 94933045
+SHA256 (firefox-nightly/acf7f73e8b18.tar.bz2) = 9f28ba8f8bfa1e5177cd333bd3e703f9a49e5641fe827a1af81e07eb51cc5f06
+SIZE (firefox-nightly/acf7f73e8b18.tar.bz2) = 95110689
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox/Makefile Wed Oct 24 16:12:06 2012 (r1080)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 16.0
+DISTVERSION= 17.0b2
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@@ -57,7 +57,7 @@
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/mozilla-release
+WRKSRC:= ${WRKDIR}/mozilla-beta
.if ${ARCH} == amd64
CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox/distinfo Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,2 +1,2 @@
-SHA256 (firefox-16.0.source.tar.bz2) = 60d4e73a5ff2f796d8c9f3d0650a15afe6c140e017d0678ccf16c968e2c5ff55
-SIZE (firefox-16.0.source.tar.bz2) = 89461772
+SHA256 (firefox-17.0b2.source.tar.bz2) = 8d926563c15b22d240751e88bf7695b746ac193130ad5710a5f7ffc35dc6e725
+SIZE (firefox-17.0b2.source.tar.bz2) = 90986633
Modified: trunk/www/firefox/files/extra-bug780531
==============================================================================
--- trunk/www/firefox/files/extra-bug780531 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox/files/extra-bug780531 Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,32 +1,22 @@
--- configure.in~
+++ configure.in
-@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then
- MOZ_SYDNEYAUDIO=1
- MOZ_CUBEB=1
- MOZ_MEDIA=1
-- case "$target_cpu" in
-+ case "$target" in
- arm*)
- MOZ_TREMOR=1
- ;;
-+ *-freebsd*)
-+ MOZ_TREMOR=1
-+ ;;
- *)
- MOZ_VORBIS=1
- ;;
-@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then
- MOZ_SYDNEYAUDIO=1
- MOZ_CUBEB=1
- MOZ_MEDIA=1
-- case "$target_cpu" in
-+ case "$target" in
- arm*)
- MOZ_TREMOR=1
- ;;
-+ *-freebsd*)
-+ MOZ_TREMOR=1
-+ ;;
- *)
- MOZ_VORBIS=1
- ;;
+@@ -5151,12 +5148,17 @@ fi
+
+ AC_SUBST(MOZ_WEBRTC)
+
+-case "$target_cpu" in
+-arm*)
++case "$target" in
++arm-*-linux*)
+ MOZ_SAMPLE_TYPE_S16LE=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
+ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
+ ;;
++*-freebsd*)
++ MOZ_SAMPLE_TYPE_S16LE=1
++ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
++ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
++;;
+ *)
+ MOZ_SAMPLE_TYPE_FLOAT32=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
Modified: trunk/www/firefox/files/patch-alsapulse
==============================================================================
--- trunk/www/firefox/files/patch-alsapulse Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox/files/patch-alsapulse Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,27 +1,8 @@
-diff --git config/autoconf.mk.in config/autoconf.mk.in
-index 44c0b06..748511b 100644
---- config/autoconf.mk.in
-+++ config/autoconf.mk.in
-@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@
- MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@
- MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@
-
-+MOZ_ALSA = @MOZ_ALSA@
- MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
- MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
-
-+MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@
-+MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@
-+MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@
-+
- GLIB_CFLAGS = @GLIB_CFLAGS@
- GLIB_LIBS = @GLIB_LIBS@
- GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
diff --git configure.in configure.in
index 5980b76..11f5f77 100644
--- configure.in
+++ configure.in
-@@ -5600,13 +5600,45 @@ dnl ========================================================
+@@ -5600,13 +5600,25 @@ dnl ========================================================
dnl = Check alsa availability on Linux if using sydneyaudio
dnl ========================================================
@@ -45,28 +26,8 @@
+AC_SUBST(MOZ_ALSA)
+
-+dnl ========================================================
-+dnl = Enable PulseAudio
-+dnl ========================================================
-+
-+MOZ_ARG_ENABLE_BOOL(pulseaudio,
-+[ --enable-pulseaudio Enable PulseAudio support],
-+MOZ_PULSEAUDIO=1,
-+MOZ_PULSEAUDIO=)
-+
-+if test -n "$MOZ_PULSEAUDIO"; then
-+ AC_DEFINE(MOZ_CUBEB)
-+ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
-+ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
-+ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])])
-+fi
-+
-+AC_SUBST(MOZ_PULSEAUDIO_CFLAGS)
-+AC_SUBST(MOZ_PULSEAUDIO_LIBS)
-+AC_SUBST(MOZ_PULSEAUDIO)
-+
dnl ========================================================
- dnl = Enable GStreamer
+ dnl = Enable PulseAudio
dnl ========================================================
diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in
index 5ab4dd8..c8df26f 100644
@@ -83,7 +44,7 @@
endif
ifeq ($(OS_TARGET),Darwin)
-@@ -42,4 +38,16 @@ CSRCS = \
+@@ -42,6 +38,12 @@ CSRCS = \
$(NULL)
endif
@@ -93,25 +54,9 @@
+ $(NULL)
+endif
+
-+ifdef MOZ_PULSEAUDIO
-+CSRCS = \
-+ cubeb_pulse.c \
-+ $(NULL)
-+endif
-+
- include $(topsrcdir)/config/rules.mk
-diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c
-index 599aea2..41fd5af 100644
---- media/libcubeb/src/cubeb_alsa.c
-+++ media/libcubeb/src/cubeb_alsa.c
-@@ -6,6 +6,6 @@
- #undef NDEBUG
- #define _BSD_SOURCE
--#define _POSIX_SOURCE
-+#define _XOPEN_SOURCE 500
- #include <pthread.h>
- #include <sys/time.h>
- #include <assert.h>
+ ifdef MOZ_PULSEAUDIO
+ CSRCS = \
+ cubeb_pulse.c \
diff --git media/libsydneyaudio/src/Makefile.in media/libsydneyaudio/src/Makefile.in
index 8dda8ce..b19641d 100644
--- media/libsydneyaudio/src/Makefile.in
@@ -150,7 +95,7 @@
index 43384e9..e46a6e3 100644
--- toolkit/library/Makefile.in
+++ toolkit/library/Makefile.in
-@@ -379,10 +379,13 @@ endif
+@@ -370,14 +370,11 @@ endif
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
@@ -160,9 +105,10 @@
+ifdef MOZ_ALSA
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
endif
-+ifdef MOZ_PULSEAUDIO
-+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
-+endif
+-endif
+-
+ ifdef MOZ_PULSEAUDIO
+-ifdef MOZ_CUBEB
+ EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
+ endif
endif
-
- ifdef HAVE_CLOCK_MONOTONIC
Modified: trunk/www/firefox/files/patch-bug753046
==============================================================================
--- trunk/www/firefox/files/patch-bug753046 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox/files/patch-bug753046 Wed Oct 24 16:12:06 2012 (r1080)
@@ -56,7 +56,7 @@
--- ipc/chromium/Makefile.in.orig 2012-02-16 06:40:33.000000000 +0000
+++ ipc/chromium/Makefile.in
-@@ -278,6 +278,34 @@ endif
+@@ -278,6 +278,33 @@ endif
endif # } OS_LINUX
@@ -64,7 +64,6 @@
+
+CPPSRCS += \
+ atomicops_internals_x86_gcc.cc \
-+ file_util_linux.cc \
+ process_util_bsd.cc \
+ time_posix.cc \
+ $(NULL)
@@ -404,19 +403,6 @@
#else
typedef DirReaderFallback DirReaderPosix;
#endif
-diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc
-index 171e44f..0c6dfcc 100644
---- ipc/chromium/src/base/file_util_linux.cc
-+++ ipc/chromium/src/base/file_util_linux.cc
-@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) {
- }
-
- bool GetShmemTempDir(FilePath* path) {
--#ifdef ANDROID
-+#if defined(ANDROID) || defined(OS_BSD)
- return GetTempDir(path);
- #else
- *path = FilePath("/dev/shm");
$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000
@@ -541,8 +527,7 @@
pthread_set_name_np(pthread_self(), name);
-#elif defined(__NetBSD__)
+#elif defined(OS_NETBSD)
-- pthread_setname_np(pthread_self(), "%s", name);
-+ pthread_setname_np(pthread_self(), "%s", (void *)name);
+ pthread_setname_np(pthread_self(), "%s", (void *)name);
#else
prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0);
$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
@@ -586,7 +571,7 @@
--- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,318 @@
+@@ -0,0 +1,367 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -621,6 +606,20 @@
+#define HAVE_POSIX_SPAWN 1
+#endif
+
++/*
++ * On platforms that are not gonk based, we fall back to an arbitrary
++ * UID. This is generally the UID for user `nobody', albeit it is not
++ * always the case.
++ */
++
++#if defined(OS_NETBSD) || defined(OS_OPENBSD)
++# define CHILD_UNPRIVILEGED_UID 32767
++# define CHILD_UNPRIVILEGED_GID 32767
++#else
++# define CHILD_UNPRIVILEGED_UID 65534
++# define CHILD_UNPRIVILEGED_GID 65534
++#endif
++
+#ifndef __dso_public
+# ifdef __exported
+# define __dso_public __exported
@@ -669,6 +668,17 @@
+ const environment_map& env_vars_to_set,
+ bool wait, ProcessHandle* process_handle,
+ ProcessArchitecture arch) {
++ return LaunchApp(argv, fds_to_remap, env_vars_to_set,
++ SAME_PRIVILEGES_AS_PARENT,
++ wait, process_handle);
++}
++
++bool LaunchApp(const std::vector<std::string>& argv,
++ const file_handle_mapping_vector& fds_to_remap,
++ const environment_map& env_vars_to_set,
++ ChildPrivileges privs,
++ bool wait, ProcessHandle* process_handle,
++ ProcessArchitecture arch) {
+ bool retval = true;
+
+ char* argv_copy[argv.size() + 1];
@@ -783,6 +793,17 @@
+ const environment_map& env_vars_to_set,
+ bool wait, ProcessHandle* process_handle,
+ ProcessArchitecture arch) {
++ return LaunchApp(argv, fds_to_remap, env_vars_to_set,
++ SAME_PRIVILEGES_AS_PARENT,
++ wait, process_handle);
++}
++
++bool LaunchApp(const std::vector<std::string>& argv,
++ const file_handle_mapping_vector& fds_to_remap,
++ const environment_map& env_vars_to_set,
++ ChildPrivileges privs,
++ bool wait, ProcessHandle* process_handle,
++ ProcessArchitecture arch) {
+ scoped_array<char*> argv_cstr(new char*[argv.size() + 1]);
+ // Illegal to allocate memory after fork and before execvp
+ InjectiveMultimap fd_shuffle1, fd_shuffle2;
@@ -805,19 +826,32 @@
+
+ CloseSuperfluousFds(fd_shuffle2);
+
++ for (size_t i = 0; i < argv.size(); i++)
++ argv_cstr[i] = const_cast<char*>(argv[i].c_str());
++ argv_cstr[argv.size()] = NULL;
++
++ if (privs == UNPRIVILEGED) {
++ if (setgid(CHILD_UNPRIVILEGED_GID) != 0) {
++ DLOG(ERROR) << "FAILED TO setgid() CHILD PROCESS, path: " << argv_cstr[0];
++ _exit(127);
++ }
++ if (setuid(CHILD_UNPRIVILEGED_UID) != 0) {
++ DLOG(ERROR) << "FAILED TO setuid() CHILD PROCESS, path: " << argv_cstr[0];
++ _exit(127);
++ }
++ if (chdir("/") != 0)
++ gProcessLog.print("==> could not chdir()\n");
++ }
++
+ for (environment_map::const_iterator it = env_vars_to_set.begin();
+ it != env_vars_to_set.end(); ++it) {
+ if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/))
+ _exit(127);
+ }
-+
-+ for (size_t i = 0; i < argv.size(); i++)
-+ argv_cstr[i] = const_cast<char*>(argv[i].c_str());
-+ argv_cstr[argv.size()] = NULL;
-+ execvp(argv_cstr[0], argv_cstr.get());
++ execv(argv_cstr[0], argv_cstr.get());
+ // if we get here, we're in serious trouble and should complain loudly
+ DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0];
-+ exit(127);
++ _exit(127);
+ } else {
+ gProcessLog.print("==> process %d launched child process %d\n",
+ GetCurrentProcId(), pid);
@@ -1144,7 +1178,7 @@
base::LaunchApp(childArgv, mFileMap,
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- newEnvVars,
+ newEnvVars, privs,
#endif
false, &process, arch);
diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h
Deleted: trunk/www/firefox/files/patch-bug761077
==============================================================================
--- trunk/www/firefox/files/patch-bug761077 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,88 +0,0 @@
-diff --git xpcom/reflect/xptcall/public/genstubs.pl xpcom/reflect/xptcall/public/genstubs.pl
-index b8a87a5..918c4cf 100644
---- xpcom/reflect/xptcall/public/genstubs.pl
-+++ xpcom/reflect/xptcall/public/genstubs.pl
-@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
- print OUTFILE "* 1 is AddRef\n";
- print OUTFILE "* 2 is Release\n";
- print OUTFILE "*/\n";
--print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
-+print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
- for($i = 0; $i < $entry_count; $i++) {
- print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
- }
-diff --git xpcom/reflect/xptcall/public/xptcstubsdecl.inc xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-index eb66761..807db26 100644
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
-diff --git xpcom/reflect/xptcall/src/md/unix/Makefile.in xpcom/reflect/xptcall/src/md/unix/Makefile.in
-index ae6ed66..2783957 100644
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -70,7 +70,7 @@ endif
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -269,7 +269,7 @@ endif
- #
- # Linux/PPC
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
-+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
- ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -278,7 +278,7 @@ endif
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@ endif
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
-diff --git xpcom/reflect/xptcall/src/xptcprivate.h xpcom/reflect/xptcall/src/xptcprivate.h
-index d903ced..e4ec832 100644
---- xpcom/reflect/xptcall/src/xptcprivate.h
-+++ xpcom/reflect/xptcall/src/xptcprivate.h
-@@ -14,7 +14,7 @@
-
- class xptiInterfaceEntry;
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
-@@ -31,7 +31,7 @@ public:
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Deleted: trunk/www/firefox/files/patch-bug774671
==============================================================================
--- trunk/www/firefox/files/patch-bug774671 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,40 +0,0 @@
-commit 7e9eda2
-Author: Rafael Ávila de Espíndola <respindola@mozilla.com>
-Date: Tue Jul 17 12:54:41 2012 -0400
-
- Bug 774671 - Fix mismatched declarations. r=luke.
----
- js/src/jsproxy.h | 2 +-
- js/src/jsprvtd.h | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git js/src/jsproxy.h js/src/jsproxy.h
-index ec26e3a..aa0e782 100644
---- js/src/jsproxy.h
-+++ js/src/jsproxy.h
-@@ -13,7 +13,7 @@
-
- namespace js {
-
--class Wrapper;
-+class JS_FRIEND_API(Wrapper);
-
- /*
- * A proxy is a JSObject that implements generic behavior by providing custom
-diff --git js/src/jsprvtd.h js/src/jsprvtd.h
-index 19b5aef..93e1216 100644
---- js/src/jsprvtd.h
-+++ js/src/jsprvtd.h
-@@ -146,9 +146,9 @@ struct TreeContext;
- class UpvarCookie;
-
- class Proxy;
--class BaseProxyHandler;
--class DirectWrapper;
--class CrossCompartmentWrapper;
-+class JS_FRIEND_API(BaseProxyHandler);
-+class JS_FRIEND_API(DirectWrapper);
-+class JS_FRIEND_API(CrossCompartmentWrapper);
-
- class TempAllocPolicy;
- class RuntimeAllocPolicy;
Deleted: trunk/www/firefox/files/patch-bug775257
==============================================================================
--- trunk/www/firefox/files/patch-bug775257 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,27 +0,0 @@
-commit 8fc8b74
-Author: Oleg Romashin <oleg.romashin@nokia.com>
-Date: Wed Jul 18 22:46:11 2012 -0400
-
- Bug 775257 - Gstreamer backend on Meego N9 produce extra noise in audio playback.r=giles
----
- content/media/gstreamer/nsGStreamerReader.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index c48f92e..0fb801a 100644
---- content/media/gstreamer/nsGStreamerReader.cpp
-+++ content/media/gstreamer/nsGStreamerReader.cpp
-@@ -130,8 +130,13 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor)
- gst_object_unref(sinkpad);
-
- mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! "
-+#ifndef MOZ_TREMOR
- "appsink name=audiosink sync=true caps=audio/x-raw-float,"
- "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL);
-+#else
-+ "appsink name=audiosink sync=true caps=audio/x-raw-int,"
-+ "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL);
-+#endif
- mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink),
- "audiosink"));
- gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks,
Deleted: trunk/www/firefox/files/patch-bug777696
==============================================================================
--- trunk/www/firefox/files/patch-bug777696 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,32 +0,0 @@
-commit 0c0d1a8
-Author: Landry Breuil <landry@openbsd.org>
-Date: Mon Jul 30 17:57:15 2012 +0200
-
- Bug 777696: Fix gstreamer backend on big endian architectures. r=doublec
----
- content/media/gstreamer/nsGStreamerReader.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 0fb801a..4a69196 100644
---- content/media/gstreamer/nsGStreamerReader.cpp
-+++ content/media/gstreamer/nsGStreamerReader.cpp
-@@ -132,10 +132,18 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor)
- mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! "
- #ifdef MOZ_TREMOR
- "appsink name=audiosink sync=true caps=audio/x-raw-float,"
-+#ifdef IS_LITTLE_ENDIAN
- "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL);
- #else
-+ "channels={1,2},rate=44100,width=32,endianness=4321", TRUE, NULL);
-+#endif
-+#else
- "appsink name=audiosink sync=true caps=audio/x-raw-int,"
-+#ifdef IS_LITTLE_ENDIAN
- "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL);
-+#else
-+ "channels={1,2},rate=48000,width=16,endianness=4321", TRUE, NULL);
-+#endif
- #endif
- mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink),
- "audiosink"));
Deleted: trunk/www/firefox/files/patch-bug778056
==============================================================================
--- trunk/www/firefox/files/patch-bug778056 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- memory/mozalloc/mozalloc.cpp~
-+++ memory/mozalloc/mozalloc.cpp
-@@ -19,6 +19,9 @@
- #if defined(XP_UNIX)
- # include <unistd.h> // for valloc on *BSD
- #endif //if defined(XP_UNIX)
-+#if defined(__FreeBSD__)
-+# include <malloc_np.h> // for malloc_usable_size
-+#endif // if defined(__FreeBSD__)
-
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- # define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr)
-
- #if defined(XP_MACOSX)
- return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
-+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
- // Android bionic libc doesn't have malloc_usable_size.
- return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
Deleted: trunk/www/firefox/files/patch-bug779847
==============================================================================
--- trunk/www/firefox/files/patch-bug779847 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,28 +0,0 @@
---- gfx/ycbcr/Makefile.in
-+++ gfx/ycbcr/Makefile.in
-@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
- $(NULL)
- endif
- else
--ifeq ($(OS_ARCH),Linux)
--CPPSRCS += yuv_row_posix.cpp \
-- $(NULL)
--else
--ifeq ($(OS_ARCH),SunOS)
--CPPSRCS += yuv_row_posix.cpp \
-- $(NULL)
--else
--ifeq ($(OS_ARCH),Darwin)
-+ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
- else
- CPPSRCS += yuv_row_other.cpp \
- $(NULL)
--endif # Darwin
--endif # SunOS
--endif # linux
-+endif # posix
- endif # windows
-
- ifeq (arm,$(findstring arm,$(OS_TEST)))
Modified: trunk/www/firefox/files/patch-bug783463
==============================================================================
--- trunk/www/firefox/files/patch-bug783463 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox/files/patch-bug783463 Wed Oct 24 16:12:06 2012 (r1080)
@@ -12,23 +12,3 @@
SkTime_Unix.cpp \
$(NULL)
endif
---- widget/qt/nsNativeThemeQt.cpp~
-+++ widget/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,6 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
--#include <malloc.h>
-
-
- #include "gfxASurface.h"
---- widget/qt/nsSound.cpp~
-+++ widget/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Deleted: trunk/www/firefox/files/patch-bug784741
==============================================================================
--- trunk/www/firefox/files/patch-bug784741 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,43 +0,0 @@
-diff --git js/src/Makefile.in js/src/Makefile.in
-index 8eb385f..01bd8e3 100644
---- js/src/Makefile.in
-+++ js/src/Makefile.in
-@@ -323,6 +323,7 @@ endif
-
- ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
- ENABLE_YARR_JIT = 1
-+DEFINES += -DENABLE_YARR_JIT=1
-
- VPATH += $(srcdir)/assembler/assembler \
- $(srcdir)/methodjit \
-diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h
-index 6570f2d..0c84896 100644
---- js/src/assembler/wtf/Platform.h
-+++ js/src/assembler/wtf/Platform.h
-@@ -1102,9 +1102,7 @@
- #if WTF_PLATFORM_CHROMIUM
- #define ENABLE_YARR_JIT 0
-
--#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT)
--#define ENABLE_YARR_JIT 1
--
-+#elif ENABLE_YARR_JIT
- /* Setting this flag compares JIT results with interpreter results. */
- #define ENABLE_YARR_JIT_DEBUG 0
- #endif
-diff --git js/src/configure.in js/src/configure.in
-index c142eb7..34f98b9 100644
---- js/src/configure.in
-+++ js/src/configure.in
-@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug,
- (using compiler flags DBG)],
- [ if test "$enableval" != "no"; then
- MOZ_DEBUG=1
-- ENABLE_METHODJIT_SPEW=1
-+ if test "$ENABLE_METHODJIT"; then
-+ # needs MethodJIT or YarrJIT
-+ ENABLE_METHODJIT_SPEW=1
-+ fi
- if test -n "$enableval" -a "$enableval" != "yes"; then
- MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
- _MOZ_DEBUG_FLAGS_SET=1
Deleted: trunk/www/firefox/files/patch-bug784776
==============================================================================
--- trunk/www/firefox/files/patch-bug784776 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,33 +0,0 @@
---- gfx/layers/opengl/ImageLayerOGL.cpp~
-+++ gfx/layers/opengl/ImageLayerOGL.cpp
-@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
- {
- if (mSharedHandle) {
- gl()->ReleaseSharedHandle(mShareType, mSharedHandle);
-- mSharedHandle = NULL;
-+ mSharedHandle = 0;
- }
-
- mYUVTexture[0].Release();
---- intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
-+++ intl/locale/src/unix/nsDateTimeFormatUnix.cpp
-@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr
- struct tm *tmc;
- int i;
-
-- tt = time((time_t)NULL);
-+ tt = time(NULL);
- tmc = localtime(&tt);
-
- tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM
---- ipc/glue/CrossProcessMutex_unimplemented.cpp~
-+++ ipc/glue/CrossProcessMutex_unimplemented.cpp
-@@ -40,7 +40,7 @@ CrossProcessMutexHandle
- CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle)
- {
- NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!");
-- return NULL;
-+ return 0;
- }
-
- }
Added: trunk/www/firefox/files/patch-bug786690
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug786690 Wed Oct 24 16:12:06 2012 (r1080)
@@ -0,0 +1,26 @@
+commit 38301c3
+Author: Michael Wu <mwu@mozilla.com>
+Date: Fri Aug 31 10:18:46 2012 -0300
+
+ Bug 786690 - Fix buffered streams on 16 bit outputs, r=kinetik
+---
+ content/media/nsAudioStream.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git content/media/nsAudioStream.cpp content/media/nsAudioStream.cpp
+index ac8ef58..8087d31 100644
+--- content/media/nsAudioStream.cpp
++++ content/media/nsAudioStream.cpp
+@@ -953,10 +953,11 @@ nsBufferedAudioStream::Init(int32_t aNumChannels, int32_t aRate)
+ params.channels = aNumChannels;
+ #ifdef MOZ_SAMPLE_TYPE_S16LE
+ params.format = CUBEB_SAMPLE_S16NE;
++ mBytesPerFrame = sizeof(int16_t) * aNumChannels;
+ #else /* MOZ_SAMPLE_TYPE_FLOAT32 */
+ params.format = CUBEB_SAMPLE_FLOAT32NE;
+-#endif
+ mBytesPerFrame = sizeof(float) * aNumChannels;
++#endif
+
+ {
+ cubeb_stream* stream;
Modified: trunk/www/firefox/files/patch-bug788039
==============================================================================
--- trunk/www/firefox/files/patch-bug788039 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox/files/patch-bug788039 Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,16 +1,5 @@
# Bug 788039 - With no prefix search libevent via pkg-config.
---- config/autoconf.mk.in~
-+++ config/autoconf.mk.in
-@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
-
- MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
- MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
--MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
-+MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
-
- MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
- MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
--- configure.in~
+++ configure.in
@@ -3854,7 +3854,7 @@ fi
Modified: trunk/www/firefox/files/patch-bug788108
==============================================================================
--- trunk/www/firefox/files/patch-bug788108 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox/files/patch-bug788108 Wed Oct 24 16:12:06 2012 (r1080)
@@ -7,7 +7,7 @@
-//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
-#ifdef __FreeBSD__
-#include <ieeefp.h>
--#ifdef __alpha__
+-#if !defined(__i386__) && !defined(__x86_64__)
-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-#else
-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Modified: trunk/www/firefox/files/patch-bug788955
==============================================================================
--- trunk/www/firefox/files/patch-bug788955 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/firefox/files/patch-bug788955 Wed Oct 24 16:12:06 2012 (r1080)
@@ -26,16 +26,6 @@
add_makefiles "
memory/jemalloc/Makefile
"
---- config/autoconf.mk.in
-+++ config/autoconf.mk.in
-@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@
- MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@
- MOZ_MEMORY = @MOZ_MEMORY@
- MOZ_JEMALLOC = @MOZ_JEMALLOC@
-+MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@
- MOZ_PROFILING = @MOZ_PROFILING@
- MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@
- MOZ_JPROF = @MOZ_JPROF@
diff --git configure.in configure.in
index bb05782..2f32516 100644
--- configure.in
Deleted: trunk/www/firefox/files/patch-js-src-configure.in
==============================================================================
--- trunk/www/firefox/files/patch-js-src-configure.in Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100
-+++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100
-@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
- * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
- * is defined before <stdint.h> is included. */
- #define __STDC_LIMIT_MACROS
-+#define __STDC_CONSTANT_MACROS
-
- #endif /* _JS_CONFDEFS_H_ */
-
Copied and modified: trunk/www/firefox/files/patch-js-src-js-confdefs.h.in (from r1079, trunk/www/firefox/files/patch-js-src-configure.in)
==============================================================================
--- trunk/www/firefox/files/patch-js-src-configure.in Wed Oct 24 16:11:46 2012 (r1079, copy source)
+++ trunk/www/firefox/files/patch-js-src-js-confdefs.h.in Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,6 +1,6 @@
---- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100
-+++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100
-@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+--- js/src/js-confdefs.h.in~
++++ js/src/js-confdefs.h.in
+@@ -12,6 +12,7 @@
* C++ implementations should define these macros only when __STDC_LIMIT_MACROS
* is defined before <stdint.h> is included. */
#define __STDC_LIMIT_MACROS
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/Makefile Wed Oct 24 16:12:06 2012 (r1080)
@@ -6,7 +6,7 @@
#
PORTNAME= seamonkey
-DISTVERSION= 2.13
+DISTVERSION= 2.14b1
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
@@ -62,7 +62,7 @@
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC= ${WRKDIR}/comm-beta
MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi
Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/distinfo Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.13b5.source.tar.bz2) = f889be2870eca444c8bc9fcf580f24094ee73f68ccd7864111ecff8a64072cdb
-SIZE (seamonkey-2.13b5.source.tar.bz2) = 111970776
-SHA256 (enigmail-1.4.4.tar.gz) = ec62bb701968f72ad35546660132e6e47d4ebe684df1d27fc615cb9010a203b8
-SIZE (enigmail-1.4.4.tar.gz) = 1269444
+SHA256 (seamonkey-2.14b1.source.tar.bz2) = e9416c46a7d2e2d6c477d7eb0a030965a42cd20479a05e6a968239099199a40c
+SIZE (seamonkey-2.14b1.source.tar.bz2) = 113981679
+SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020
+SIZE (enigmail-1.4.5.tar.gz) = 1269207
Modified: trunk/www/seamonkey/files/extra-bug780531
==============================================================================
--- trunk/www/seamonkey/files/extra-bug780531 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/files/extra-bug780531 Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,32 +1,22 @@
--- mozilla/configure.in~
+++ mozilla/configure.in
-@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then
- MOZ_SYDNEYAUDIO=1
- MOZ_CUBEB=1
- MOZ_MEDIA=1
-- case "$target_cpu" in
-+ case "$target" in
- arm*)
- MOZ_TREMOR=1
- ;;
-+ *-freebsd*)
-+ MOZ_TREMOR=1
-+ ;;
- *)
- MOZ_VORBIS=1
- ;;
-@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then
- MOZ_SYDNEYAUDIO=1
- MOZ_CUBEB=1
- MOZ_MEDIA=1
-- case "$target_cpu" in
-+ case "$target" in
- arm*)
- MOZ_TREMOR=1
- ;;
-+ *-freebsd*)
-+ MOZ_TREMOR=1
-+ ;;
- *)
- MOZ_VORBIS=1
- ;;
+@@ -5151,12 +5148,17 @@ fi
+
+ AC_SUBST(MOZ_WEBRTC)
+
+-case "$target_cpu" in
+-arm*)
++case "$target" in
++arm-*-linux*)
+ MOZ_SAMPLE_TYPE_S16LE=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
+ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
+ ;;
++*-freebsd*)
++ MOZ_SAMPLE_TYPE_S16LE=1
++ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
++ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
++;;
+ *)
+ MOZ_SAMPLE_TYPE_FLOAT32=1
+ AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
Modified: trunk/www/seamonkey/files/patch-alsapulse
==============================================================================
--- trunk/www/seamonkey/files/patch-alsapulse Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/files/patch-alsapulse Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,27 +1,8 @@
-diff --git mozilla/config/autoconf.mk.in mozilla/config/autoconf.mk.in
-index 44c0b06..748511b 100644
---- mozilla/config/autoconf.mk.in
-+++ mozilla/config/autoconf.mk.in
-@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@
- MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@
- MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@
-
-+MOZ_ALSA = @MOZ_ALSA@
- MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
- MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
-
-+MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@
-+MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@
-+MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@
-+
- GLIB_CFLAGS = @GLIB_CFLAGS@
- GLIB_LIBS = @GLIB_LIBS@
- GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
diff --git mozilla/configure.in mozilla/configure.in
index 5980b76..11f5f77 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5600,13 +5600,45 @@ dnl ========================================================
+@@ -5600,13 +5600,25 @@ dnl ========================================================
dnl = Check alsa availability on Linux if using sydneyaudio
dnl ========================================================
@@ -45,28 +26,8 @@
+AC_SUBST(MOZ_ALSA)
+
-+dnl ========================================================
-+dnl = Enable PulseAudio
-+dnl ========================================================
-+
-+MOZ_ARG_ENABLE_BOOL(pulseaudio,
-+[ --enable-pulseaudio Enable PulseAudio support],
-+MOZ_PULSEAUDIO=1,
-+MOZ_PULSEAUDIO=)
-+
-+if test -n "$MOZ_PULSEAUDIO"; then
-+ AC_DEFINE(MOZ_CUBEB)
-+ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
-+ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
-+ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])])
-+fi
-+
-+AC_SUBST(MOZ_PULSEAUDIO_CFLAGS)
-+AC_SUBST(MOZ_PULSEAUDIO_LIBS)
-+AC_SUBST(MOZ_PULSEAUDIO)
-+
dnl ========================================================
- dnl = Enable GStreamer
+ dnl = Enable PulseAudio
dnl ========================================================
diff --git mozilla/media/libcubeb/src/Makefile.in mozilla/media/libcubeb/src/Makefile.in
index 5ab4dd8..c8df26f 100644
@@ -83,7 +44,7 @@
endif
ifeq ($(OS_TARGET),Darwin)
-@@ -42,4 +38,16 @@ CSRCS = \
+@@ -42,6 +38,12 @@ CSRCS = \
$(NULL)
endif
@@ -93,25 +54,9 @@
+ $(NULL)
+endif
+
-+ifdef MOZ_PULSEAUDIO
-+CSRCS = \
-+ cubeb_pulse.c \
-+ $(NULL)
-+endif
-+
- include $(topsrcdir)/config/rules.mk
-diff --git mozilla/media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c
-index 599aea2..41fd5af 100644
---- mozilla/media/libcubeb/src/cubeb_alsa.c
-+++ mozilla/media/libcubeb/src/cubeb_alsa.c
-@@ -6,6 +6,6 @@
- #undef NDEBUG
- #define _BSD_SOURCE
--#define _POSIX_SOURCE
-+#define _XOPEN_SOURCE 500
- #include <pthread.h>
- #include <sys/time.h>
- #include <assert.h>
+ ifdef MOZ_PULSEAUDIO
+ CSRCS = \
+ cubeb_pulse.c \
diff --git mozilla/media/libsydneyaudio/src/Makefile.in mozilla/media/libsydneyaudio/src/Makefile.in
index 8dda8ce..b19641d 100644
--- mozilla/media/libsydneyaudio/src/Makefile.in
@@ -150,7 +95,7 @@
index 43384e9..e46a6e3 100644
--- mozilla/toolkit/library/Makefile.in
+++ mozilla/toolkit/library/Makefile.in
-@@ -379,10 +379,13 @@ endif
+@@ -370,14 +370,11 @@ endif
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
@@ -160,9 +105,10 @@
+ifdef MOZ_ALSA
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
endif
-+ifdef MOZ_PULSEAUDIO
-+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
-+endif
+-endif
+-
+ ifdef MOZ_PULSEAUDIO
+-ifdef MOZ_CUBEB
+ EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
+ endif
endif
-
- ifdef HAVE_CLOCK_MONOTONIC
Modified: trunk/www/seamonkey/files/patch-bug753046
==============================================================================
--- trunk/www/seamonkey/files/patch-bug753046 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/files/patch-bug753046 Wed Oct 24 16:12:06 2012 (r1080)
@@ -56,7 +56,7 @@
--- mozilla/ipc/chromium/Makefile.in.orig 2012-02-16 06:40:33.000000000 +0000
+++ mozilla/ipc/chromium/Makefile.in
-@@ -278,6 +278,34 @@ endif
+@@ -278,6 +278,33 @@ endif
endif # } OS_LINUX
@@ -64,7 +64,6 @@
+
+CPPSRCS += \
+ atomicops_internals_x86_gcc.cc \
-+ file_util_linux.cc \
+ process_util_bsd.cc \
+ time_posix.cc \
+ $(NULL)
@@ -404,19 +403,6 @@
#else
typedef DirReaderFallback DirReaderPosix;
#endif
-diff --git mozilla/ipc/chromium/src/base/file_util_linux.cc mozilla/ipc/chromium/src/base/file_util_linux.cc
-index 171e44f..0c6dfcc 100644
---- mozilla/ipc/chromium/src/base/file_util_linux.cc
-+++ mozilla/ipc/chromium/src/base/file_util_linux.cc
-@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) {
- }
-
- bool GetShmemTempDir(FilePath* path) {
--#ifdef ANDROID
-+#if defined(ANDROID) || defined(OS_BSD)
- return GetTempDir(path);
- #else
- *path = FilePath("/dev/shm");
$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $
--- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000
@@ -541,8 +527,7 @@
pthread_set_name_np(pthread_self(), name);
-#elif defined(__NetBSD__)
+#elif defined(OS_NETBSD)
-- pthread_setname_np(pthread_self(), "%s", name);
-+ pthread_setname_np(pthread_self(), "%s", (void *)name);
+ pthread_setname_np(pthread_self(), "%s", (void *)name);
#else
prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0);
$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $
@@ -586,7 +571,7 @@
--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000
+++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,318 @@
+@@ -0,0 +1,367 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -621,6 +606,20 @@
+#define HAVE_POSIX_SPAWN 1
+#endif
+
++/*
++ * On platforms that are not gonk based, we fall back to an arbitrary
++ * UID. This is generally the UID for user `nobody', albeit it is not
++ * always the case.
++ */
++
++#if defined(OS_NETBSD) || defined(OS_OPENBSD)
++# define CHILD_UNPRIVILEGED_UID 32767
++# define CHILD_UNPRIVILEGED_GID 32767
++#else
++# define CHILD_UNPRIVILEGED_UID 65534
++# define CHILD_UNPRIVILEGED_GID 65534
++#endif
++
+#ifndef __dso_public
+# ifdef __exported
+# define __dso_public __exported
@@ -669,6 +668,17 @@
+ const environment_map& env_vars_to_set,
+ bool wait, ProcessHandle* process_handle,
+ ProcessArchitecture arch) {
++ return LaunchApp(argv, fds_to_remap, env_vars_to_set,
++ SAME_PRIVILEGES_AS_PARENT,
++ wait, process_handle);
++}
++
++bool LaunchApp(const std::vector<std::string>& argv,
++ const file_handle_mapping_vector& fds_to_remap,
++ const environment_map& env_vars_to_set,
++ ChildPrivileges privs,
++ bool wait, ProcessHandle* process_handle,
++ ProcessArchitecture arch) {
+ bool retval = true;
+
+ char* argv_copy[argv.size() + 1];
@@ -783,6 +793,17 @@
+ const environment_map& env_vars_to_set,
+ bool wait, ProcessHandle* process_handle,
+ ProcessArchitecture arch) {
++ return LaunchApp(argv, fds_to_remap, env_vars_to_set,
++ SAME_PRIVILEGES_AS_PARENT,
++ wait, process_handle);
++}
++
++bool LaunchApp(const std::vector<std::string>& argv,
++ const file_handle_mapping_vector& fds_to_remap,
++ const environment_map& env_vars_to_set,
++ ChildPrivileges privs,
++ bool wait, ProcessHandle* process_handle,
++ ProcessArchitecture arch) {
+ scoped_array<char*> argv_cstr(new char*[argv.size() + 1]);
+ // Illegal to allocate memory after fork and before execvp
+ InjectiveMultimap fd_shuffle1, fd_shuffle2;
@@ -805,19 +826,32 @@
+
+ CloseSuperfluousFds(fd_shuffle2);
+
++ for (size_t i = 0; i < argv.size(); i++)
++ argv_cstr[i] = const_cast<char*>(argv[i].c_str());
++ argv_cstr[argv.size()] = NULL;
++
++ if (privs == UNPRIVILEGED) {
++ if (setgid(CHILD_UNPRIVILEGED_GID) != 0) {
++ DLOG(ERROR) << "FAILED TO setgid() CHILD PROCESS, path: " << argv_cstr[0];
++ _exit(127);
++ }
++ if (setuid(CHILD_UNPRIVILEGED_UID) != 0) {
++ DLOG(ERROR) << "FAILED TO setuid() CHILD PROCESS, path: " << argv_cstr[0];
++ _exit(127);
++ }
++ if (chdir("/") != 0)
++ gProcessLog.print("==> could not chdir()\n");
++ }
++
+ for (environment_map::const_iterator it = env_vars_to_set.begin();
+ it != env_vars_to_set.end(); ++it) {
+ if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/))
+ _exit(127);
+ }
-+
-+ for (size_t i = 0; i < argv.size(); i++)
-+ argv_cstr[i] = const_cast<char*>(argv[i].c_str());
-+ argv_cstr[argv.size()] = NULL;
-+ execvp(argv_cstr[0], argv_cstr.get());
++ execv(argv_cstr[0], argv_cstr.get());
+ // if we get here, we're in serious trouble and should complain loudly
+ DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0];
-+ exit(127);
++ _exit(127);
+ } else {
+ gProcessLog.print("==> process %d launched child process %d\n",
+ GetCurrentProcId(), pid);
@@ -1144,7 +1178,7 @@
base::LaunchApp(childArgv, mFileMap,
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- newEnvVars,
+ newEnvVars, privs,
#endif
false, &process, arch);
diff --git ipc/glue/SharedMemorySysV.h ipc/glue/SharedMemorySysV.h
Deleted: trunk/www/seamonkey/files/patch-bug761077
==============================================================================
--- trunk/www/seamonkey/files/patch-bug761077 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,88 +0,0 @@
-diff --git mozilla/xpcom/reflect/xptcall/public/genstubs.pl mozilla/xpcom/reflect/xptcall/public/genstubs.pl
-index b8a87a5..918c4cf 100644
---- mozilla/xpcom/reflect/xptcall/public/genstubs.pl
-+++ mozilla/xpcom/reflect/xptcall/public/genstubs.pl
-@@ -44,7 +44,7 @@ print OUTFILE "* 0 is QueryInterface\n";
- print OUTFILE "* 1 is AddRef\n";
- print OUTFILE "* 2 is Release\n";
- print OUTFILE "*/\n";
--print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))\n";
-+print OUTFILE "#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))\n";
- for($i = 0; $i < $entry_count; $i++) {
- print OUTFILE "NS_IMETHOD Stub",$i+3,"();\n";
- }
-diff --git mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-index eb66761..807db26 100644
---- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-+++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
-diff --git mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-index ae6ed66..2783957 100644
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -70,7 +70,7 @@ endif
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -269,7 +269,7 @@ endif
- #
- # Linux/PPC
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
-+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
- ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -278,7 +278,7 @@ endif
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -350,7 +350,7 @@ endif
- #
- # OpenBSD/SPARC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64)
-+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
- ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
- endif
-diff --git mozilla/xpcom/reflect/xptcall/src/xptcprivate.h mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
-index d903ced..e4ec832 100644
---- mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
-+++ mozilla/xpcom/reflect/xptcall/src/xptcprivate.h
-@@ -14,7 +14,7 @@
-
- class xptiInterfaceEntry;
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
-@@ -31,7 +31,7 @@ public:
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__) && !defined(__FreeBSD__))
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
Deleted: trunk/www/seamonkey/files/patch-bug774671
==============================================================================
--- trunk/www/seamonkey/files/patch-bug774671 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,40 +0,0 @@
-commit 7e9eda2
-Author: Rafael Ávila de Espíndola <respindola@mozilla.com>
-Date: Tue Jul 17 12:54:41 2012 -0400
-
- Bug 774671 - Fix mismatched declarations. r=luke.
----
- mozilla/js/src/jsproxy.h | 2 +-
- mozilla/js/src/jsprvtd.h | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git mozilla/js/src/jsproxy.h mozilla/js/src/jsproxy.h
-index ec26e3a..aa0e782 100644
---- mozilla/js/src/jsproxy.h
-+++ mozilla/js/src/jsproxy.h
-@@ -13,7 +13,7 @@
-
- namespace js {
-
--class Wrapper;
-+class JS_FRIEND_API(Wrapper);
-
- /*
- * A proxy is a JSObject that implements generic behavior by providing custom
-diff --git mozilla/js/src/jsprvtd.h mozilla/js/src/jsprvtd.h
-index 19b5aef..93e1216 100644
---- mozilla/js/src/jsprvtd.h
-+++ mozilla/js/src/jsprvtd.h
-@@ -146,9 +146,9 @@ struct TreeContext;
- class UpvarCookie;
-
- class Proxy;
--class BaseProxyHandler;
--class DirectWrapper;
--class CrossCompartmentWrapper;
-+class JS_FRIEND_API(BaseProxyHandler);
-+class JS_FRIEND_API(DirectWrapper);
-+class JS_FRIEND_API(CrossCompartmentWrapper);
-
- class TempAllocPolicy;
- class RuntimeAllocPolicy;
Deleted: trunk/www/seamonkey/files/patch-bug775257
==============================================================================
--- trunk/www/seamonkey/files/patch-bug775257 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,27 +0,0 @@
-commit 8fc8b74
-Author: Oleg Romashin <oleg.romashin@nokia.com>
-Date: Wed Jul 18 22:46:11 2012 -0400
-
- Bug 775257 - Gstreamer backend on Meego N9 produce extra noise in audio playback.r=giles
----
- content/media/gstreamer/nsGStreamerReader.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-index c48f92e..0fb801a 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -130,8 +130,13 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor)
- gst_object_unref(sinkpad);
-
- mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! "
-+#ifndef MOZ_TREMOR
- "appsink name=audiosink sync=true caps=audio/x-raw-float,"
- "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL);
-+#else
-+ "appsink name=audiosink sync=true caps=audio/x-raw-int,"
-+ "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL);
-+#endif
- mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink),
- "audiosink"));
- gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks,
Deleted: trunk/www/seamonkey/files/patch-bug777696
==============================================================================
--- trunk/www/seamonkey/files/patch-bug777696 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,32 +0,0 @@
-commit 0c0d1a8
-Author: Landry Breuil <landry@openbsd.org>
-Date: Mon Jul 30 17:57:15 2012 +0200
-
- Bug 777696: Fix gstreamer backend on big endian architectures. r=doublec
----
- content/media/gstreamer/nsGStreamerReader.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-index 0fb801a..4a69196 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -132,10 +132,18 @@ nsresult nsGStreamerReader::Init(nsBuiltinDecoderReader* aCloneDonor)
- mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! "
- #ifdef MOZ_TREMOR
- "appsink name=audiosink sync=true caps=audio/x-raw-float,"
-+#ifdef IS_LITTLE_ENDIAN
- "channels={1,2},rate=44100,width=32,endianness=1234", TRUE, NULL);
- #else
-+ "channels={1,2},rate=44100,width=32,endianness=4321", TRUE, NULL);
-+#endif
-+#else
- "appsink name=audiosink sync=true caps=audio/x-raw-int,"
-+#ifdef IS_LITTLE_ENDIAN
- "channels={1,2},rate=48000,width=16,endianness=1234", TRUE, NULL);
-+#else
-+ "channels={1,2},rate=48000,width=16,endianness=4321", TRUE, NULL);
-+#endif
- #endif
- mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink),
- "audiosink"));
Deleted: trunk/www/seamonkey/files/patch-bug778056
==============================================================================
--- trunk/www/seamonkey/files/patch-bug778056 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- mozilla/memory/mozalloc/mozalloc.cpp~
-+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -19,6 +19,9 @@
- #if defined(XP_UNIX)
- # include <unistd.h> // for valloc on *BSD
- #endif //if defined(XP_UNIX)
-+#if defined(__FreeBSD__)
-+# include <malloc_np.h> // for malloc_usable_size
-+#endif // if defined(__FreeBSD__)
-
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- # define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr)
-
- #if defined(XP_MACOSX)
- return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
-+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
- // Android bionic libc doesn't have malloc_usable_size.
- return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
Deleted: trunk/www/seamonkey/files/patch-bug779847
==============================================================================
--- trunk/www/seamonkey/files/patch-bug779847 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,28 +0,0 @@
---- mozilla/gfx/ycbcr/Makefile.in
-+++ mozilla/gfx/ycbcr/Makefile.in
-@@ -54,23 +54,13 @@ CPPSRCS += yuv_row_win.cpp \
- $(NULL)
- endif
- else
--ifeq ($(OS_ARCH),Linux)
--CPPSRCS += yuv_row_posix.cpp \
-- $(NULL)
--else
--ifeq ($(OS_ARCH),SunOS)
--CPPSRCS += yuv_row_posix.cpp \
-- $(NULL)
--else
--ifeq ($(OS_ARCH),Darwin)
-+ifneq (,$(filter Linux SunOS Darwin DragonFly FreeBSD NetBSD OpenBSD, $(OS_ARCH)))
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
- else
- CPPSRCS += yuv_row_other.cpp \
- $(NULL)
--endif # Darwin
--endif # SunOS
--endif # linux
-+endif # posix
- endif # windows
-
- ifeq (arm,$(findstring arm,$(OS_TEST)))
Modified: trunk/www/seamonkey/files/patch-bug783463
==============================================================================
--- trunk/www/seamonkey/files/patch-bug783463 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/files/patch-bug783463 Wed Oct 24 16:12:06 2012 (r1080)
@@ -12,23 +12,3 @@
SkTime_Unix.cpp \
$(NULL)
endif
---- mozilla/widget/qt/nsNativeThemeQt.cpp~
-+++ mozilla/widget/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,6 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
--#include <malloc.h>
-
-
- #include "gfxASurface.h"
---- mozilla/widget/qt/nsSound.cpp~
-+++ mozilla/widget/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Deleted: trunk/www/seamonkey/files/patch-bug784741
==============================================================================
--- trunk/www/seamonkey/files/patch-bug784741 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,43 +0,0 @@
-diff --git js/src/Makefile.in js/src/Makefile.in
-index 8eb385f..01bd8e3 100644
---- mozilla/js/src/Makefile.in
-+++ mozilla/js/src/Makefile.in
-@@ -323,6 +323,7 @@ endif
-
- ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
- ENABLE_YARR_JIT = 1
-+DEFINES += -DENABLE_YARR_JIT=1
-
- VPATH += $(srcdir)/assembler/assembler \
- $(srcdir)/methodjit \
-diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h
-index 6570f2d..0c84896 100644
---- mozilla/js/src/assembler/wtf/Platform.h
-+++ mozilla/js/src/assembler/wtf/Platform.h
-@@ -1102,9 +1102,7 @@
- #if WTF_PLATFORM_CHROMIUM
- #define ENABLE_YARR_JIT 0
-
--#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT)
--#define ENABLE_YARR_JIT 1
--
-+#elif ENABLE_YARR_JIT
- /* Setting this flag compares JIT results with interpreter results. */
- #define ENABLE_YARR_JIT_DEBUG 0
- #endif
-diff --git js/src/configure.in js/src/configure.in
-index c142eb7..34f98b9 100644
---- mozilla/js/src/configure.in
-+++ mozilla/js/src/configure.in
-@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug,
- (using compiler flags DBG)],
- [ if test "$enableval" != "no"; then
- MOZ_DEBUG=1
-- ENABLE_METHODJIT_SPEW=1
-+ if test "$ENABLE_METHODJIT"; then
-+ # needs MethodJIT or YarrJIT
-+ ENABLE_METHODJIT_SPEW=1
-+ fi
- if test -n "$enableval" -a "$enableval" != "yes"; then
- MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
- _MOZ_DEBUG_FLAGS_SET=1
Deleted: trunk/www/seamonkey/files/patch-bug784776
==============================================================================
--- trunk/www/seamonkey/files/patch-bug784776 Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,33 +0,0 @@
---- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~
-+++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp
-@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
- {
- if (mSharedHandle) {
- gl()->ReleaseSharedHandle(mShareType, mSharedHandle);
-- mSharedHandle = NULL;
-+ mSharedHandle = 0;
- }
-
- mYUVTexture[0].Release();
---- mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
-+++ mozilla/intl/locale/src/unix/nsDateTimeFormatUnix.cpp
-@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr
- struct tm *tmc;
- int i;
-
-- tt = time((time_t)NULL);
-+ tt = time(NULL);
- tmc = localtime(&tt);
-
- tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM
---- mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp~
-+++ mozilla/ipc/glue/CrossProcessMutex_unimplemented.cpp
-@@ -40,7 +40,7 @@ CrossProcessMutexHandle
- CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle)
- {
- NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!");
-- return NULL;
-+ return 0;
- }
-
- }
Added: trunk/www/seamonkey/files/patch-bug786690
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug786690 Wed Oct 24 16:12:06 2012 (r1080)
@@ -0,0 +1,26 @@
+commit 38301c3
+Author: Michael Wu <mwu@mozilla.com>
+Date: Fri Aug 31 10:18:46 2012 -0300
+
+ Bug 786690 - Fix buffered streams on 16 bit outputs, r=kinetik
+---
+ content/media/nsAudioStream.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git content/media/nsAudioStream.cpp content/media/nsAudioStream.cpp
+index ac8ef58..8087d31 100644
+--- mozilla/content/media/nsAudioStream.cpp
++++ mozilla/content/media/nsAudioStream.cpp
+@@ -953,10 +953,11 @@ nsBufferedAudioStream::Init(int32_t aNumChannels, int32_t aRate)
+ params.channels = aNumChannels;
+ #ifdef MOZ_SAMPLE_TYPE_S16LE
+ params.format = CUBEB_SAMPLE_S16NE;
++ mBytesPerFrame = sizeof(int16_t) * aNumChannels;
+ #else /* MOZ_SAMPLE_TYPE_FLOAT32 */
+ params.format = CUBEB_SAMPLE_FLOAT32NE;
+-#endif
+ mBytesPerFrame = sizeof(float) * aNumChannels;
++#endif
+
+ {
+ cubeb_stream* stream;
Modified: trunk/www/seamonkey/files/patch-bug788039
==============================================================================
--- trunk/www/seamonkey/files/patch-bug788039 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/files/patch-bug788039 Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,16 +1,5 @@
# Bug 788039 - With no prefix search libevent via pkg-config.
---- mozilla/config/autoconf.mk.in~
-+++ mozilla/config/autoconf.mk.in
-@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA
-
- MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@
- MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@
--MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
-+MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@
-
- MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
- MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
--- mozilla/configure.in~
+++ mozilla/configure.in
@@ -3854,7 +3854,7 @@ fi
Modified: trunk/www/seamonkey/files/patch-bug788108
==============================================================================
--- trunk/www/seamonkey/files/patch-bug788108 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/files/patch-bug788108 Wed Oct 24 16:12:06 2012 (r1080)
@@ -7,7 +7,7 @@
-//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
-#ifdef __FreeBSD__
-#include <ieeefp.h>
--#ifdef __alpha__
+-#if !defined(__i386__) && !defined(__x86_64__)
-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-#else
-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
Modified: trunk/www/seamonkey/files/patch-bug788955
==============================================================================
--- trunk/www/seamonkey/files/patch-bug788955 Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/files/patch-bug788955 Wed Oct 24 16:12:06 2012 (r1080)
@@ -26,16 +26,6 @@
add_makefiles "
memory/jemalloc/Makefile
"
---- mozilla/config/autoconf.mk.in
-+++ mozilla/config/autoconf.mk.in
-@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@
- MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@
- MOZ_MEMORY = @MOZ_MEMORY@
- MOZ_JEMALLOC = @MOZ_JEMALLOC@
-+MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@
- MOZ_PROFILING = @MOZ_PROFILING@
- MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@
- MOZ_JPROF = @MOZ_JPROF@
diff --git configure.in configure.in
index bb05782..2f32516 100644
--- mozilla/configure.in
Added: trunk/www/seamonkey/files/patch-bug803811
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug803811 Wed Oct 24 16:12:06 2012 (r1080)
@@ -0,0 +1,111 @@
+commit 4ff5f0c
+Author: Landry Breuil <landry@openbsd.org>
+Date: Wed Oct 24 09:56:51 2012 +0400
+
+ Bug 803811 - Fix system zlib detection by porting bug #763651
+---
+ aclocal.m4 | 1 +
+ configure.in | 46 ++++++----------------------------------------
+ 2 files changed, 7 insertions(+), 40 deletions(-)
+
+diff --git aclocal.m4 aclocal.m4
+index f5486dd..a3924d1 100644
+--- aclocal.m4
++++ aclocal.m4
+@@ -16,6 +16,7 @@ builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl
+ builtin(include, mozilla/build/autoconf/lto.m4)dnl
+ builtin(include, mozilla/build/autoconf/frameptr.m4)dnl
+ builtin(include, mozilla/build/autoconf/compiler-opts.m4)dnl
++builtin(include, mozilla/build/autoconf/zlib.m4)dnl
+
+ MOZ_PROG_CHECKMSYS()
+
+diff --git configure.in configure.in
+index be833e8..c90fe39 100644
+--- configure.in
++++ configure.in
+@@ -63,7 +63,6 @@ dnl Set the version number of the libs included with mozilla
+ dnl ========================================================
+ MOZJPEG=62
+ MOZPNG=10401
+-MOZZLIB=0x1230
+ NSPR_VERSION=4
+ NSS_VERSION=3
+
+@@ -868,8 +867,6 @@ MOZ_USER_DIR=".mozilla"
+
+ MOZ_JPEG_CFLAGS=
+ MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/mozilla/jpeg)'
+-MOZ_ZLIB_CFLAGS=
+-MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)'
+ MOZ_BZ2_CFLAGS=
+ MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/mozilla/modules/libbz2/src)'
+ MOZ_PNG_CFLAGS=
+@@ -3957,47 +3954,19 @@ if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$MOZ_NATIVE_JPEG" = 1; then
+ MOZ_JPEG_CFLAGS="-I${JPEG_DIR}/include"
+ MOZ_JPEG_LIBS="-L${JPEG_DIR}/lib ${MOZ_JPEG_LIBS}"
+ fi
++fi # SKIP_LIBRARY_CHECKS
+
+ dnl system ZLIB support
+ dnl ========================================================
+-MOZ_ARG_WITH_STRING(system-zlib,
+-[ --with-system-zlib[=PFX]
+- Use system libz [installed at prefix PFX]],
+- ZLIB_DIR=$withval)
+
+-_SAVE_CFLAGS=$CFLAGS
+-_SAVE_LDFLAGS=$LDFLAGS
+-_SAVE_LIBS=$LIBS
+-if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then
+- CFLAGS="-I${ZLIB_DIR}/include $CFLAGS"
+- LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS"
+-fi
+-if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then
+- MOZ_NATIVE_ZLIB=
+-else
+- AC_CHECK_LIB(z, gzread, [MOZ_NATIVE_ZLIB=1 MOZ_ZLIB_LIBS="-lz"],
+- [MOZ_NATIVE_ZLIB=])
+-fi
+-if test "$MOZ_NATIVE_ZLIB" = 1; then
+- MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'`
+- AC_TRY_COMPILE([ #include <stdio.h>
+- #include <string.h>
+- #include <zlib.h> ],
+- [ #if ZLIB_VERNUM < $MOZZLIBNUM
+- #error "Insufficient zlib version ($MOZZLIBNUM required)."
+- #endif ],
+- MOZ_NATIVE_ZLIB=1,
+-AC_MSG_ERROR([Insufficient zlib version for --with-system-zlib ($MOZZLIB required)]))
+-fi
+-CFLAGS=$_SAVE_CFLAGS
+-LDFLAGS=$_SAVE_LDFLAGS
+-LIBS=$_SAVE_LIBS
++MOZ_ZLIB_CHECK([1.2.3])
+
+-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then
+- MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
+- MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
++if test "$MOZ_NATIVE_ZLIB" != 1; then
++ MOZ_ZLIB_CFLAGS=
++ MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)'
+ fi
+
++if test -z "$SKIP_LIBRARY_CHECKS"; then
+ dnl system BZIP2 Support
+ dnl ========================================================
+ MOZ_ARG_WITH_STRING(system-bz2,
+@@ -6556,13 +6525,10 @@ AC_SUBST(MOZ_NATIVE_MAKEDEPEND)
+ AC_SUBST(SYSTEM_LIBXUL)
+ AC_SUBST(MOZ_NATIVE_JPEG)
+ AC_SUBST(MOZ_NATIVE_PNG)
+-AC_SUBST(MOZ_NATIVE_ZLIB)
+ AC_SUBST(MOZ_NATIVE_BZ2)
+
+ AC_SUBST(MOZ_JPEG_CFLAGS)
+ AC_SUBST(MOZ_JPEG_LIBS)
+-AC_SUBST(MOZ_ZLIB_CFLAGS)
+-AC_SUBST(MOZ_ZLIB_LIBS)
+ AC_SUBST(MOZ_BZ2_CFLAGS)
+ AC_SUBST(MOZ_BZ2_LIBS)
+ AC_SUBST(MOZ_PNG_CFLAGS)
Deleted: trunk/www/seamonkey/files/patch-config-autoconf.mk.in
==============================================================================
--- trunk/www/seamonkey/files/patch-config-autoconf.mk.in Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200
-+++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200
-@@ -57,14 +57,14 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@/%%MOZILLA%%
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir = $(datadir)/idl/%%MOZILLA%%
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/%%MOZILLA%%
-+sdkdir = $(libdir)/%%MOZILLA%%
-
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
Modified: trunk/www/seamonkey/files/patch-config-baseconfig.mk
==============================================================================
--- trunk/www/seamonkey/files/patch-config-baseconfig.mk Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/files/patch-config-baseconfig.mk Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,5 +1,5 @@
---- mozilla/config/baseconfig.mk~
-+++ mozilla/config/baseconfig.mk
+--- config/baseconfig.mk~
++++ config/baseconfig.mk
@@ -1,9 +1,9 @@
INCLUDED_AUTOCONF_MK = 1
@@ -11,6 +11,6 @@
+idldir = $(datadir)/idl/%%MOZILLA%%
+installdir = $(libdir)/%%MOZILLA%%
+sdkdir = $(libdir)/%%MOZILLA%%
- DIST = $(DEPTH)/dist
-
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+ MOZILLA_SRCDIR = $(topsrcdir)/mozilla
+ MOZDEPTH = $(DEPTH)/mozilla
+ DIST = $(MOZDEPTH)/dist
Deleted: trunk/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp
==============================================================================
--- trunk/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- mailnews/addrbook/src/nsDirPrefs.cpp~
-+++ mailnews/addrbook/src/nsDirPrefs.cpp
-@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid
- DIR_Server *s=nsnull;
-
- switch (position) {
-- case DIR_POS_APPEND:
-+ case (PRInt32)DIR_POS_APPEND:
- /* Do nothing if the request is to append a server that is already
- * in the list.
- */
-@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid
- wholeList->AppendElement(server);
- break;
-
-- case DIR_POS_DELETE:
-+ case (PRInt32)DIR_POS_DELETE:
- /* Remove the prefs corresponding to the given server. If the prefName
- * value is nsnull, the server has never been saved and there are no
- * prefs to remove.
Deleted: trunk/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp
==============================================================================
--- trunk/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,29 +0,0 @@
---- mailnews/compose/src/nsSmtpProtocol.cpp~
-+++ mailnews/compose/src/nsSmtpProtocol.cpp
-@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr
-
- switch (code)
- {
-- case NS_ERROR_SMTP_SERVER_ERROR:
-- case NS_ERROR_TCP_READ_ERROR:
-- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
-- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
-- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
-- case NS_ERROR_SENDING_FROM_COMMAND:
-- case NS_ERROR_SENDING_RCPT_COMMAND:
-- case NS_ERROR_SENDING_DATA_COMMAND:
-- case NS_ERROR_SENDING_MESSAGE:
-- case NS_ERROR_SMTP_GREETING:
-+ case (int)NS_ERROR_SMTP_SERVER_ERROR:
-+ case (int)NS_ERROR_TCP_READ_ERROR:
-+ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED:
-+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1:
-+ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2:
-+ case (int)NS_ERROR_SENDING_FROM_COMMAND:
-+ case (int)NS_ERROR_SENDING_RCPT_COMMAND:
-+ case (int)NS_ERROR_SENDING_DATA_COMMAND:
-+ case (int)NS_ERROR_SENDING_MESSAGE:
-+ case (int)NS_ERROR_SMTP_GREETING:
- bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg));
- msg = nsTextFormatter::vsmprintf(eMsg.get(), args);
- break;
Deleted: trunk/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp Wed Oct 24 16:12:06 2012 (r1079)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,15 +0,0 @@
---- mozilla/content/svg/content/src/nsSVGElement.cpp.orig 2010-05-12 16:46:09.000000000 +0200
-+++ mozilla/content/svg/content/src/nsSVGElement.cpp 2010-05-12 16:49:33.000000000 +0200
-@@ -102,7 +102,11 @@
- // vararg-list methods in this file:
- // nsSVGElement::GetAnimated{Length,Number,Integer}Values
- // See bug 547964 for details:
--PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull));
-+// I really try to get the details but I'm not allowed to
-+// access this bug in bugzilla:
-+// You are not authorized to access bug #547964.
-+// So disable this ASSERT as it breaks build.
-+//PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull));
-
-
- nsSVGEnumMapping nsSVGElement::sSVGUnitTypesMap[] = {
Modified: trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in Wed Oct 24 16:11:46 2012 (r1079)
+++ trunk/www/seamonkey/files/patch-mozilla-js-src-configure.in Wed Oct 24 16:12:06 2012 (r1080)
@@ -1,6 +1,6 @@
---- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100
-+++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100
-@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n
+--- mozilla/js/src/js-confdefs.h.in~
++++ mozilla/js/src/js-confdefs.h.in
+@@ -12,6 +12,7 @@
* C++ implementations should define these macros only when __STDC_LIMIT_MACROS
* is defined before <stdint.h> is included. */
#define __STDC_LIMIT_MACROS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210241612.q9OGC6h2035090>