Date: Thu, 9 Aug 2012 06:41:01 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r917 - in branches/experimental: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files www/seamonkey www/seamonkey/files Message-ID: <201208090641.q796f1Nn096647@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Aug 9 06:41:01 2012
New Revision: 917
Log:
update
Added:
branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-gc-Memory.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-platform-linux.cc
branches/experimental/www/firefox-nightly/files/patch-js-src-js-confdefs.h.in
- copied, changed from r916, branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in
branches/experimental/www/firefox/files/patch-gfx-skia-Makefile.in
branches/experimental/www/firefox/files/patch-js-src-gc-Memory.cpp
branches/experimental/www/firefox/files/patch-tools-profiler-Makefile.in
branches/experimental/www/firefox/files/patch-tools-profiler-platform-linux.cc
branches/experimental/www/seamonkey/files/patch-mozilla-js-src-gc-Memory.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-Makefile.in
branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-platform-linux.cc
Deleted:
branches/experimental/www/firefox-nightly/files/patch-gfx-ycbcr-Makefile.in
branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in
branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird/distinfo
branches/experimental/mail/thunderbird/files/patch-alsapulse
branches/experimental/mail/thunderbird/files/patch-bug753046
branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
branches/experimental/www/firefox-nightly/Makefile.hgrev
branches/experimental/www/firefox-nightly/distinfo
branches/experimental/www/firefox-nightly/files/patch-alsapulse
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox/distinfo
branches/experimental/www/firefox/files/patch-alsapulse
branches/experimental/www/firefox/files/patch-bug753046
branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in
branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
branches/experimental/www/seamonkey/Makefile
branches/experimental/www/seamonkey/distinfo
branches/experimental/www/seamonkey/files/patch-alsapulse
branches/experimental/www/seamonkey/files/patch-bug753046
branches/experimental/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:41:01 2012 (r917)
@@ -725,6 +725,7 @@
LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
MOZ_OPTIONS+= --enable-alsa
+MOZ_OPTIONS+= --disable-floating-point # bug780531
.endif
.if ${PORT_OPTIONS:MPULSEAUDIO}
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/mail/thunderbird/Makefile Thu Aug 9 06:41:01 2012 (r917)
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-DISTVERSION= 14.0
+DISTVERSION= 15.0b2
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@@ -18,10 +18,12 @@
BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
nss>=3.13.2:${PORTSDIR}/security/nss \
sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \
+ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
USE_AUTOTOOLS= autoconf213:env
+USE_PYTHON_BUILD=yes
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
USE_MOZILLA= # empty
@@ -56,7 +58,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC= ${WRKDIR}/comm-beta
MOZSRC:= ${WRKSRC}/mozilla
.if ${ARCH} == amd64
Modified: branches/experimental/mail/thunderbird/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird/distinfo Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/mail/thunderbird/distinfo Thu Aug 9 06:41:01 2012 (r917)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-14.0.source.tar.bz2) = 29225e82c1dce9d44d1b81cf0441749ef8fc4168291cc75bcbcfe9b930f10c3a
-SIZE (thunderbird-14.0.source.tar.bz2) = 105235591
+SHA256 (thunderbird-15.0b2.source.tar.bz2) = 70f795a7cb0e2304773aae5ba64ea58b1e59c6d9021fa7a3785a42b59fa4e707
+SIZE (thunderbird-15.0b2.source.tar.bz2) = 106002871
Modified: branches/experimental/mail/thunderbird/files/patch-alsapulse
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-alsapulse Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/mail/thunderbird/files/patch-alsapulse Thu Aug 9 06:41:01 2012 (r917)
@@ -1,46 +1,46 @@
---- mozilla/config/autoconf.mk.in~
+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
-@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF
+@@ -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@
---- mozilla/configure.in~
+ GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
+diff --git mozilla/configure.in mozilla/configure.in
+index 5980b76..11f5f77 100644
+--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5758,17 +5775,47 @@ dnl ====================================
+@@ -5600,13 +5600,45 @@ dnl ========================================================
dnl = Check alsa availability on Linux if using sydneyaudio
dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(alsa,
-+[ --enable-alsa Enable Alsa support],
++[ --enable-alsa Enable Alsa support (default on Linux)],
+MOZ_ALSA=1,
+MOZ_ALSA= MOZ_ALSA_FORCE=$enableval)
+
dnl If using sydneyaudio with Linux, ensure that the alsa library is available
--if test -n "$MOZ_SYDNEYAUDIO"; then
-+if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then
- case "$target_os" in
- linux*)
-+ MOZ_ALSA=1
-+ ;;
-+ esac
+-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then
++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then
++ MOZ_ALSA=1
+fi
+
+if test -n "$MOZ_ALSA"; then
- PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
++ AC_DEFINE(MOZ_CUBEB)
+ PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
[echo "$MOZ_ALSA_PKG_ERRORS"
AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])])
-- ;;
-- esac
fi
+AC_SUBST(MOZ_ALSA)
@@ -55,6 +55,7 @@
+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])])
@@ -65,9 +66,58 @@
+AC_SUBST(MOZ_PULSEAUDIO)
+
dnl ========================================================
- dnl Permissions System
+ dnl = Enable GStreamer
dnl ========================================================
---- mozilla/media/libsydneyaudio/src/Makefile.in~
+diff --git mozilla/media/libcubeb/src/Makefile.in mozilla/media/libcubeb/src/Makefile.in
+index 5ab4dd8..c8df26f 100644
+--- mozilla/media/libcubeb/src/Makefile.in
++++ mozilla/media/libcubeb/src/Makefile.in
+@@ -24,10 +24,6 @@ endif
+
+ ifeq ($(OS_TARGET),Android)
+ # No Android implementation of libcubeb yet.
+-else ifeq ($(OS_TARGET),Linux)
+-CSRCS = \
+- cubeb_alsa.c \
+- $(NULL)
+ endif
+
+ ifeq ($(OS_TARGET),Darwin)
+@@ -42,4 +38,16 @@ CSRCS = \
+ $(NULL)
+ endif
+
++ifdef MOZ_ALSA
++CSRCS = \
++ cubeb_alsa.c \
++ $(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,7 +6,10 @@
+ */
+ #undef NDEBUG
+ #define _BSD_SOURCE
++#if !defined(__DragonFly__) && !defined(__FreeBSD__) \
++ && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #define _POSIX_SOURCE
++#endif
+ #include <pthread.h>
+ #include <sys/time.h>
+ #include <assert.h>
+diff --git mozilla/media/libsydneyaudio/src/Makefile.in mozilla/media/libsydneyaudio/src/Makefile.in
+index 8dda8ce..b19641d 100644
+--- mozilla/media/libsydneyaudio/src/Makefile.in
+++ mozilla/media/libsydneyaudio/src/Makefile.in
@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android)
CSRCS = \
@@ -99,20 +149,23 @@
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += winmm.lib
endif
---- mozilla/toolkit/library/Makefile.in~
+diff --git mozilla/toolkit/library/Makefile.in mozilla/toolkit/library/Makefile.in
+index 43384e9..e46a6e3 100644
+--- mozilla/toolkit/library/Makefile.in
+++ mozilla/toolkit/library/Makefile.in
-@@ -375,10 +375,12 @@ endif
+@@ -379,10 +379,13 @@ endif
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
-ifdef MOZ_SYDNEYAUDIO
-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO))
+ifdef MOZ_ALSA
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
endif
-+
+ifdef MOZ_PULSEAUDIO
+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
++endif
endif
ifdef HAVE_CLOCK_MONOTONIC
Modified: branches/experimental/mail/thunderbird/files/patch-bug753046
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/mail/thunderbird/files/patch-bug753046 Thu Aug 9 06:41:01 2012 (r917)
@@ -469,7 +469,7 @@
--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000
+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,9 +9,23 @@
+@@ -9,16 +9,30 @@
#if defined(OS_MACOSX)
#include <mach/mach.h>
@@ -477,9 +477,10 @@
+#include <lwp.h>
#elif defined(OS_LINUX)
#include <sys/syscall.h>
- #include <unistd.h>
-+#elif defined(OS_DRAGONFLY)
-+#include <unistd.h>
+-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ #include <sys/prctl.h>
+-#elif !defined(__NetBSD__)
+-#include <pthread_np.h>
+#elif defined(OS_FREEBSD)
+#include <sys/param.h>
+#if __FreeBSD_version > 802500
@@ -489,15 +490,24 @@
+extern "C" int thr_self(long *);
+_Pragma("GCC visibility pop")
+#endif
-+#include <pthread_np.h>
+ #endif
++
++#if !defined(OS_MACOSX)
+ #include <unistd.h>
#endif
++#if defined(OS_BSD) && !defined(OS_NETBSD)
++#include <pthread_np.h>
++#endif
++
#if defined(OS_MACOSX)
-@@ -38,9 +45,20 @@
+ namespace base {
+ void InitThreading();
+@@ -38,9 +45,20 @@ PlatformThreadId PlatformThread::CurrentId() {
// into the kernel.
#if defined(OS_MACOSX)
return mach_thread_self();
--#elif defined (__OpenBSD__)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(OS_NETBSD)
+ return _lwp_self();
+#elif defined(OS_DRAGONFLY)
@@ -517,6 +527,18 @@
#elif defined(OS_LINUX)
return syscall(__NR_gettid);
#endif
+@@ -102,9 +102,9 @@ void PlatformThread::SetName(const char* name) {
+ // Note that glibc also has a 'pthread_setname_np' api, but it may not be
+ // available everywhere and it's only benefit over using prctl directly is
+ // that it can set the name of threads other than the current thread.
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(OS_BSD) && !defined(OS_NETBSD)
+ pthread_set_name_np(pthread_self(), name);
+-#elif defined(__NetBSD__)
++#elif defined(OS_NETBSD)
+ pthread_setname_np(pthread_self(), "%s", name);
+ #else
+ prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0);
diff --git mozilla/ipc/chromium/src/base/ref_counted.h mozilla/ipc/chromium/src/base/ref_counted.h
index 013bd66..18e2794 100644
--- mozilla/ipc/chromium/src/base/ref_counted.h
Added: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-gc-Memory.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-gc-Memory.cpp Thu Aug 9 06:41:01 2012 (r917)
@@ -0,0 +1,13 @@
+--- mozilla/js/src/gc/Memory.cpp~
++++ mozilla/js/src/gc/Memory.cpp
+@@ -292,9 +292,9 @@ GetPageFaultCount()
+ #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
+
+ #include <sys/mman.h>
+-#include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <unistd.h>
+
+ void
+ InitMemorySubsystem()
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in Thu Aug 9 06:41:01 2012 (r917)
@@ -1,10 +1,11 @@
--- mozilla/layout/generic/Makefile.in~
+++ mozilla/layout/generic/Makefile.in
-@@ -154,9 +154,10 @@ LOCAL_INCLUDES += \
+@@ -123,10 +123,11 @@ LOCAL_INCLUDES += \
-I$(srcdir)/../../dom/base \
-I$(srcdir)/../../dom/plugins/base \
-I$(srcdir)/../svg/base/src \
- $(MOZ_CAIRO_CFLAGS) \
+ $(MOZ_PIXMAN_CFLAGS) \
$(NULL)
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
Added: branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-Makefile.in Thu Aug 9 06:41:01 2012 (r917)
@@ -0,0 +1,11 @@
+--- mozilla/tools/profiler/Makefile.in~
++++ mozilla/tools/profiler/Makefile.in
+@@ -78,7 +78,7 @@ EXTRA_JS_MODULES = \
+ Profiler.jsm \
+ $(NULL)
+
+-ifneq (,$(filter Android Linux,$(OS_TARGET)))
++ifneq (,$(filter Android Linux FreeBSD,$(OS_TARGET)))
+ CPPSRCS += \
+ shared-libraries-linux.cc \
+ platform-linux.cc \
Added: branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-platform-linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-platform-linux.cc Thu Aug 9 06:41:01 2012 (r917)
@@ -0,0 +1,43 @@
+--- mozilla/tools/profiler/platform-linux.cc~
++++ mozilla/tools/profiler/platform-linux.cc
+@@ -133,7 +133,7 @@ static void ProfilerSignalHandler(int si
+ sActiveSampler->Tick(sample);
+ }
+
+-#ifndef XP_MACOSX
++#if !defined(XP_MACOSX) && !defined(__FreeBSD__)
+ void tgkill(pid_t tgid, pid_t tid, int signalno) {
+ syscall(SYS_tgkill, tgid, tid, signalno);
+ }
+@@ -145,11 +145,11 @@ class Sampler::PlatformData : public Mal
+ : sampler_(sampler),
+ signal_handler_installed_(false),
+ vm_tgid_(getpid()),
+-#ifndef XP_MACOSX
++#if !defined(XP_MACOSX) && !defined(__FreeBSD__)
+ vm_tid_(gettid()),
+ #endif
+ signal_sender_launched_(false)
+-#ifdef XP_MACOSX
++#if defined(XP_MACOSX) || defined(__FreeBSD__)
+ , signal_receiver_(pthread_self())
+ #endif
+ {
+@@ -140,7 +140,7 @@ class Sampler::PlatformData : public Mal
+ sampler_->HandleSaveRequest();
+
+ if (!sampler_->IsPaused()) {
+-#ifdef XP_MACOSX
++#ifdef XP_MACOSX || defined(__FreeBSD__)
+ pthread_kill(signal_receiver_, SIGPROF);
+ #else
+ // Glibc doesn't provide a wrapper for tgkill(2).
+@@ -192,7 +192,7 @@ class Sampler::PlatformData : public Mal
+ pid_t vm_tid_;
+ bool signal_sender_launched_;
+ pthread_t signal_sender_thread_;
+-#ifdef XP_MACOSX
++#if defined(XP_MACOSX) || defined(__FreeBSD__)
+ pthread_t signal_receiver_;
+ #endif
+ };
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:41:01 2012 (r917)
@@ -1,6 +1,6 @@
--- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,11 @@
+@@ -57,6 +57,11 @@
nsresult
nsThreadManager::Init()
{
@@ -9,6 +9,6 @@
+ if (!gTLSThreadID)
+ gTLSThreadID = mozilla::threads::Generic;
+#endif
- if (!mThreadsByPRThread.Init())
- return NS_ERROR_OUT_OF_MEMORY;
+ mThreadsByPRThread.Init();
+ if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE)
Modified: branches/experimental/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile.hgrev Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/firefox-nightly/Makefile.hgrev Thu Aug 9 06:41:01 2012 (r917)
@@ -1 +1 @@
-HGREV= 100823:29bff59d3bbe
+HGREV= 101824:4e3fb1f9f72a
Modified: branches/experimental/www/firefox-nightly/distinfo
==============================================================================
--- branches/experimental/www/firefox-nightly/distinfo Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/firefox-nightly/distinfo Thu Aug 9 06:41:01 2012 (r917)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/29bff59d3bbe.tar.bz2) = 7df2790a9fb29025ac7a402105d84d462405ce9b13f8c8ecb131c7ebd9f08cd8
-SIZE (firefox-nightly/29bff59d3bbe.tar.bz2) = 87797021
+SHA256 (firefox-nightly/4e3fb1f9f72a.tar.bz2) = 0eaf99781af4ec5994fb8458c39c7db0299f17c581bff2391846babb134dc902
+SIZE (firefox-nightly/4e3fb1f9f72a.tar.bz2) = 88008681
Modified: branches/experimental/www/firefox-nightly/files/patch-alsapulse
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-alsapulse Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/firefox-nightly/files/patch-alsapulse Thu Aug 9 06:41:01 2012 (r917)
@@ -1,32 +1,13 @@
-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 ========================================================
+MOZ_ARG_ENABLE_BOOL(alsa,
-+[ --enable-alsa Enable Alsa support],
++[ --enable-alsa Enable Alsa support (default on Linux)],
+MOZ_ALSA=1,
+MOZ_ALSA= MOZ_ALSA_FORCE=$enableval)
+
@@ -37,36 +18,16 @@
+fi
+
+if test -n "$MOZ_ALSA"; then
++ AC_DEFINE(MOZ_CUBEB)
PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
[echo "$MOZ_ALSA_PKG_ERRORS"
AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])])
-+ AC_DEFINE(MOZ_CUBEB)
fi
+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
-+ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, ,
-+ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS"
-+ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])])
-+ AC_DEFINE(MOZ_CUBEB)
-+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,22 +54,19 @@
+ $(NULL)
+endif
+
-+ifdef MOZ_PULSEAUDIO
-+CSRCS = \
-+ cubeb_pulse.c \
-+ $(NULL)
-+endif
-+
- include $(topsrcdir)/config/rules.mk
+ ifdef MOZ_PULSEAUDIO
+ CSRCS = \
+ cubeb_pulse.c \
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,7 +6,9 @@
+@@ -6,7 +6,10 @@
*/
#undef NDEBUG
#define _BSD_SOURCE
-+#ifndef __FreeBSD__
++#if !defined(__DragonFly__) && !defined(__FreeBSD__) \
++ && !defined(__NetBSD__) && !defined(__OpenBSD__)
#define _POSIX_SOURCE
+#endif
#include <pthread.h>
@@ -152,18 +110,20 @@
index 43384e9..e46a6e3 100644
--- toolkit/library/Makefile.in
+++ toolkit/library/Makefile.in
-@@ -375,10 +375,12 @@ endif
+@@ -370,14 +370,11 @@ endif
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
-ifdef MOZ_SYDNEYAUDIO
-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO))
+ifdef MOZ_ALSA
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
endif
-+
-+ifdef MOZ_PULSEAUDIO
-+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
+-endif
+-
+ ifdef MOZ_PULSEAUDIO
+-ifdef MOZ_CUBEB
+ EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
+ endif
endif
-
- ifdef HAVE_CLOCK_MONOTONIC
Deleted: branches/experimental/www/firefox-nightly/files/patch-gfx-ycbcr-Makefile.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-gfx-ycbcr-Makefile.in Thu Aug 9 06:41:01 2012 (r916)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- gfx/ycbcr/Makefile.in~
-+++ gfx/ycbcr/Makefile.in
-@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
- else
-+ifeq ($(OS_ARCH),FreeBSD)
-+CPPSRCS += yuv_row_posix.cpp \
-+ $(NULL)
-+else
- ifeq ($(OS_ARCH),SunOS)
- CPPSRCS += yuv_row_posix.cpp \
- $(NULL)
-@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \
- $(NULL)
- endif # Darwin
- endif # SunOS
-+endif # FreeBSD
- endif # linux
- endif # windows
-
\ No newline at end of file
Deleted: branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in Thu Aug 9 06:41:01 2012 (r916)
+++ /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: branches/experimental/www/firefox-nightly/files/patch-js-src-js-confdefs.h.in (from r916, branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in)
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in Thu Aug 9 06:40:45 2012 (r916, copy source)
+++ branches/experimental/www/firefox-nightly/files/patch-js-src-js-confdefs.h.in Thu Aug 9 06:41:01 2012 (r917)
@@ -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
Deleted: branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Thu Aug 9 06:41:01 2012 (r916)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004
-@@ -8,7 +8,7 @@
- * 1 is AddRef
- * 2 is Release
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
Deleted: branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Thu Aug 9 06:41:01 2012 (r916)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800
-+++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800
-@@ -45,7 +45,7 @@
-
- class xptiInterfaceEntry;
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #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;
-@@ -62,7 +62,7 @@
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #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: branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Thu Aug 9 06:41:01 2012 (r916)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,38 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200
-@@ -70,7 +70,7 @@
- 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
-@@ -341,7 +356,7 @@
- #
- # 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
-@@ -350,7 +365,7 @@
- #
- # 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 @@
- #
- # 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
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/firefox/Makefile Thu Aug 9 06:41:01 2012 (r917)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 14.0.1
+DISTVERSION= 15.0b3
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@@ -19,10 +19,12 @@
BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
nss>=3.13.2:${PORTSDIR}/security/nss \
sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \
+ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
USE_AUTOTOOLS= autoconf213:env
+USE_PYTHON_BUILD=yes
USE_GECKO= gecko
CONFLICTS= firefox-10.*
MOZ_PKGCONFIG_FILES= # empty
@@ -52,7 +54,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/mozilla-release
+WRKSRC:= ${WRKDIR}/mozilla-beta
.if ${ARCH} == amd64
CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
Modified: branches/experimental/www/firefox/distinfo
==============================================================================
--- branches/experimental/www/firefox/distinfo Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/firefox/distinfo Thu Aug 9 06:41:01 2012 (r917)
@@ -1,2 +1,2 @@
-SHA256 (firefox-14.0.1.source.tar.bz2) = c21988f0207b678376c3d96f647aadf6d694e836f0b5c933ec15d93b75ea89aa
-SIZE (firefox-14.0.1.source.tar.bz2) = 82478218
+SHA256 (firefox-15.0b3.source.tar.bz2) = 5e85181e1af15c99da37f473c5c5bb1cb2658845c1c71b1a77014008af2f76d3
+SIZE (firefox-15.0b3.source.tar.bz2) = 83580198
Modified: branches/experimental/www/firefox/files/patch-alsapulse
==============================================================================
--- branches/experimental/www/firefox/files/patch-alsapulse Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/firefox/files/patch-alsapulse Thu Aug 9 06:41:01 2012 (r917)
@@ -1,46 +1,46 @@
---- config/autoconf.mk.in~
+diff --git config/autoconf.mk.in config/autoconf.mk.in
+index 44c0b06..748511b 100644
+--- config/autoconf.mk.in
+++ config/autoconf.mk.in
-@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF
+@@ -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@
---- configure.in~
+ GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
+diff --git configure.in configure.in
+index 5980b76..11f5f77 100644
+--- configure.in
+++ configure.in
-@@ -5758,17 +5775,47 @@ dnl ====================================
+@@ -5600,13 +5600,45 @@ dnl ========================================================
dnl = Check alsa availability on Linux if using sydneyaudio
dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(alsa,
-+[ --enable-alsa Enable Alsa support],
++[ --enable-alsa Enable Alsa support (default on Linux)],
+MOZ_ALSA=1,
+MOZ_ALSA= MOZ_ALSA_FORCE=$enableval)
+
dnl If using sydneyaudio with Linux, ensure that the alsa library is available
--if test -n "$MOZ_SYDNEYAUDIO"; then
-+if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then
- case "$target_os" in
- linux*)
-+ MOZ_ALSA=1
-+ ;;
-+ esac
+-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then
++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then
++ MOZ_ALSA=1
+fi
+
+if test -n "$MOZ_ALSA"; then
- PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
++ AC_DEFINE(MOZ_CUBEB)
+ PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
[echo "$MOZ_ALSA_PKG_ERRORS"
AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])])
-- ;;
-- esac
fi
+AC_SUBST(MOZ_ALSA)
@@ -55,6 +55,7 @@
+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])])
@@ -65,9 +66,58 @@
+AC_SUBST(MOZ_PULSEAUDIO)
+
dnl ========================================================
- dnl Permissions System
+ dnl = Enable GStreamer
dnl ========================================================
---- media/libsydneyaudio/src/Makefile.in~
+diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in
+index 5ab4dd8..c8df26f 100644
+--- media/libcubeb/src/Makefile.in
++++ media/libcubeb/src/Makefile.in
+@@ -24,10 +24,6 @@ endif
+
+ ifeq ($(OS_TARGET),Android)
+ # No Android implementation of libcubeb yet.
+-else ifeq ($(OS_TARGET),Linux)
+-CSRCS = \
+- cubeb_alsa.c \
+- $(NULL)
+ endif
+
+ ifeq ($(OS_TARGET),Darwin)
+@@ -42,4 +38,16 @@ CSRCS = \
+ $(NULL)
+ endif
+
++ifdef MOZ_ALSA
++CSRCS = \
++ cubeb_alsa.c \
++ $(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,7 +6,10 @@
+ */
+ #undef NDEBUG
+ #define _BSD_SOURCE
++#if !defined(__DragonFly__) && !defined(__FreeBSD__) \
++ && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #define _POSIX_SOURCE
++#endif
+ #include <pthread.h>
+ #include <sys/time.h>
+ #include <assert.h>
+diff --git media/libsydneyaudio/src/Makefile.in media/libsydneyaudio/src/Makefile.in
+index 8dda8ce..b19641d 100644
+--- media/libsydneyaudio/src/Makefile.in
+++ media/libsydneyaudio/src/Makefile.in
@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android)
CSRCS = \
@@ -99,20 +149,23 @@
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += winmm.lib
endif
---- toolkit/library/Makefile.in~
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 43384e9..e46a6e3 100644
+--- toolkit/library/Makefile.in
+++ toolkit/library/Makefile.in
-@@ -375,10 +375,12 @@ endif
+@@ -379,10 +379,13 @@ endif
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
-ifdef MOZ_SYDNEYAUDIO
-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO))
+ifdef MOZ_ALSA
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
endif
-+
+ifdef MOZ_PULSEAUDIO
+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
++endif
endif
ifdef HAVE_CLOCK_MONOTONIC
Modified: branches/experimental/www/firefox/files/patch-bug753046
==============================================================================
--- branches/experimental/www/firefox/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/firefox/files/patch-bug753046 Thu Aug 9 06:41:01 2012 (r917)
@@ -469,7 +469,7 @@
--- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000
+++ ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,9 +9,23 @@
+@@ -9,16 +9,30 @@
#if defined(OS_MACOSX)
#include <mach/mach.h>
@@ -477,9 +477,10 @@
+#include <lwp.h>
#elif defined(OS_LINUX)
#include <sys/syscall.h>
- #include <unistd.h>
-+#elif defined(OS_DRAGONFLY)
-+#include <unistd.h>
+-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ #include <sys/prctl.h>
+-#elif !defined(__NetBSD__)
+-#include <pthread_np.h>
+#elif defined(OS_FREEBSD)
+#include <sys/param.h>
+#if __FreeBSD_version > 802500
@@ -489,15 +490,24 @@
+extern "C" int thr_self(long *);
+_Pragma("GCC visibility pop")
+#endif
-+#include <pthread_np.h>
+ #endif
++
++#if !defined(OS_MACOSX)
+ #include <unistd.h>
#endif
++#if defined(OS_BSD) && !defined(OS_NETBSD)
++#include <pthread_np.h>
++#endif
++
#if defined(OS_MACOSX)
-@@ -38,9 +45,20 @@
+ namespace base {
+ void InitThreading();
+@@ -38,9 +45,20 @@ PlatformThreadId PlatformThread::CurrentId() {
// into the kernel.
#if defined(OS_MACOSX)
return mach_thread_self();
--#elif defined (__OpenBSD__)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(OS_NETBSD)
+ return _lwp_self();
+#elif defined(OS_DRAGONFLY)
@@ -517,6 +527,18 @@
#elif defined(OS_LINUX)
return syscall(__NR_gettid);
#endif
+@@ -102,9 +102,9 @@ void PlatformThread::SetName(const char* name) {
+ // Note that glibc also has a 'pthread_setname_np' api, but it may not be
+ // available everywhere and it's only benefit over using prctl directly is
+ // that it can set the name of threads other than the current thread.
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(OS_BSD) && !defined(OS_NETBSD)
+ pthread_set_name_np(pthread_self(), name);
+-#elif defined(__NetBSD__)
++#elif defined(OS_NETBSD)
+ pthread_setname_np(pthread_self(), "%s", name);
+ #else
+ prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0);
diff --git ipc/chromium/src/base/ref_counted.h ipc/chromium/src/base/ref_counted.h
index 013bd66..18e2794 100644
--- ipc/chromium/src/base/ref_counted.h
Added: branches/experimental/www/firefox/files/patch-gfx-skia-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-gfx-skia-Makefile.in Thu Aug 9 06:41:01 2012 (r917)
@@ -0,0 +1,11 @@
+--- gfx/skia/Makefile.in~
++++ gfx/skia/Makefile.in
+@@ -339,7 +339,7 @@ CPPSRCS += \
+ SkMMapStream.cpp \
+ SkOSFile.cpp \
+ $(NULL)
+-ifeq (Linux,$(OS_TARGET))
++ifneq (,$(MOZ_X11))
+ CPPSRCS += \
+ SkFontHost_linux.cpp \
+ SkFontHost_tables.cpp \
Added: branches/experimental/www/firefox/files/patch-js-src-gc-Memory.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-js-src-gc-Memory.cpp Thu Aug 9 06:41:01 2012 (r917)
@@ -0,0 +1,13 @@
+--- js/src/gc/Memory.cpp~
++++ js/src/gc/Memory.cpp
+@@ -292,9 +292,9 @@ GetPageFaultCount()
+ #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
+
+ #include <sys/mman.h>
+-#include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <unistd.h>
+
+ void
+ InitMemorySubsystem()
Modified: branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in Thu Aug 9 06:41:01 2012 (r917)
@@ -1,10 +1,11 @@
--- layout/generic/Makefile.in~
+++ layout/generic/Makefile.in
-@@ -154,9 +154,10 @@ LOCAL_INCLUDES += \
+@@ -123,10 +123,11 @@ LOCAL_INCLUDES += \
-I$(srcdir)/../../dom/base \
-I$(srcdir)/../../dom/plugins/base \
-I$(srcdir)/../svg/base/src \
- $(MOZ_CAIRO_CFLAGS) \
+ $(MOZ_PIXMAN_CFLAGS) \
$(NULL)
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
Added: branches/experimental/www/firefox/files/patch-tools-profiler-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-tools-profiler-Makefile.in Thu Aug 9 06:41:01 2012 (r917)
@@ -0,0 +1,11 @@
+--- tools/profiler/Makefile.in~
++++ tools/profiler/Makefile.in
+@@ -78,7 +78,7 @@ EXTRA_JS_MODULES = \
+ Profiler.jsm \
+ $(NULL)
+
+-ifneq (,$(filter Android Linux,$(OS_TARGET)))
++ifneq (,$(filter Android Linux FreeBSD,$(OS_TARGET)))
+ CPPSRCS += \
+ shared-libraries-linux.cc \
+ platform-linux.cc \
Added: branches/experimental/www/firefox/files/patch-tools-profiler-platform-linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-tools-profiler-platform-linux.cc Thu Aug 9 06:41:01 2012 (r917)
@@ -0,0 +1,43 @@
+--- tools/profiler/platform-linux.cc~
++++ tools/profiler/platform-linux.cc
+@@ -133,7 +133,7 @@ static void ProfilerSignalHandler(int si
+ sActiveSampler->Tick(sample);
+ }
+
+-#ifndef XP_MACOSX
++#if !defined(XP_MACOSX) && !defined(__FreeBSD__)
+ void tgkill(pid_t tgid, pid_t tid, int signalno) {
+ syscall(SYS_tgkill, tgid, tid, signalno);
+ }
+@@ -145,11 +145,11 @@ class Sampler::PlatformData : public Mal
+ : sampler_(sampler),
+ signal_handler_installed_(false),
+ vm_tgid_(getpid()),
+-#ifndef XP_MACOSX
++#if !defined(XP_MACOSX) && !defined(__FreeBSD__)
+ vm_tid_(gettid()),
+ #endif
+ signal_sender_launched_(false)
+-#ifdef XP_MACOSX
++#if defined(XP_MACOSX) || defined(__FreeBSD__)
+ , signal_receiver_(pthread_self())
+ #endif
+ {
+@@ -140,7 +140,7 @@ class Sampler::PlatformData : public Mal
+ sampler_->HandleSaveRequest();
+
+ if (!sampler_->IsPaused()) {
+-#ifdef XP_MACOSX
++#ifdef XP_MACOSX || defined(__FreeBSD__)
+ pthread_kill(signal_receiver_, SIGPROF);
+ #else
+ // Glibc doesn't provide a wrapper for tgkill(2).
+@@ -192,7 +192,7 @@ class Sampler::PlatformData : public Mal
+ pid_t vm_tid_;
+ bool signal_sender_launched_;
+ pthread_t signal_sender_thread_;
+-#ifdef XP_MACOSX
++#if defined(XP_MACOSX) || defined(__FreeBSD__)
+ pthread_t signal_receiver_;
+ #endif
+ };
Modified: branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:41:01 2012 (r917)
@@ -1,6 +1,6 @@
--- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
+++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,11 @@
+@@ -57,6 +57,11 @@
nsresult
nsThreadManager::Init()
{
@@ -9,6 +9,6 @@
+ if (!gTLSThreadID)
+ gTLSThreadID = mozilla::threads::Generic;
+#endif
- if (!mThreadsByPRThread.Init())
- return NS_ERROR_OUT_OF_MEMORY;
+ mThreadsByPRThread.Init();
+ if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE)
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/seamonkey/Makefile Thu Aug 9 06:41:01 2012 (r917)
@@ -6,7 +6,7 @@
#
PORTNAME= seamonkey
-DISTVERSION= 2.11
+DISTVERSION= 2.12b3
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
@@ -18,9 +18,11 @@
BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
nss>=3.13.2:${PORTSDIR}/security/nss \
sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \
+ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
unzip:${PORTSDIR}/archivers/unzip
USE_AUTOTOOLS= autoconf213:env
+USE_PYTHON_BUILD=yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GECKO= gecko
@@ -55,7 +57,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC= ${WRKDIR}/comm-beta
MOZSRC:= ${WRKSRC}/mozilla
.if ${ARCH} == amd64
Modified: branches/experimental/www/seamonkey/distinfo
==============================================================================
--- branches/experimental/www/seamonkey/distinfo Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/seamonkey/distinfo Thu Aug 9 06:41:01 2012 (r917)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.11.source.tar.bz2) = 6771ee2abb068825748e6ebcaae4e789e4c64db9b220afaf42dc13934b52c4d9
-SIZE (seamonkey-2.11.source.tar.bz2) = 105846143
+SHA256 (seamonkey-2.12b3.source.tar.bz2) = 58365256f059edafd555bf74f05adc020062eb5dd037f7892f0d73951bf244f6
+SIZE (seamonkey-2.12b3.source.tar.bz2) = 106662657
Modified: branches/experimental/www/seamonkey/files/patch-alsapulse
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-alsapulse Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/seamonkey/files/patch-alsapulse Thu Aug 9 06:41:01 2012 (r917)
@@ -1,46 +1,46 @@
---- mozilla/config/autoconf.mk.in~
+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
-@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF
+@@ -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@
---- mozilla/configure.in~
+ GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
+diff --git mozilla/configure.in mozilla/configure.in
+index 5980b76..11f5f77 100644
+--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5758,17 +5775,47 @@ dnl ====================================
+@@ -5600,13 +5600,45 @@ dnl ========================================================
dnl = Check alsa availability on Linux if using sydneyaudio
dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(alsa,
-+[ --enable-alsa Enable Alsa support],
++[ --enable-alsa Enable Alsa support (default on Linux)],
+MOZ_ALSA=1,
+MOZ_ALSA= MOZ_ALSA_FORCE=$enableval)
+
dnl If using sydneyaudio with Linux, ensure that the alsa library is available
--if test -n "$MOZ_SYDNEYAUDIO"; then
-+if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then
- case "$target_os" in
- linux*)
-+ MOZ_ALSA=1
-+ ;;
-+ esac
+-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then
++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then
++ MOZ_ALSA=1
+fi
+
+if test -n "$MOZ_ALSA"; then
- PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
++ AC_DEFINE(MOZ_CUBEB)
+ PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
[echo "$MOZ_ALSA_PKG_ERRORS"
AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])])
-- ;;
-- esac
fi
+AC_SUBST(MOZ_ALSA)
@@ -55,6 +55,7 @@
+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])])
@@ -65,9 +66,58 @@
+AC_SUBST(MOZ_PULSEAUDIO)
+
dnl ========================================================
- dnl Permissions System
+ dnl = Enable GStreamer
dnl ========================================================
---- mozilla/media/libsydneyaudio/src/Makefile.in~
+diff --git mozilla/media/libcubeb/src/Makefile.in mozilla/media/libcubeb/src/Makefile.in
+index 5ab4dd8..c8df26f 100644
+--- mozilla/media/libcubeb/src/Makefile.in
++++ mozilla/media/libcubeb/src/Makefile.in
+@@ -24,10 +24,6 @@ endif
+
+ ifeq ($(OS_TARGET),Android)
+ # No Android implementation of libcubeb yet.
+-else ifeq ($(OS_TARGET),Linux)
+-CSRCS = \
+- cubeb_alsa.c \
+- $(NULL)
+ endif
+
+ ifeq ($(OS_TARGET),Darwin)
+@@ -42,4 +38,16 @@ CSRCS = \
+ $(NULL)
+ endif
+
++ifdef MOZ_ALSA
++CSRCS = \
++ cubeb_alsa.c \
++ $(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,7 +6,10 @@
+ */
+ #undef NDEBUG
+ #define _BSD_SOURCE
++#if !defined(__DragonFly__) && !defined(__FreeBSD__) \
++ && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #define _POSIX_SOURCE
++#endif
+ #include <pthread.h>
+ #include <sys/time.h>
+ #include <assert.h>
+diff --git mozilla/media/libsydneyaudio/src/Makefile.in mozilla/media/libsydneyaudio/src/Makefile.in
+index 8dda8ce..b19641d 100644
+--- mozilla/media/libsydneyaudio/src/Makefile.in
+++ mozilla/media/libsydneyaudio/src/Makefile.in
@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android)
CSRCS = \
@@ -99,20 +149,23 @@
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += winmm.lib
endif
---- mozilla/toolkit/library/Makefile.in~
+diff --git mozilla/toolkit/library/Makefile.in mozilla/toolkit/library/Makefile.in
+index 43384e9..e46a6e3 100644
+--- mozilla/toolkit/library/Makefile.in
+++ mozilla/toolkit/library/Makefile.in
-@@ -375,10 +375,12 @@ endif
+@@ -379,10 +379,13 @@ endif
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
-ifdef MOZ_SYDNEYAUDIO
-ifeq ($(OS_ARCH),Linux)
++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO))
+ifdef MOZ_ALSA
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
endif
-+
+ifdef MOZ_PULSEAUDIO
+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
++endif
endif
ifdef HAVE_CLOCK_MONOTONIC
Modified: branches/experimental/www/seamonkey/files/patch-bug753046
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/seamonkey/files/patch-bug753046 Thu Aug 9 06:41:01 2012 (r917)
@@ -469,7 +469,7 @@
--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000
+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,9 +9,23 @@
+@@ -9,16 +9,30 @@
#if defined(OS_MACOSX)
#include <mach/mach.h>
@@ -477,9 +477,10 @@
+#include <lwp.h>
#elif defined(OS_LINUX)
#include <sys/syscall.h>
- #include <unistd.h>
-+#elif defined(OS_DRAGONFLY)
-+#include <unistd.h>
+-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ #include <sys/prctl.h>
+-#elif !defined(__NetBSD__)
+-#include <pthread_np.h>
+#elif defined(OS_FREEBSD)
+#include <sys/param.h>
+#if __FreeBSD_version > 802500
@@ -489,15 +490,24 @@
+extern "C" int thr_self(long *);
+_Pragma("GCC visibility pop")
+#endif
-+#include <pthread_np.h>
+ #endif
++
++#if !defined(OS_MACOSX)
+ #include <unistd.h>
#endif
++#if defined(OS_BSD) && !defined(OS_NETBSD)
++#include <pthread_np.h>
++#endif
++
#if defined(OS_MACOSX)
-@@ -38,9 +45,20 @@
+ namespace base {
+ void InitThreading();
+@@ -38,9 +45,20 @@ PlatformThreadId PlatformThread::CurrentId() {
// into the kernel.
#if defined(OS_MACOSX)
return mach_thread_self();
--#elif defined (__OpenBSD__)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#elif defined(OS_NETBSD)
+ return _lwp_self();
+#elif defined(OS_DRAGONFLY)
@@ -517,6 +527,18 @@
#elif defined(OS_LINUX)
return syscall(__NR_gettid);
#endif
+@@ -102,9 +102,9 @@ void PlatformThread::SetName(const char* name) {
+ // Note that glibc also has a 'pthread_setname_np' api, but it may not be
+ // available everywhere and it's only benefit over using prctl directly is
+ // that it can set the name of threads other than the current thread.
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(OS_BSD) && !defined(OS_NETBSD)
+ pthread_set_name_np(pthread_self(), name);
+-#elif defined(__NetBSD__)
++#elif defined(OS_NETBSD)
+ pthread_setname_np(pthread_self(), "%s", name);
+ #else
+ prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0);
diff --git mozilla/ipc/chromium/src/base/ref_counted.h mozilla/ipc/chromium/src/base/ref_counted.h
index 013bd66..18e2794 100644
--- mozilla/ipc/chromium/src/base/ref_counted.h
Added: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-gc-Memory.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-gc-Memory.cpp Thu Aug 9 06:41:01 2012 (r917)
@@ -0,0 +1,13 @@
+--- mozilla/js/src/gc/Memory.cpp~
++++ mozilla/js/src/gc/Memory.cpp
+@@ -292,9 +292,9 @@ GetPageFaultCount()
+ #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
+
+ #include <sys/mman.h>
+-#include <unistd.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <unistd.h>
+
+ void
+ InitMemorySubsystem()
Added: branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-Makefile.in Thu Aug 9 06:41:01 2012 (r917)
@@ -0,0 +1,11 @@
+--- mozilla/tools/profiler/Makefile.in~
++++ mozilla/tools/profiler/Makefile.in
+@@ -78,7 +78,7 @@ EXTRA_JS_MODULES = \
+ Profiler.jsm \
+ $(NULL)
+
+-ifneq (,$(filter Android Linux,$(OS_TARGET)))
++ifneq (,$(filter Android Linux FreeBSD,$(OS_TARGET)))
+ CPPSRCS += \
+ shared-libraries-linux.cc \
+ platform-linux.cc \
Added: branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-platform-linux.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-platform-linux.cc Thu Aug 9 06:41:01 2012 (r917)
@@ -0,0 +1,43 @@
+--- mozilla/tools/profiler/platform-linux.cc~
++++ mozilla/tools/profiler/platform-linux.cc
+@@ -133,7 +133,7 @@ static void ProfilerSignalHandler(int si
+ sActiveSampler->Tick(sample);
+ }
+
+-#ifndef XP_MACOSX
++#if !defined(XP_MACOSX) && !defined(__FreeBSD__)
+ void tgkill(pid_t tgid, pid_t tid, int signalno) {
+ syscall(SYS_tgkill, tgid, tid, signalno);
+ }
+@@ -145,11 +145,11 @@ class Sampler::PlatformData : public Mal
+ : sampler_(sampler),
+ signal_handler_installed_(false),
+ vm_tgid_(getpid()),
+-#ifndef XP_MACOSX
++#if !defined(XP_MACOSX) && !defined(__FreeBSD__)
+ vm_tid_(gettid()),
+ #endif
+ signal_sender_launched_(false)
+-#ifdef XP_MACOSX
++#if defined(XP_MACOSX) || defined(__FreeBSD__)
+ , signal_receiver_(pthread_self())
+ #endif
+ {
+@@ -140,7 +140,7 @@ class Sampler::PlatformData : public Mal
+ sampler_->HandleSaveRequest();
+
+ if (!sampler_->IsPaused()) {
+-#ifdef XP_MACOSX
++#ifdef XP_MACOSX || defined(__FreeBSD__)
+ pthread_kill(signal_receiver_, SIGPROF);
+ #else
+ // Glibc doesn't provide a wrapper for tgkill(2).
+@@ -192,7 +192,7 @@ class Sampler::PlatformData : public Mal
+ pid_t vm_tid_;
+ bool signal_sender_launched_;
+ pthread_t signal_sender_thread_;
+-#ifdef XP_MACOSX
++#if defined(XP_MACOSX) || defined(__FreeBSD__)
+ pthread_t signal_receiver_;
+ #endif
+ };
Modified: branches/experimental/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:40:45 2012 (r916)
+++ branches/experimental/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:41:01 2012 (r917)
@@ -1,6 +1,6 @@
--- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,11 @@
+@@ -57,6 +57,11 @@
nsresult
nsThreadManager::Init()
{
@@ -9,6 +9,6 @@
+ if (!gTLSThreadID)
+ gTLSThreadID = mozilla::threads::Generic;
+#endif
- if (!mThreadsByPRThread.Init())
- return NS_ERROR_OUT_OF_MEMORY;
+ mThreadsByPRThread.Init();
+ if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208090641.q796f1Nn096647>