From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 14 01:55:06 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id F1FA0353 for ; Mon, 14 Jan 2013 01:55:06 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 971EAB57 for ; Mon, 14 Jan 2013 01:55:06 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0E1sxIV059821 for ; Mon, 14 Jan 2013 01:54:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0E1ssfM058591 for freebsd-gecko@freebsd.org; Mon, 14 Jan 2013 01:54:54 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 14 Jan 2013 01:54:54 GMT Message-Id: <201301140154.r0E1ssfM058591@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1139 - in trunk: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 01:55:07 -0000 Author: jbeich Date: Mon Jan 14 01:54:54 2013 New Revision: 1139 Log: remove a patch upstreamed since gecko17 Deleted: trunk/mail/thunderbird-esr/files/patch-bug781457 trunk/mail/thunderbird/files/patch-bug781457 trunk/www/firefox-esr/files/patch-bug781457 trunk/www/firefox/files/patch-bug781457 trunk/www/seamonkey/files/patch-bug781457 Deleted: trunk/mail/thunderbird-esr/files/patch-bug781457 ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-bug781457 Mon Jan 14 01:54:54 2013 (r1138) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2010-09-12 19:34:04.012503905 +0300 -+++ mozilla/xpcom/base/nsStackWalk.cpp 2010-09-12 19:34:41.294462134 +0300 -@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb - - #elif defined(HAVE__UNWIND_BACKTRACE) - -+#define _GNU_SOURCE - // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 - #include - Deleted: trunk/mail/thunderbird/files/patch-bug781457 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug781457 Mon Jan 14 01:54:54 2013 (r1138) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2010-09-12 19:34:04.012503905 +0300 -+++ mozilla/xpcom/base/nsStackWalk.cpp 2010-09-12 19:34:41.294462134 +0300 -@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb - - #elif defined(HAVE__UNWIND_BACKTRACE) - -+#define _GNU_SOURCE - // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 - #include - Deleted: trunk/www/firefox-esr/files/patch-bug781457 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug781457 Mon Jan 14 01:54:54 2013 (r1138) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- xpcom/base/nsStackWalk.cpp.orig 2012-05-29 00:57:31.000000000 +0200 -+++ xpcom/base/nsStackWalk.cpp 2012-06-03 12:33:40.000000000 +0200 -@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb - - #elif defined(HAVE__UNWIND_BACKTRACE) - -+#define _GNU_SOURCE - // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 - #include - Deleted: trunk/www/firefox/files/patch-bug781457 ============================================================================== --- trunk/www/firefox/files/patch-bug781457 Mon Jan 14 01:54:54 2013 (r1138) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- xpcom/base/nsStackWalk.cpp.orig 2012-05-29 00:57:31.000000000 +0200 -+++ xpcom/base/nsStackWalk.cpp 2012-06-03 12:33:40.000000000 +0200 -@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb - - #elif defined(HAVE__UNWIND_BACKTRACE) - -+#define _GNU_SOURCE - // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 - #include - Deleted: trunk/www/seamonkey/files/patch-bug781457 ============================================================================== --- trunk/www/seamonkey/files/patch-bug781457 Mon Jan 14 01:54:54 2013 (r1138) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/xpcom/base/nsStackWalk.cpp~ -+++ mozilla/xpcom/base/nsStackWalk.cpp -@@ -1638,6 +1638,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb - - #elif defined(HAVE__UNWIND_BACKTRACE) - -+#define _GNU_SOURCE - // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 - #include - From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 14 01:55:08 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 63FF6354 for ; Mon, 14 Jan 2013 01:55:08 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id F072FB58 for ; Mon, 14 Jan 2013 01:55:07 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0E1t7s8078648 for ; Mon, 14 Jan 2013 01:55:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0E1t28j078350 for freebsd-gecko@freebsd.org; Mon, 14 Jan 2013 01:55:02 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 14 Jan 2013 01:55:02 GMT Message-Id: <201301140155.r0E1t28j078350@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1140 - trunk/www/firefox-nightly/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 01:55:08 -0000 Author: jbeich Date: Mon Jan 14 01:55:01 2013 New Revision: 1140 Log: unbreak Nightly build on i386 with libstdc++ Added: trunk/www/firefox-nightly/files/patch-bug824317 Added: trunk/www/firefox-nightly/files/patch-bug824317 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug824317 Mon Jan 14 01:55:01 2013 (r1140) @@ -0,0 +1,14 @@ +diff --git a/xpcom/string/public/nsAlgorithm.h b/xpcom/string/public/nsAlgorithm.h +index fa50194a..c5f5737 100644 +--- xpcom/string/public/nsAlgorithm.h ++++ xpcom/string/public/nsAlgorithm.h +@@ -42,7 +42,8 @@ NS_MAX( const T& a, const T& b ) + return a > b ? a : b; + } + +-#if defined(_MSC_VER) && (_MSC_VER < 1600) ++#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || \ ++ (defined(_GLIBCXX_USE_LONG_LONG) && (!_GLIBCXX_USE_C99 || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC)) + namespace std { + inline + long long From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 14 01:55:25 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B0DB7371 for ; Mon, 14 Jan 2013 01:55:25 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id C6AF3B5D for ; Mon, 14 Jan 2013 01:55:24 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0E1tNgQ091081 for ; Mon, 14 Jan 2013 01:55:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0E1tI6i079235 for freebsd-gecko@freebsd.org; Mon, 14 Jan 2013 01:55:18 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 14 Jan 2013 01:55:18 GMT Message-Id: <201301140155.r0E1tI6i079235@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1141 - in trunk: . mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files www/seamonkey www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 01:55:25 -0000 Author: jbeich Date: Mon Jan 14 01:55:17 2013 New Revision: 1141 Log: update (gcc42 build is broken) Added: trunk/mail/thunderbird/files/patch-bug817267 trunk/mail/thunderbird/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h trunk/www/firefox-nightly/files/patch-content-media-AudioStream.cpp - copied, changed from r1140, trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp trunk/www/firefox/files/patch-bug817267 trunk/www/firefox/files/patch-content-media-AudioStream.cpp - copied, changed from r1140, trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp trunk/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h trunk/www/seamonkey/files/patch-bug817267 trunk/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h Deleted: trunk/mail/thunderbird/files/patch-bug778078 trunk/mail/thunderbird/files/patch-bug788955 trunk/mail/thunderbird/files/patch-bug798354 trunk/mail/thunderbird/files/patch-bug800401 trunk/mail/thunderbird/files/patch-bug806139 trunk/mail/thunderbird/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp trunk/mail/thunderbird/files/patch-z-bug762445 trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp trunk/www/firefox/files/patch-bug778078 trunk/www/firefox/files/patch-bug788955 trunk/www/firefox/files/patch-bug798354 trunk/www/firefox/files/patch-bug800401 trunk/www/firefox/files/patch-bug806139 trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp trunk/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp trunk/www/firefox/files/patch-z-bug762445 trunk/www/seamonkey/files/patch-bug778078 trunk/www/seamonkey/files/patch-bug788955 trunk/www/seamonkey/files/patch-bug798354 trunk/www/seamonkey/files/patch-bug800401 trunk/www/seamonkey/files/patch-bug806139 trunk/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp trunk/www/seamonkey/files/patch-z-bug762445 Modified: trunk/Gecko_ChangeLog trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/distinfo trunk/mail/thunderbird/files/patch-bug685258 trunk/mail/thunderbird/files/patch-bug791305 trunk/mail/thunderbird/files/patch-bug807492 trunk/mail/thunderbird/files/patch-bug815025 trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc 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/patch-bug685258 trunk/www/firefox/files/patch-bug807492 trunk/www/firefox/files/patch-bug815025 trunk/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo trunk/www/seamonkey/files/patch-bug685258 trunk/www/seamonkey/files/patch-bug791305 trunk/www/seamonkey/files/patch-bug807492 trunk/www/seamonkey/files/patch-bug815025 trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/Gecko_ChangeLog Mon Jan 14 01:55:17 2013 (r1141) @@ -1,3 +1 @@ -18.0: -- remove QT4 option to avoid confusion -- add WEBRTC option, untested with cameras +19.0: Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/mail/thunderbird/Makefile Mon Jan 14 01:55:17 2013 (r1141) @@ -2,17 +2,21 @@ # $FreeBSD: head/mail/thunderbird/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= thunderbird -DISTVERSION= 18.0b1 +PORTVERSION= 19.0.b1 +DISTVERSION= 2.16b1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} -EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source +DISTFILES= seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} +EXTRACT_ONLY= seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} +#MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source +#DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +#EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.9.3:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \ nss>=3.14:${PORTSDIR}/security/nss \ sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ @@ -20,6 +24,7 @@ unzip:${PORTSDIR}/archivers/unzip EM_VERSION= 1.5.0 +L_VERSION= 2.1b1 USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 @@ -93,7 +98,7 @@ MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi +XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.freebsd${OSREL}-${ARCH:S/amd64/x86_64/}.xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@thunderbird.mozilla.org .else Modified: trunk/mail/thunderbird/distinfo ============================================================================== --- trunk/mail/thunderbird/distinfo Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/mail/thunderbird/distinfo Mon Jan 14 01:55:17 2013 (r1141) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-18.0b1.source.tar.bz2) = 60a31745fc0ee4fc5597de6663a757f55c0bd61494f67607e3b914c73e236c72 -SIZE (thunderbird-18.0b1.source.tar.bz2) = 119356332 +SHA256 (seamonkey-2.16b1.source.tar.bz2) = 4feabd38674595c839e689142106bb1428dcdc1d5575e02ad5375039e1d047e7 +SIZE (seamonkey-2.16b1.source.tar.bz2) = 122349139 SHA256 (enigmail-1.5.0.tar.gz) = 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71 SIZE (enigmail-1.5.0.tar.gz) = 1216071 Modified: trunk/mail/thunderbird/files/patch-bug685258 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug685258 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/mail/thunderbird/files/patch-bug685258 Mon Jan 14 01:55:17 2013 (r1141) @@ -3,9 +3,9 @@ # Parent a2291c212856ad27622416e83c8311b6a33b52f1 Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf -diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp ---- mozilla/content/media/nsAudioStream.cpp -+++ mozilla/content/media/nsAudioStream.cpp +diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp +--- mozilla/content/media/AudioStream.cpp ++++ mozilla/content/media/AudioStream.cpp @@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo mFormat = aFormat; Deleted: trunk/mail/thunderbird/files/patch-bug778078 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug778078 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/toolkit/xre/nsAppRunner.cpp~ -+++ mozilla/toolkit/xre/nsAppRunner.cpp -@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[] - ScopedLogging log; - - #if defined(MOZ_WIDGET_GTK) --#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) - // Disable the slice allocator, since jemalloc already uses similar layout - // algorithms, and using a sub-allocator tends to increase fragmentation. - // This must be done before g_thread_init() is called. Deleted: trunk/mail/thunderbird/files/patch-bug788955 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug788955 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,299 +0,0 @@ -diff --git Makefile.in Makefile.in -index e341462..f75bd55 100644 ---- mozilla/Makefile.in -+++ mozilla/Makefile.in -@@ -48,8 +48,10 @@ endif - ifdef MOZ_MEMORY - tier_base_dirs += memory/mozjemalloc - ifdef MOZ_JEMALLOC -+ifndef MOZ_NATIVE_JEMALLOC - tier_base_dirs += memory/jemalloc - endif -+endif - tier_base_dirs += memory/build - endif - ifndef MOZ_NATIVE_ZLIB -diff --git allmakefiles.sh allmakefiles.sh -index 6a9be4b..d2e49e3 100755 ---- mozilla/allmakefiles.sh -+++ mozilla/allmakefiles.sh -@@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then - mozglue/Makefile - mozglue/build/Makefile - " -- if [ "$MOZ_JEMALLOC" ]; then -+ if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then - add_makefiles " - memory/jemalloc/Makefile - " -diff --git configure.in configure.in -index bb05782..2f32516 100644 ---- mozilla/configure.in -+++ mozilla/configure.in -@@ -3711,21 +3711,22 @@ fi - - dnl Check for the existence of various allocation headers/functions - -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" - MALLOC_H= --MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) --if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) -- if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break - fi --fi --if test "$MALLOC_H" != ""; then -- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) --fi -+done - - MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" - AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) - -+AC_CHECK_FUNCS(malloc_usable_size) -+ - dnl See if compiler supports some gcc-style attributes - - AC_CACHE_CHECK(for __attribute__((always_inline)), -@@ -6939,6 +6940,18 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -+ if test -n "$MOZ_JEMALLOC"; then -+ MOZ_NATIVE_JEMALLOC=1 -+ AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ break]) -+ if test -n "$MOZ_NATIVE_JEMALLOC"; then -+ MOZ_MEMORY=1 -+ AC_DEFINE(MOZ_MEMORY) -+ AC_DEFINE(MOZ_JEMALLOC) -+ AC_DEFINE(MOZ_NATIVE_JEMALLOC) -+ fi -+ fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then -@@ -7033,6 +7046,7 @@ else - fi # MOZ_MEMORY - AC_SUBST(MOZ_MEMORY) - AC_SUBST(MOZ_JEMALLOC) -+AC_SUBST(MOZ_NATIVE_JEMALLOC) - AC_SUBST(MOZ_GLUE_LDFLAGS) - AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) - AC_SUBST(WIN32_CRT_LIBS) -@@ -8820,10 +8834,22 @@ fi - - # Run jemalloc configure script - --if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then -+if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then - ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_" -- if test "$OS_ARCH" = "Linux"; then -- MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" -+ case "$OS_ARCH" in -+ Linux|DragonFly|FreeBSD|NetBSD|OpenBSD) -+ MANGLE="malloc calloc valloc free realloc posix_memalign" -+ case "$OS_ARCH" in -+ Linux) -+ MANGLE="$MANGLE memalign malloc_usable_size" -+ ;; -+ FreeBSD) -+ MANGLE="$MANGLE malloc_usable_size" -+ ;; -+ esac -+ ;; -+ esac -+ if test -n "$MANGLE"; then - MANGLED= - JEMALLOC_WRAPPER= - if test -n "$_WRAP_MALLOC"; then -diff --git memory/build/Makefile.in memory/build/Makefile.in -index dca0f48..af93ee0 100644 ---- mozilla/memory/build/Makefile.in -+++ mozilla/memory/build/Makefile.in -@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c - - ifdef MOZ_JEMALLOC - CSRCS += mozjemalloc_compat.c -+ifndef MOZ_NATIVE_JEMALLOC - SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) -+endif - else - SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) - endif -diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c -index 9d87629..03c8320 100644 ---- mozilla/memory/build/extraMallocFuncs.c -+++ mozilla/memory/build/extraMallocFuncs.c -@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src) - #endif - - #ifdef MOZ_JEMALLOC -+ -+#undef wrap -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif -+ - /* Override some jemalloc defaults */ --const char *je_malloc_conf = "narenas:1,lg_chunk:20"; -+MOZ_EXPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20"; - - #ifdef ANDROID - #include -diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 10a845a..94ad96e 100644 ---- mozilla/memory/build/mozjemalloc_compat.c -+++ mozilla/memory/build/mozjemalloc_compat.c -@@ -5,14 +5,21 @@ - #include "mozilla/Types.h" - #include "jemalloc_types.h" - --extern int je_mallctl(const char*, void*, size_t*, void*, size_t); -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif - --MOZ_EXPORT_API (void) -+extern MOZ_IMPORT_API(int) -+wrap(mallctl)(const char*, void*, size_t*, void*, size_t); -+ -+MOZ_EXPORT_API(void) - jemalloc_stats(jemalloc_stats_t *stats) - { - size_t size = sizeof(stats->mapped); -- je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0); -- je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0); -+ wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); -+ wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); - stats->committed = -1; - stats->dirty = -1; - } -diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c -index 37a843e..55e18c2 100644 ---- mozilla/memory/jemalloc/src/src/mutex.c -+++ mozilla/memory/jemalloc/src/src/mutex.c -@@ -64,7 +64,7 @@ pthread_create(pthread_t *__restrict thread, - /******************************************************************************/ - - #ifdef JEMALLOC_MUTEX_INIT_CB --int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, -+JEMALLOC_EXPORT int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, - void *(calloc_cb)(size_t, size_t)); - #endif - -diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp -index 5b61050b..5b3399a 100644 ---- mozilla/memory/mozalloc/mozalloc.cpp -+++ mozilla/memory/mozalloc/mozalloc.cpp -@@ -12,16 +12,13 @@ - #include - - #if defined(MALLOC_H) --# include MALLOC_H // for memalign, valloc where available -+# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size - #endif // if defined(MALLOC_H) - #include // for size_t - #include // for malloc, free - #if defined(XP_UNIX) - # include // for valloc on *BSD - #endif //if defined(XP_UNIX) --#if defined(__FreeBSD__) --# include // for malloc_usable_size --#endif // if defined(__FreeBSD__) - - #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) - # define MOZALLOC_EXPORT __declspec(dllexport) -@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr) - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) -- // Android bionic libc doesn't have malloc_usable_size. -+#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY) - return malloc_usable_size(ptr); - #elif defined(XP_WIN) - return _msize(ptr); -diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h -index f0e0878..2486e83 100644 ---- mozilla/memory/mozjemalloc/jemalloc.h -+++ mozilla/memory/mozjemalloc/jemalloc.h -@@ -37,22 +37,29 @@ - #endif - #include "jemalloc_types.h" - -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif - --#if defined(MOZ_MEMORY_LINUX) -+#if defined(MOZ_NATIVE_JEMALLOC) \ -+ || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) - __attribute__((weak)) - #endif - void jemalloc_stats(jemalloc_stats_t *stats); - - /* Computes the usable size in advance. */ - #if !defined(MOZ_MEMORY_DARWIN) --#if defined(MOZ_MEMORY_LINUX) -+#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) - __attribute__((weak)) - #endif - #if defined(MOZ_JEMALLOC) --int je_nallocm(size_t *rsize, size_t size, int flags); -+MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags); - #else - size_t je_malloc_good_size(size_t size); - #endif -@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) { - #if defined(MOZ_MEMORY_DARWIN) - return malloc_good_size(size); - #elif defined(MOZ_JEMALLOC) -- if (je_nallocm) { -+ if (wrap(nallocm)) { - size_t ret; - if (size == 0) - size = 1; -- if (!je_nallocm(&ret, size, 0)) -+ if (!wrap(nallocm)(&ret, size, 0)) - return ret; - } - return size; -@@ -113,4 +120,6 @@ void jemalloc_purge_freed_pages(); - } /* extern "C" */ - #endif - -+#undef wrap -+ - #endif /* _JEMALLOC_H_ */ -diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in -index c333647..15ba505 100644 ---- mozilla/mozglue/build/Makefile.in -+++ mozilla/mozglue/build/Makefile.in -@@ -23,7 +23,7 @@ FORCE_STATIC_LIB = 1 - endif - - # Keep jemalloc separated when mozglue is statically linked --ifeq (1_1,$(MOZ_MEMORY)_$(FORCE_SHARED_LIB)) -+ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB))) - SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build) - else - # Temporary, until bug 662814 lands Modified: trunk/mail/thunderbird/files/patch-bug791305 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug791305 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/mail/thunderbird/files/patch-bug791305 Mon Jan 14 01:55:17 2013 (r1141) @@ -17,6 +17,23 @@ diff --git configure.in configure.in index f0aeb5d..1c01010 100644 +--- configure.in ++++ configure.in +@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then + #include ], + [ #if JPEG_LIB_VERSION < $MOZJPEG + #error "Insufficient JPEG library version ($MOZJPEG required)." +- #endif +- #ifndef JCS_EXTENSIONS +- #error "libjpeg-turbo JCS_EXTENSIONS required" +- #endif +- ], ++ #endif ], + MOZ_NATIVE_JPEG=1, + AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) + fi +diff --git configure.in configure.in +index f0aeb5d..1c01010 100644 --- mozilla/configure.in +++ mozilla/configure.in @@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then Deleted: trunk/mail/thunderbird/files/patch-bug798354 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug798354 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc~ -+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc -@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) { - } - - //------------------------------------------------------------------------------ -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+sockaddr_un sizecheck; -+const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path); -+#else - const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path); -+#endif - - // Creates a Fifo with the specified name ready to listen on. - bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) { Deleted: trunk/mail/thunderbird/files/patch-bug800401 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug800401 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,91 +0,0 @@ -commit a564d64 -Author: Ehsan Akhgari -Date: Thu Oct 11 13:42:12 2012 -0400 - - Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup - - In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery. ---- - media/mtransport/third_party/nICEr/nicer.gyp | 2 -- - media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 -- - media/webrtc/signaling/signaling.gyp | 6 ------ - 3 files changed, 10 deletions(-) - -diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp -index 26ec0c5..0e1f8b4 100644 ---- mozilla/media/mtransport/third_party/nICEr/nicer.gyp -+++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp -@@ -132,7 +132,6 @@ - ## Mac - [ 'OS == "mac"', { - 'cflags_mozilla': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -@@ -183,7 +182,6 @@ - ## Linux - [ 'OS == "linux"', { - 'cflags': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp -index f9a5c19..3cc8e1c 100644 ---- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp -+++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp -@@ -150,7 +150,6 @@ - ## Mac - [ 'OS == "mac"', { - 'cflags_mozilla': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -@@ -200,7 +199,6 @@ - ## Linux - [ 'OS == "linux"', { - 'cflags': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp -index 1ec0ee2..175996f 100644 ---- mozilla/media/webrtc/signaling/signaling.gyp -+++ mozilla/media/webrtc/signaling/signaling.gyp -@@ -184,7 +184,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', - ], - }], - ['OS=="win"', { -@@ -212,8 +211,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', -- '-Wno-error=conversion' - ], - }], - ], -@@ -633,7 +630,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', - ], - }], - ['OS=="win"', { -@@ -752,8 +748,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', -- '-Wno-error=conversion' - ], - }], - ], Deleted: trunk/mail/thunderbird/files/patch-bug806139 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug806139 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,29 +0,0 @@ ---- mozilla/content/html/content/public/nsHTMLMediaElement.h~ -+++ mozilla/content/html/content/public/nsHTMLMediaElement.h -@@ -311,7 +311,7 @@ public: - static bool IsH264Enabled(); - static bool IsH264Type(const nsACString& aType); - static const char gH264Types[3][16]; -- static char const *const gH264Codecs[7]; -+ static char const *const gH264Codecs[9]; - #endif - - #ifdef MOZ_MEDIA_PLUGINS ---- mozilla/content/html/content/src/nsHTMLMediaElement.cpp~ -+++ mozilla/content/html/content/src/nsHTMLMediaElement.cpp -@@ -2135,12 +2135,14 @@ nsHTMLMediaElement::IsWebMType(const nsA - #endif - - #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) --char const *const nsHTMLMediaElement::gH264Codecs[7] = { -+char const *const nsHTMLMediaElement::gH264Codecs[9] = { - "avc1.42E01E", - "avc1.42001E", - "avc1.58A01E", - "avc1.4D401E", - "avc1.64001E", -+ "avc1.64001F", -+ "mp4v.20.3", - "mp4a.40.2", - nullptr - }; Modified: trunk/mail/thunderbird/files/patch-bug807492 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug807492 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/mail/thunderbird/files/patch-bug807492 Mon Jan 14 01:55:17 2013 (r1141) @@ -81,11 +81,11 @@ if test -n "$MOZ_WEBRTC"; then AC_MSG_RESULT("generating WebRTC Makefiles...") + dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries + dnl so that regeneration via dependencies works correctly WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi" GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}" - - $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \ diff --git js/src/config/system-headers js/src/config/system-headers index 9bd1efa..1095a01 100644 --- mozilla/js/src/config/system-headers @@ -591,10 +591,10 @@ index a7c47e1..4f191de 100644 --- mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c +++ mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b +@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData) { static const char fname[] = "cprGetMessage"; - + void *buffer = 0; cpr_msg_queue_t *msgq; cpr_msgq_node_t *node; @@ -609,12 +609,12 @@ int tz_dsttime; /* type of dst correction to apply */ } tz; +#endif - + /* Initialize ppUserData */ if (ppUserData) { *ppUserData = NULL; } - + msgq = (cpr_msg_queue_t *) msgQueue; if (msgq == NULL) { diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in @@ -1278,7 +1278,6 @@ +#include +#endif + - #include #include #include "ref_count.h" @@ -1286,6 +1285,7 @@ #include "thread_wrapper.h" #include "critical_section_wrapper.h" #include "video_capture_linux.h" + diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc index e3f7bb5..882cede 100644 --- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc Modified: trunk/mail/thunderbird/files/patch-bug815025 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug815025 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/mail/thunderbird/files/patch-bug815025 Mon Jan 14 01:55:17 2013 (r1141) @@ -1,8 +1,8 @@ --- mozilla/mfbt/SHA1.h~ +++ mozilla/mfbt/SHA1.h -@@ -27,6 +27,11 @@ - #include "mozilla/StandardInteger.h" - #include "mozilla/Types.h" +@@ -13,6 +13,11 @@ + + #include +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 +/* c++/36107: mark SHA1Sum constructor as weak manually */ @@ -10,18 +10,18 @@ +#endif + namespace mozilla { - class SHA1Sum { - union { -@@ -39,7 +43,12 @@ class SHA1Sum { - public: - static const unsigned int HashSize = 20; + /** +@@ -44,7 +49,12 @@ class SHA1Sum + bool mDone; + + public: +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API() SHA1Sum(); ++ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ ++ MOZ_IMPORT_API SHA1Sum(); +#else - MFBT_API() SHA1Sum(); + MFBT_API SHA1Sum(); +#endif - MFBT_API(void) update(const void* dataIn, uint32_t len); - MFBT_API(void) finish(uint8_t hashout[20]); - }; + + static const size_t HashSize = 20; + typedef uint8_t Hash[HashSize]; Added: trunk/mail/thunderbird/files/patch-bug817267 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug817267 Mon Jan 14 01:55:17 2013 (r1141) @@ -0,0 +1,36 @@ +commit faafeb1 +Author: Jan Beich +Date: Sat Dec 1 21:25:24 2012 -0500 + + Bug 817267 - dirfd() is a macro on some BSDs, fix build there. r=yoric +--- + dom/system/OSFileConstants.cpp | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp +index 75a41dc..63fc6b1 100644 +--- mozilla/dom/system/OSFileConstants.cpp ++++ mozilla/dom/system/OSFileConstants.cpp +@@ -41,6 +41,11 @@ + #include "OSFileConstants.h" + #include "nsIOSFileConstantsService.h" + ++#if defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#define __dd_fd dd_fd ++#endif ++ + /** + * This module defines the basic libc constants (error numbers, open modes, + * etc.) used by OS.File and possibly other OS-bound JavaScript libraries. +@@ -383,8 +388,8 @@ static dom::ConstantSpec gLibcProperties[] = + { "OSFILE_OFFSETOF_DIRENT_D_TYPE", INT_TO_JSVAL(offsetof (struct dirent, d_type)) }, + #endif // defined(DT_UNKNOWN) + +- // Under MacOS X, |dirfd| is a macro rather than a function, so we +- // need a little help to get it to work ++ // Under MacOS X and BSDs, |dirfd| is a macro rather than a ++ // function, so we need a little help to get it to work + #if defined(dirfd) + { "OSFILE_SIZEOF_DIR", INT_TO_JSVAL(sizeof (DIR)) }, + Modified: trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp Mon Jan 14 01:55:17 2013 (r1141) @@ -1,5 +1,5 @@ ---- mozilla/content/media/nsAudioStream.cpp~ -+++ mozilla/content/media/nsAudioStream.cpp +--- mozilla/content/media/AudioStream.cpp~ ++++ mozilla/content/media/AudioStream.cpp @@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure) gVolumeScale = NS_MAX(0, PR_strtod(utf8.get(), nullptr)); } Added: trunk/mail/thunderbird/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h Mon Jan 14 01:55:17 2013 (r1141) @@ -0,0 +1,18 @@ +diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h +index f42822e..1a5a699 100644 +--- mozilla/gfx/ots/include/opentype-sanitiser.h ++++ mozilla/gfx/ots/include/opentype-sanitiser.h +@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t; + #include + #endif + ++#ifdef __FreeBSD__ ++# include ++# if __FreeBSD_version < 800067 ++# include // for off_t ++# endif ++#endif ++ + #include // for std::min + #include + #include Modified: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Mon Jan 14 01:55:17 2013 (r1141) @@ -1,9 +1,9 @@ --- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~ +++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc -@@ -15,7 +15,7 @@ - #include "base/scoped_nsautorelease_pool.h" +@@ -16,7 +16,7 @@ #include "base/scoped_ptr.h" #include "base/time.h" + #include "nsDependentSubstring.h" -#include "third_party/libevent/event.h" +#include "event.h" Deleted: trunk/mail/thunderbird/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/xpcom/base/AvailableMemoryTracker.cpp~ -+++ mozilla/xpcom/base/AvailableMemoryTracker.cpp -@@ -499,6 +499,6 @@ nsJemallocFreeDirtyPagesRunnable::Run() - MOZ_ASSERT(NS_IsMainThread()); - - #if defined(MOZ_JEMALLOC) -- mallctl("arenas.purge", nullptr, 0, nullptr, 0); -+// mallctl("arenas.purge", nullptr, 0, nullptr, 0); - #elif defined(MOZ_MEMORY) - jemalloc_free_dirty_pages(); Deleted: trunk/mail/thunderbird/files/patch-z-bug762445 ============================================================================== --- trunk/mail/thunderbird/files/patch-z-bug762445 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,70 +0,0 @@ -commit b44dc8e -Author: Jan Beich -Date: Fri Oct 12 18:49:59 2012 +0000 - - Bug 762445 - Add jemalloc3 glue for heap-committed, heap-dirty in about:memory. ---- - memory/build/mozjemalloc_compat.c | 34 ++++++++++++++++++++++++++++------ - 1 file changed, 28 insertions(+), 6 deletions(-) - -diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 94ad96e..7adfef5 100644 ---- mozilla/memory/build/mozjemalloc_compat.c -+++ mozilla/memory/build/mozjemalloc_compat.c -@@ -11,15 +11,50 @@ - #define wrap(a) je_ ## a - #endif - --extern MOZ_IMPORT_API(int) -+/* -+ * CTL_* macros are from memory/jemalloc/src/src/stats.c with changes: -+ * - drop `t' argument to avoid redundancy in calculating type size -+ * - require `i' argument for arena number explicitly -+ */ -+ -+#define CTL_GET(n, v) do { \ -+ size_t sz = sizeof(v); \ -+ wrap(mallctl)(n, &v, &sz, NULL, 0); \ -+} while (0) -+ -+#define CTL_I_GET(n, v, i) do { \ -+ size_t mib[6]; \ -+ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ -+ size_t sz = sizeof(v); \ -+ wrap(mallctlnametomib)(n, mib, &miblen); \ -+ mib[2] = i; \ -+ wrap(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ -+} while (0) -+ -+MOZ_IMPORT_API(int) - wrap(mallctl)(const char*, void*, size_t*, void*, size_t); -+MOZ_IMPORT_API(int) -+wrap(mallctlnametomib)(const char *name, size_t *mibp, size_t *miblenp); -+MOZ_IMPORT_API(int) -+wrap(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp, void *newp, size_t newlen); - - MOZ_EXPORT_API(void) - jemalloc_stats(jemalloc_stats_t *stats) - { -- size_t size = sizeof(stats->mapped); -- wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); -- wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); -- stats->committed = -1; -- stats->dirty = -1; -+ unsigned narenas; -+ size_t active, allocated, mapped, page, pdirty; -+ -+ CTL_GET("arenas.narenas", narenas); -+ CTL_GET("arenas.page", page); -+ CTL_GET("stats.active", active); -+ CTL_GET("stats.allocated", allocated); -+ CTL_GET("stats.mapped", mapped); -+ -+ /* get the summation for all arenas, i == narenas */ -+ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas); -+ -+ stats->allocated = allocated; -+ stats->mapped = mapped; -+ stats->dirty = pdirty * page; -+ stats->committed = active + stats->dirty; - } Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/firefox-nightly/Makefile Mon Jan 14 01:55:17 2013 (r1141) @@ -21,7 +21,7 @@ # nss>=3.14.2:${PORTSDIR}/security/nss \ USE_AUTOTOOLS= autoconf213:env -USE_PYTHON_BUILD=-2.7 +USE_PYTHON_BUILD=2.7 OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/firefox-nightly/Makefile.hgrev Mon Jan 14 01:55:17 2013 (r1141) @@ -1 +1 @@ -HGREV= 118260:f60b87eed1ac +HGREV= 118722:43d65f5d22b2 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/firefox-nightly/distinfo Mon Jan 14 01:55:17 2013 (r1141) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/f60b87eed1ac.tar.bz2) = 792c4e74fe8637156a0ba140b8241f7f6a5ae0a7195584acfa5a129b1e8b33b0 -SIZE (firefox-nightly/f60b87eed1ac.tar.bz2) = 98289798 +SHA256 (firefox-nightly/43d65f5d22b2.tar.bz2) = 0e4f6c8765a182814e2b349e8ce6c202e8bc2719983ff4b59814d31aef0cc0b3 +SIZE (firefox-nightly/43d65f5d22b2.tar.bz2) = 98245517 Copied and modified: trunk/www/firefox-nightly/files/patch-content-media-AudioStream.cpp (from r1140, trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp) ============================================================================== Deleted: trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp ============================================================================== --- trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- content/media/AudioStream.cpp~ -+++ content/media/AudioStream.cpp -@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure) - gVolumeScale = NS_MAX(0, PR_strtod(utf8.get(), nullptr)); - } - } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { --#ifdef MOZ_WIDGET_GONK -+#if defined(MOZ_WIDGET_GONK) || defined(__FreeBSD__) && __FreeBSD_version < 800097 - bool value = Preferences::GetBool(aPref, false); - #else - bool value = Preferences::GetBool(aPref, true); Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/firefox/Makefile Mon Jan 14 01:55:17 2013 (r1141) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 18.0 +DISTVERSION= 19.0b1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -12,7 +12,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -BUILD_DEPENDS= nspr>=4.9.3:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \ nss>=3.14.1:${PORTSDIR}/security/nss \ sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ @@ -54,7 +54,7 @@ .include -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 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/firefox/distinfo Mon Jan 14 01:55:17 2013 (r1141) @@ -1,2 +1,2 @@ -SHA256 (firefox-18.0.source.tar.bz2) = 53f06ff49882060e811b06ceb5d59e5a8851bda23e4cc82426010de967565014 -SIZE (firefox-18.0.source.tar.bz2) = 96948716 +SHA256 (firefox-19.0b1.source.tar.bz2) = f46c5641c8fc06fab7a2f6ce977f9ee3c7c783fb23e01a6fc3a9299aa91e8f40 +SIZE (firefox-19.0b1.source.tar.bz2) = 99068309 Modified: trunk/www/firefox/files/patch-bug685258 ============================================================================== --- trunk/www/firefox/files/patch-bug685258 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/firefox/files/patch-bug685258 Mon Jan 14 01:55:17 2013 (r1141) @@ -3,9 +3,9 @@ # Parent a2291c212856ad27622416e83c8311b6a33b52f1 Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf -diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp ---- content/media/nsAudioStream.cpp -+++ content/media/nsAudioStream.cpp +diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp +--- content/media/AudioStream.cpp ++++ content/media/AudioStream.cpp @@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo mFormat = aFormat; Deleted: trunk/www/firefox/files/patch-bug778078 ============================================================================== --- trunk/www/firefox/files/patch-bug778078 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- toolkit/xre/nsAppRunner.cpp~ -+++ toolkit/xre/nsAppRunner.cpp -@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[] - ScopedLogging log; - - #if defined(MOZ_WIDGET_GTK) --#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) - // Disable the slice allocator, since jemalloc already uses similar layout - // algorithms, and using a sub-allocator tends to increase fragmentation. - // This must be done before g_thread_init() is called. Deleted: trunk/www/firefox/files/patch-bug788955 ============================================================================== --- trunk/www/firefox/files/patch-bug788955 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,299 +0,0 @@ -diff --git Makefile.in Makefile.in -index e341462..f75bd55 100644 ---- Makefile.in -+++ Makefile.in -@@ -48,8 +48,10 @@ endif - ifdef MOZ_MEMORY - tier_base_dirs += memory/mozjemalloc - ifdef MOZ_JEMALLOC -+ifndef MOZ_NATIVE_JEMALLOC - tier_base_dirs += memory/jemalloc - endif -+endif - tier_base_dirs += memory/build - endif - ifndef MOZ_NATIVE_ZLIB -diff --git allmakefiles.sh allmakefiles.sh -index 6a9be4b..d2e49e3 100755 ---- allmakefiles.sh -+++ allmakefiles.sh -@@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then - mozglue/Makefile - mozglue/build/Makefile - " -- if [ "$MOZ_JEMALLOC" ]; then -+ if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then - add_makefiles " - memory/jemalloc/Makefile - " -diff --git configure.in configure.in -index bb05782..2f32516 100644 ---- configure.in -+++ configure.in -@@ -3711,21 +3711,22 @@ fi - - dnl Check for the existence of various allocation headers/functions - -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" - MALLOC_H= --MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) --if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) -- if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break - fi --fi --if test "$MALLOC_H" != ""; then -- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) --fi -+done - - MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" - AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) - -+AC_CHECK_FUNCS(malloc_usable_size) -+ - dnl See if compiler supports some gcc-style attributes - - AC_CACHE_CHECK(for __attribute__((always_inline)), -@@ -6939,6 +6940,18 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -+ if test -n "$MOZ_JEMALLOC"; then -+ MOZ_NATIVE_JEMALLOC=1 -+ AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ break]) -+ if test -n "$MOZ_NATIVE_JEMALLOC"; then -+ MOZ_MEMORY=1 -+ AC_DEFINE(MOZ_MEMORY) -+ AC_DEFINE(MOZ_JEMALLOC) -+ AC_DEFINE(MOZ_NATIVE_JEMALLOC) -+ fi -+ fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then -@@ -7033,6 +7046,7 @@ else - fi # MOZ_MEMORY - AC_SUBST(MOZ_MEMORY) - AC_SUBST(MOZ_JEMALLOC) -+AC_SUBST(MOZ_NATIVE_JEMALLOC) - AC_SUBST(MOZ_GLUE_LDFLAGS) - AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) - AC_SUBST(WIN32_CRT_LIBS) -@@ -8820,10 +8834,22 @@ fi - - # Run jemalloc configure script - --if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then -+if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then - ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_" -- if test "$OS_ARCH" = "Linux"; then -- MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" -+ case "$OS_ARCH" in -+ Linux|DragonFly|FreeBSD|NetBSD|OpenBSD) -+ MANGLE="malloc calloc valloc free realloc posix_memalign" -+ case "$OS_ARCH" in -+ Linux) -+ MANGLE="$MANGLE memalign malloc_usable_size" -+ ;; -+ FreeBSD) -+ MANGLE="$MANGLE malloc_usable_size" -+ ;; -+ esac -+ ;; -+ esac -+ if test -n "$MANGLE"; then - MANGLED= - JEMALLOC_WRAPPER= - if test -n "$_WRAP_MALLOC"; then -diff --git memory/build/Makefile.in memory/build/Makefile.in -index dca0f48..af93ee0 100644 ---- memory/build/Makefile.in -+++ memory/build/Makefile.in -@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c - - ifdef MOZ_JEMALLOC - CSRCS += mozjemalloc_compat.c -+ifndef MOZ_NATIVE_JEMALLOC - SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) -+endif - else - SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) - endif -diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c -index 9d87629..03c8320 100644 ---- memory/build/extraMallocFuncs.c -+++ memory/build/extraMallocFuncs.c -@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src) - #endif - - #ifdef MOZ_JEMALLOC -+ -+#undef wrap -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif -+ - /* Override some jemalloc defaults */ --const char *je_malloc_conf = "narenas:1,lg_chunk:20"; -+MOZ_EXPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20"; - - #ifdef ANDROID - #include -diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 10a845a..94ad96e 100644 ---- memory/build/mozjemalloc_compat.c -+++ memory/build/mozjemalloc_compat.c -@@ -5,14 +5,21 @@ - #include "mozilla/Types.h" - #include "jemalloc_types.h" - --extern int je_mallctl(const char*, void*, size_t*, void*, size_t); -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif - --MOZ_EXPORT_API (void) -+extern MOZ_IMPORT_API(int) -+wrap(mallctl)(const char*, void*, size_t*, void*, size_t); -+ -+MOZ_EXPORT_API(void) - jemalloc_stats(jemalloc_stats_t *stats) - { - size_t size = sizeof(stats->mapped); -- je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0); -- je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0); -+ wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); -+ wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); - stats->committed = -1; - stats->dirty = -1; - } -diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c -index 37a843e..55e18c2 100644 ---- memory/jemalloc/src/src/mutex.c -+++ memory/jemalloc/src/src/mutex.c -@@ -64,7 +64,7 @@ pthread_create(pthread_t *__restrict thread, - /******************************************************************************/ - - #ifdef JEMALLOC_MUTEX_INIT_CB --int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, -+JEMALLOC_EXPORT int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, - void *(calloc_cb)(size_t, size_t)); - #endif - -diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp -index 5b61050b..5b3399a 100644 ---- memory/mozalloc/mozalloc.cpp -+++ memory/mozalloc/mozalloc.cpp -@@ -12,16 +12,13 @@ - #include - - #if defined(MALLOC_H) --# include MALLOC_H // for memalign, valloc where available -+# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size - #endif // if defined(MALLOC_H) - #include // for size_t - #include // for malloc, free - #if defined(XP_UNIX) - # include // for valloc on *BSD - #endif //if defined(XP_UNIX) --#if defined(__FreeBSD__) --# include // for malloc_usable_size --#endif // if defined(__FreeBSD__) - - #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) - # define MOZALLOC_EXPORT __declspec(dllexport) -@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr) - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) -- // Android bionic libc doesn't have malloc_usable_size. -+#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY) - return malloc_usable_size(ptr); - #elif defined(XP_WIN) - return _msize(ptr); -diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h -index f0e0878..2486e83 100644 ---- memory/mozjemalloc/jemalloc.h -+++ memory/mozjemalloc/jemalloc.h -@@ -37,22 +37,29 @@ - #endif - #include "jemalloc_types.h" - -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif - --#if defined(MOZ_MEMORY_LINUX) -+#if defined(MOZ_NATIVE_JEMALLOC) \ -+ || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) - __attribute__((weak)) - #endif - void jemalloc_stats(jemalloc_stats_t *stats); - - /* Computes the usable size in advance. */ - #if !defined(MOZ_MEMORY_DARWIN) --#if defined(MOZ_MEMORY_LINUX) -+#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) - __attribute__((weak)) - #endif - #if defined(MOZ_JEMALLOC) --int je_nallocm(size_t *rsize, size_t size, int flags); -+MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags); - #else - size_t je_malloc_good_size(size_t size); - #endif -@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) { - #if defined(MOZ_MEMORY_DARWIN) - return malloc_good_size(size); - #elif defined(MOZ_JEMALLOC) -- if (je_nallocm) { -+ if (wrap(nallocm)) { - size_t ret; - if (size == 0) - size = 1; -- if (!je_nallocm(&ret, size, 0)) -+ if (!wrap(nallocm)(&ret, size, 0)) - return ret; - } - return size; -@@ -113,4 +120,6 @@ void jemalloc_purge_freed_pages(); - } /* extern "C" */ - #endif - -+#undef wrap -+ - #endif /* _JEMALLOC_H_ */ -diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in -index c333647..15ba505 100644 ---- mozglue/build/Makefile.in -+++ mozglue/build/Makefile.in -@@ -23,7 +23,7 @@ FORCE_STATIC_LIB = 1 - endif - - # Keep jemalloc separated when mozglue is statically linked --ifeq (1_1,$(MOZ_MEMORY)_$(FORCE_SHARED_LIB)) -+ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB))) - SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build) - else - # Temporary, until bug 662814 lands Deleted: trunk/www/firefox/files/patch-bug798354 ============================================================================== --- trunk/www/firefox/files/patch-bug798354 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- ipc/chromium/src/chrome/common/ipc_channel_posix.cc~ -+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc -@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) { - } - - //------------------------------------------------------------------------------ -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+sockaddr_un sizecheck; -+const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path); -+#else - const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path); -+#endif - - // Creates a Fifo with the specified name ready to listen on. - bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) { Deleted: trunk/www/firefox/files/patch-bug800401 ============================================================================== --- trunk/www/firefox/files/patch-bug800401 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,91 +0,0 @@ -commit a564d64 -Author: Ehsan Akhgari -Date: Thu Oct 11 13:42:12 2012 -0400 - - Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup - - In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery. ---- - media/mtransport/third_party/nICEr/nicer.gyp | 2 -- - media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 -- - media/webrtc/signaling/signaling.gyp | 6 ------ - 3 files changed, 10 deletions(-) - -diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp -index 26ec0c5..0e1f8b4 100644 ---- media/mtransport/third_party/nICEr/nicer.gyp -+++ media/mtransport/third_party/nICEr/nicer.gyp -@@ -132,7 +132,6 @@ - ## Mac - [ 'OS == "mac"', { - 'cflags_mozilla': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -@@ -183,7 +182,6 @@ - ## Linux - [ 'OS == "linux"', { - 'cflags': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp -index f9a5c19..3cc8e1c 100644 ---- media/mtransport/third_party/nrappkit/nrappkit.gyp -+++ media/mtransport/third_party/nrappkit/nrappkit.gyp -@@ -150,7 +150,6 @@ - ## Mac - [ 'OS == "mac"', { - 'cflags_mozilla': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -@@ -200,7 +199,6 @@ - ## Linux - [ 'OS == "linux"', { - 'cflags': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp -index 1ec0ee2..175996f 100644 ---- media/webrtc/signaling/signaling.gyp -+++ media/webrtc/signaling/signaling.gyp -@@ -184,7 +184,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', - ], - }], - ['OS=="win"', { -@@ -212,8 +211,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', -- '-Wno-error=conversion' - ], - }], - ], -@@ -633,7 +630,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', - ], - }], - ['OS=="win"', { -@@ -752,8 +748,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', -- '-Wno-error=conversion' - ], - }], - ], Deleted: trunk/www/firefox/files/patch-bug806139 ============================================================================== --- trunk/www/firefox/files/patch-bug806139 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,29 +0,0 @@ ---- content/html/content/public/nsHTMLMediaElement.h~ -+++ content/html/content/public/nsHTMLMediaElement.h -@@ -311,7 +311,7 @@ public: - static bool IsH264Enabled(); - static bool IsH264Type(const nsACString& aType); - static const char gH264Types[3][16]; -- static char const *const gH264Codecs[7]; -+ static char const *const gH264Codecs[9]; - #endif - - #ifdef MOZ_MEDIA_PLUGINS ---- content/html/content/src/nsHTMLMediaElement.cpp~ -+++ content/html/content/src/nsHTMLMediaElement.cpp -@@ -2135,12 +2135,14 @@ nsHTMLMediaElement::IsWebMType(const nsA - #endif - - #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) --char const *const nsHTMLMediaElement::gH264Codecs[7] = { -+char const *const nsHTMLMediaElement::gH264Codecs[9] = { - "avc1.42E01E", - "avc1.42001E", - "avc1.58A01E", - "avc1.4D401E", - "avc1.64001E", -+ "avc1.64001F", -+ "mp4v.20.3", - "mp4a.40.2", - nullptr - }; Modified: trunk/www/firefox/files/patch-bug807492 ============================================================================== --- trunk/www/firefox/files/patch-bug807492 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/firefox/files/patch-bug807492 Mon Jan 14 01:55:17 2013 (r1141) @@ -81,11 +81,11 @@ if test -n "$MOZ_WEBRTC"; then AC_MSG_RESULT("generating WebRTC Makefiles...") + dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries + dnl so that regeneration via dependencies works correctly WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi" GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}" - - $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \ diff --git js/src/config/system-headers js/src/config/system-headers index 9bd1efa..1095a01 100644 --- js/src/config/system-headers @@ -591,10 +591,10 @@ index a7c47e1..4f191de 100644 --- media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c +++ media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b +@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData) { static const char fname[] = "cprGetMessage"; - + void *buffer = 0; cpr_msg_queue_t *msgq; cpr_msgq_node_t *node; @@ -609,12 +609,12 @@ int tz_dsttime; /* type of dst correction to apply */ } tz; +#endif - + /* Initialize ppUserData */ if (ppUserData) { *ppUserData = NULL; } - + msgq = (cpr_msg_queue_t *) msgQueue; if (msgq == NULL) { diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in @@ -1278,7 +1278,6 @@ +#include +#endif + - #include #include #include "ref_count.h" @@ -1286,6 +1285,7 @@ #include "thread_wrapper.h" #include "critical_section_wrapper.h" #include "video_capture_linux.h" + diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc index e3f7bb5..882cede 100644 --- media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc Modified: trunk/www/firefox/files/patch-bug815025 ============================================================================== --- trunk/www/firefox/files/patch-bug815025 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/firefox/files/patch-bug815025 Mon Jan 14 01:55:17 2013 (r1141) @@ -1,8 +1,8 @@ --- mfbt/SHA1.h~ +++ mfbt/SHA1.h -@@ -27,6 +27,11 @@ - #include "mozilla/StandardInteger.h" - #include "mozilla/Types.h" +@@ -13,6 +13,11 @@ + + #include +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 +/* c++/36107: mark SHA1Sum constructor as weak manually */ @@ -10,18 +10,18 @@ +#endif + namespace mozilla { - class SHA1Sum { - union { -@@ -39,7 +43,12 @@ class SHA1Sum { - public: - static const unsigned int HashSize = 20; + /** +@@ -44,7 +49,12 @@ class SHA1Sum + bool mDone; + + public: +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API() SHA1Sum(); ++ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ ++ MOZ_IMPORT_API SHA1Sum(); +#else - MFBT_API() SHA1Sum(); + MFBT_API SHA1Sum(); +#endif - MFBT_API(void) update(const void* dataIn, uint32_t len); - MFBT_API(void) finish(uint8_t hashout[20]); - }; + + static const size_t HashSize = 20; + typedef uint8_t Hash[HashSize]; Added: trunk/www/firefox/files/patch-bug817267 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug817267 Mon Jan 14 01:55:17 2013 (r1141) @@ -0,0 +1,36 @@ +commit faafeb1 +Author: Jan Beich +Date: Sat Dec 1 21:25:24 2012 -0500 + + Bug 817267 - dirfd() is a macro on some BSDs, fix build there. r=yoric +--- + dom/system/OSFileConstants.cpp | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp +index 75a41dc..63fc6b1 100644 +--- dom/system/OSFileConstants.cpp ++++ dom/system/OSFileConstants.cpp +@@ -41,6 +41,11 @@ + #include "OSFileConstants.h" + #include "nsIOSFileConstantsService.h" + ++#if defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#define __dd_fd dd_fd ++#endif ++ + /** + * This module defines the basic libc constants (error numbers, open modes, + * etc.) used by OS.File and possibly other OS-bound JavaScript libraries. +@@ -383,8 +388,8 @@ static dom::ConstantSpec gLibcProperties[] = + { "OSFILE_OFFSETOF_DIRENT_D_TYPE", INT_TO_JSVAL(offsetof (struct dirent, d_type)) }, + #endif // defined(DT_UNKNOWN) + +- // Under MacOS X, |dirfd| is a macro rather than a function, so we +- // need a little help to get it to work ++ // Under MacOS X and BSDs, |dirfd| is a macro rather than a ++ // function, so we need a little help to get it to work + #if defined(dirfd) + { "OSFILE_SIZEOF_DIR", INT_TO_JSVAL(sizeof (DIR)) }, + Copied and modified: trunk/www/firefox/files/patch-content-media-AudioStream.cpp (from r1140, trunk/www/firefox-nightly/files/patch-content-media-nsAudioStream.cpp) ============================================================================== Deleted: trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp ============================================================================== --- trunk/www/firefox/files/patch-content-media-nsAudioStream.cpp Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- content/media/nsAudioStream.cpp~ -+++ content/media/nsAudioStream.cpp -@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure) - gVolumeScale = NS_MAX(0, PR_strtod(utf8.get(), nullptr)); - } - } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { --#ifdef MOZ_WIDGET_GONK -+#if defined(MOZ_WIDGET_GONK) || defined(__FreeBSD__) && __FreeBSD_version < 800097 - bool value = Preferences::GetBool(aPref, false); - #else - bool value = Preferences::GetBool(aPref, true); Added: trunk/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h Mon Jan 14 01:55:17 2013 (r1141) @@ -0,0 +1,18 @@ +diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h +index f42822e..1a5a699 100644 +--- gfx/ots/include/opentype-sanitiser.h ++++ gfx/ots/include/opentype-sanitiser.h +@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t; + #include + #endif + ++#ifdef __FreeBSD__ ++# include ++# if __FreeBSD_version < 800067 ++# include // for off_t ++# endif ++#endif ++ + #include // for std::min + #include + #include Modified: trunk/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- trunk/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Mon Jan 14 01:55:17 2013 (r1141) @@ -1,9 +1,9 @@ --- ipc/chromium/src/base/message_pump_libevent.cc~ +++ ipc/chromium/src/base/message_pump_libevent.cc -@@ -15,7 +15,7 @@ - #include "base/scoped_nsautorelease_pool.h" +@@ -16,7 +16,7 @@ #include "base/scoped_ptr.h" #include "base/time.h" + #include "nsDependentSubstring.h" -#include "third_party/libevent/event.h" +#include "event.h" Deleted: trunk/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp ============================================================================== --- trunk/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- xpcom/base/AvailableMemoryTracker.cpp~ -+++ xpcom/base/AvailableMemoryTracker.cpp -@@ -499,6 +499,6 @@ nsJemallocFreeDirtyPagesRunnable::Run() - MOZ_ASSERT(NS_IsMainThread()); - - #if defined(MOZ_JEMALLOC) -- mallctl("arenas.purge", nullptr, 0, nullptr, 0); -+// mallctl("arenas.purge", nullptr, 0, nullptr, 0); - #elif defined(MOZ_MEMORY) - jemalloc_free_dirty_pages(); Deleted: trunk/www/firefox/files/patch-z-bug762445 ============================================================================== --- trunk/www/firefox/files/patch-z-bug762445 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,70 +0,0 @@ -commit b44dc8e -Author: Jan Beich -Date: Fri Oct 12 18:49:59 2012 +0000 - - Bug 762445 - Add jemalloc3 glue for heap-committed, heap-dirty in about:memory. ---- - memory/build/mozjemalloc_compat.c | 34 ++++++++++++++++++++++++++++------ - 1 file changed, 28 insertions(+), 6 deletions(-) - -diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 94ad96e..7adfef5 100644 ---- memory/build/mozjemalloc_compat.c -+++ memory/build/mozjemalloc_compat.c -@@ -11,15 +11,50 @@ - #define wrap(a) je_ ## a - #endif - --extern MOZ_IMPORT_API(int) -+/* -+ * CTL_* macros are from memory/jemalloc/src/src/stats.c with changes: -+ * - drop `t' argument to avoid redundancy in calculating type size -+ * - require `i' argument for arena number explicitly -+ */ -+ -+#define CTL_GET(n, v) do { \ -+ size_t sz = sizeof(v); \ -+ wrap(mallctl)(n, &v, &sz, NULL, 0); \ -+} while (0) -+ -+#define CTL_I_GET(n, v, i) do { \ -+ size_t mib[6]; \ -+ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ -+ size_t sz = sizeof(v); \ -+ wrap(mallctlnametomib)(n, mib, &miblen); \ -+ mib[2] = i; \ -+ wrap(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ -+} while (0) -+ -+MOZ_IMPORT_API(int) - wrap(mallctl)(const char*, void*, size_t*, void*, size_t); -+MOZ_IMPORT_API(int) -+wrap(mallctlnametomib)(const char *name, size_t *mibp, size_t *miblenp); -+MOZ_IMPORT_API(int) -+wrap(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp, void *newp, size_t newlen); - - MOZ_EXPORT_API(void) - jemalloc_stats(jemalloc_stats_t *stats) - { -- size_t size = sizeof(stats->mapped); -- wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); -- wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); -- stats->committed = -1; -- stats->dirty = -1; -+ unsigned narenas; -+ size_t active, allocated, mapped, page, pdirty; -+ -+ CTL_GET("arenas.narenas", narenas); -+ CTL_GET("arenas.page", page); -+ CTL_GET("stats.active", active); -+ CTL_GET("stats.allocated", allocated); -+ CTL_GET("stats.mapped", mapped); -+ -+ /* get the summation for all arenas, i == narenas */ -+ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas); -+ -+ stats->allocated = allocated; -+ stats->mapped = mapped; -+ stats->dirty = pdirty * page; -+ stats->committed = active + stats->dirty; - } Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/seamonkey/Makefile Mon Jan 14 01:55:17 2013 (r1141) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/seamonkey/Makefile 310240 2013-01-11 16:48:10Z flo $ PORTNAME= seamonkey -DISTVERSION= 2.15 +DISTVERSION= 2.16b1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -12,13 +12,14 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -BUILD_DEPENDS= nspr>=4.9.3:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \ nss>=3.14.1:${PORTSDIR}/security/nss \ sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip EM_VERSION= 1.5.0 +L_VERSION= 2.1b1 USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 @@ -65,7 +66,7 @@ .include -WRKSRC= ${WRKDIR}/comm-release +WRKSRC= ${WRKDIR}/comm-beta MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi @@ -116,7 +117,7 @@ MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi +XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.freebsd${OSREL}-${ARCH:S/amd64/x86_64/}.xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@seamonkey.mozilla.org .else Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/seamonkey/distinfo Mon Jan 14 01:55:17 2013 (r1141) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.15.source.tar.bz2) = 29ef839f30bb5998cc60adfe16b2e5e64abc14e48cbf10dff98b5b3a5260f5c7 -SIZE (seamonkey-2.15.source.tar.bz2) = 120128259 +SHA256 (seamonkey-2.16b1.source.tar.bz2) = 4feabd38674595c839e689142106bb1428dcdc1d5575e02ad5375039e1d047e7 +SIZE (seamonkey-2.16b1.source.tar.bz2) = 122349139 SHA256 (enigmail-1.5.0.tar.gz) = 51f55573448586718c8d7e664329d519b02c4b28af4910bcb550961ace9a9e71 SIZE (enigmail-1.5.0.tar.gz) = 1216071 Modified: trunk/www/seamonkey/files/patch-bug685258 ============================================================================== --- trunk/www/seamonkey/files/patch-bug685258 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/seamonkey/files/patch-bug685258 Mon Jan 14 01:55:17 2013 (r1141) @@ -3,9 +3,9 @@ # Parent a2291c212856ad27622416e83c8311b6a33b52f1 Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf -diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp ---- mozilla/content/media/nsAudioStream.cpp -+++ mozilla/content/media/nsAudioStream.cpp +diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp +--- mozilla/content/media/AudioStream.cpp ++++ mozilla/content/media/AudioStream.cpp @@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo mFormat = aFormat; Deleted: trunk/www/seamonkey/files/patch-bug778078 ============================================================================== --- trunk/www/seamonkey/files/patch-bug778078 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/toolkit/xre/nsAppRunner.cpp~ -+++ mozilla/toolkit/xre/nsAppRunner.cpp -@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[] - ScopedLogging log; - - #if defined(MOZ_WIDGET_GTK) --#ifdef MOZ_MEMORY -+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) - // Disable the slice allocator, since jemalloc already uses similar layout - // algorithms, and using a sub-allocator tends to increase fragmentation. - // This must be done before g_thread_init() is called. Deleted: trunk/www/seamonkey/files/patch-bug788955 ============================================================================== --- trunk/www/seamonkey/files/patch-bug788955 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,299 +0,0 @@ -diff --git Makefile.in Makefile.in -index e341462..f75bd55 100644 ---- mozilla/Makefile.in -+++ mozilla/Makefile.in -@@ -48,8 +48,10 @@ endif - ifdef MOZ_MEMORY - tier_base_dirs += memory/mozjemalloc - ifdef MOZ_JEMALLOC -+ifndef MOZ_NATIVE_JEMALLOC - tier_base_dirs += memory/jemalloc - endif -+endif - tier_base_dirs += memory/build - endif - ifndef MOZ_NATIVE_ZLIB -diff --git allmakefiles.sh allmakefiles.sh -index 6a9be4b..d2e49e3 100755 ---- mozilla/allmakefiles.sh -+++ mozilla/allmakefiles.sh -@@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then - mozglue/Makefile - mozglue/build/Makefile - " -- if [ "$MOZ_JEMALLOC" ]; then -+ if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then - add_makefiles " - memory/jemalloc/Makefile - " -diff --git configure.in configure.in -index bb05782..2f32516 100644 ---- mozilla/configure.in -+++ mozilla/configure.in -@@ -3711,21 +3711,22 @@ fi - - dnl Check for the existence of various allocation headers/functions - -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" - MALLOC_H= --MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) --if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) -- if test "$MALLOC_H" = ""; then -- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break - fi --fi --if test "$MALLOC_H" != ""; then -- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) --fi -+done - - MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" - AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) - -+AC_CHECK_FUNCS(malloc_usable_size) -+ - dnl See if compiler supports some gcc-style attributes - - AC_CACHE_CHECK(for __attribute__((always_inline)), -@@ -6939,6 +6940,18 @@ else - fi - - if test -z "$MOZ_MEMORY"; then -+ if test -n "$MOZ_JEMALLOC"; then -+ MOZ_NATIVE_JEMALLOC=1 -+ AC_CHECK_FUNCS(mallctl nallocm,, -+ [MOZ_NATIVE_JEMALLOC= -+ break]) -+ if test -n "$MOZ_NATIVE_JEMALLOC"; then -+ MOZ_MEMORY=1 -+ AC_DEFINE(MOZ_MEMORY) -+ AC_DEFINE(MOZ_JEMALLOC) -+ AC_DEFINE(MOZ_NATIVE_JEMALLOC) -+ fi -+ fi - case "${target}" in - *-mingw*) - if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then -@@ -7033,6 +7046,7 @@ else - fi # MOZ_MEMORY - AC_SUBST(MOZ_MEMORY) - AC_SUBST(MOZ_JEMALLOC) -+AC_SUBST(MOZ_NATIVE_JEMALLOC) - AC_SUBST(MOZ_GLUE_LDFLAGS) - AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) - AC_SUBST(WIN32_CRT_LIBS) -@@ -8820,10 +8834,22 @@ fi - - # Run jemalloc configure script - --if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then -+if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then - ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_" -- if test "$OS_ARCH" = "Linux"; then -- MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" -+ case "$OS_ARCH" in -+ Linux|DragonFly|FreeBSD|NetBSD|OpenBSD) -+ MANGLE="malloc calloc valloc free realloc posix_memalign" -+ case "$OS_ARCH" in -+ Linux) -+ MANGLE="$MANGLE memalign malloc_usable_size" -+ ;; -+ FreeBSD) -+ MANGLE="$MANGLE malloc_usable_size" -+ ;; -+ esac -+ ;; -+ esac -+ if test -n "$MANGLE"; then - MANGLED= - JEMALLOC_WRAPPER= - if test -n "$_WRAP_MALLOC"; then -diff --git memory/build/Makefile.in memory/build/Makefile.in -index dca0f48..af93ee0 100644 ---- mozilla/memory/build/Makefile.in -+++ mozilla/memory/build/Makefile.in -@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c - - ifdef MOZ_JEMALLOC - CSRCS += mozjemalloc_compat.c -+ifndef MOZ_NATIVE_JEMALLOC - SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) -+endif - else - SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) - endif -diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c -index 9d87629..03c8320 100644 ---- mozilla/memory/build/extraMallocFuncs.c -+++ mozilla/memory/build/extraMallocFuncs.c -@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src) - #endif - - #ifdef MOZ_JEMALLOC -+ -+#undef wrap -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif -+ - /* Override some jemalloc defaults */ --const char *je_malloc_conf = "narenas:1,lg_chunk:20"; -+MOZ_EXPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20"; - - #ifdef ANDROID - #include -diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 10a845a..94ad96e 100644 ---- mozilla/memory/build/mozjemalloc_compat.c -+++ mozilla/memory/build/mozjemalloc_compat.c -@@ -5,14 +5,21 @@ - #include "mozilla/Types.h" - #include "jemalloc_types.h" - --extern int je_mallctl(const char*, void*, size_t*, void*, size_t); -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif - --MOZ_EXPORT_API (void) -+extern MOZ_IMPORT_API(int) -+wrap(mallctl)(const char*, void*, size_t*, void*, size_t); -+ -+MOZ_EXPORT_API(void) - jemalloc_stats(jemalloc_stats_t *stats) - { - size_t size = sizeof(stats->mapped); -- je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0); -- je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0); -+ wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); -+ wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); - stats->committed = -1; - stats->dirty = -1; - } -diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c -index 37a843e..55e18c2 100644 ---- mozilla/memory/jemalloc/src/src/mutex.c -+++ mozilla/memory/jemalloc/src/src/mutex.c -@@ -64,7 +64,7 @@ pthread_create(pthread_t *__restrict thread, - /******************************************************************************/ - - #ifdef JEMALLOC_MUTEX_INIT_CB --int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, -+JEMALLOC_EXPORT int _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, - void *(calloc_cb)(size_t, size_t)); - #endif - -diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp -index 5b61050b..5b3399a 100644 ---- mozilla/memory/mozalloc/mozalloc.cpp -+++ mozilla/memory/mozalloc/mozalloc.cpp -@@ -12,16 +12,13 @@ - #include - - #if defined(MALLOC_H) --# include MALLOC_H // for memalign, valloc where available -+# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size - #endif // if defined(MALLOC_H) - #include // for size_t - #include // for malloc, free - #if defined(XP_UNIX) - # include // for valloc on *BSD - #endif //if defined(XP_UNIX) --#if defined(__FreeBSD__) --# include // for malloc_usable_size --#endif // if defined(__FreeBSD__) - - #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) - # define MOZALLOC_EXPORT __declspec(dllexport) -@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr) - - #if defined(XP_MACOSX) - return malloc_size(ptr); --#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) -- // Android bionic libc doesn't have malloc_usable_size. -+#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY) - return malloc_usable_size(ptr); - #elif defined(XP_WIN) - return _msize(ptr); -diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h -index f0e0878..2486e83 100644 ---- mozilla/memory/mozjemalloc/jemalloc.h -+++ mozilla/memory/mozjemalloc/jemalloc.h -@@ -37,22 +37,29 @@ - #endif - #include "jemalloc_types.h" - -+#if defined(MOZ_NATIVE_JEMALLOC) -+#define wrap(a) a -+#else -+#define wrap(a) je_ ## a -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif - --#if defined(MOZ_MEMORY_LINUX) -+#if defined(MOZ_NATIVE_JEMALLOC) \ -+ || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) - __attribute__((weak)) - #endif - void jemalloc_stats(jemalloc_stats_t *stats); - - /* Computes the usable size in advance. */ - #if !defined(MOZ_MEMORY_DARWIN) --#if defined(MOZ_MEMORY_LINUX) -+#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD) - __attribute__((weak)) - #endif - #if defined(MOZ_JEMALLOC) --int je_nallocm(size_t *rsize, size_t size, int flags); -+MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags); - #else - size_t je_malloc_good_size(size_t size); - #endif -@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) { - #if defined(MOZ_MEMORY_DARWIN) - return malloc_good_size(size); - #elif defined(MOZ_JEMALLOC) -- if (je_nallocm) { -+ if (wrap(nallocm)) { - size_t ret; - if (size == 0) - size = 1; -- if (!je_nallocm(&ret, size, 0)) -+ if (!wrap(nallocm)(&ret, size, 0)) - return ret; - } - return size; -@@ -113,4 +120,6 @@ void jemalloc_purge_freed_pages(); - } /* extern "C" */ - #endif - -+#undef wrap -+ - #endif /* _JEMALLOC_H_ */ -diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in -index c333647..15ba505 100644 ---- mozilla/mozglue/build/Makefile.in -+++ mozilla/mozglue/build/Makefile.in -@@ -23,7 +23,7 @@ FORCE_STATIC_LIB = 1 - endif - - # Keep jemalloc separated when mozglue is statically linked --ifeq (1_1,$(MOZ_MEMORY)_$(FORCE_SHARED_LIB)) -+ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB))) - SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build) - else - # Temporary, until bug 662814 lands Modified: trunk/www/seamonkey/files/patch-bug791305 ============================================================================== --- trunk/www/seamonkey/files/patch-bug791305 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/seamonkey/files/patch-bug791305 Mon Jan 14 01:55:17 2013 (r1141) @@ -17,6 +17,23 @@ diff --git configure.in configure.in index f0aeb5d..1c01010 100644 +--- configure.in ++++ configure.in +@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then + #include ], + [ #if JPEG_LIB_VERSION < $MOZJPEG + #error "Insufficient JPEG library version ($MOZJPEG required)." +- #endif +- #ifndef JCS_EXTENSIONS +- #error "libjpeg-turbo JCS_EXTENSIONS required" +- #endif +- ], ++ #endif ], + MOZ_NATIVE_JPEG=1, + AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) + fi +diff --git configure.in configure.in +index f0aeb5d..1c01010 100644 --- mozilla/configure.in +++ mozilla/configure.in @@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then Deleted: trunk/www/seamonkey/files/patch-bug798354 ============================================================================== --- trunk/www/seamonkey/files/patch-bug798354 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc~ -+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc -@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) { - } - - //------------------------------------------------------------------------------ -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+sockaddr_un sizecheck; -+const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path); -+#else - const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path); -+#endif - - // Creates a Fifo with the specified name ready to listen on. - bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) { Deleted: trunk/www/seamonkey/files/patch-bug800401 ============================================================================== --- trunk/www/seamonkey/files/patch-bug800401 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,91 +0,0 @@ -commit a564d64 -Author: Ehsan Akhgari -Date: Thu Oct 11 13:42:12 2012 -0400 - - Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup - - In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery. ---- - media/mtransport/third_party/nICEr/nicer.gyp | 2 -- - media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 -- - media/webrtc/signaling/signaling.gyp | 6 ------ - 3 files changed, 10 deletions(-) - -diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp -index 26ec0c5..0e1f8b4 100644 ---- mozilla/media/mtransport/third_party/nICEr/nicer.gyp -+++ mozilla/media/mtransport/third_party/nICEr/nicer.gyp -@@ -132,7 +132,6 @@ - ## Mac - [ 'OS == "mac"', { - 'cflags_mozilla': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -@@ -183,7 +182,6 @@ - ## Linux - [ 'OS == "linux"', { - 'cflags': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp -index f9a5c19..3cc8e1c 100644 ---- mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp -+++ mozilla/media/mtransport/third_party/nrappkit/nrappkit.gyp -@@ -150,7 +150,6 @@ - ## Mac - [ 'OS == "mac"', { - 'cflags_mozilla': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -@@ -200,7 +199,6 @@ - ## Linux - [ 'OS == "linux"', { - 'cflags': [ -- '-Werror', - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', -diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp -index 1ec0ee2..175996f 100644 ---- mozilla/media/webrtc/signaling/signaling.gyp -+++ mozilla/media/webrtc/signaling/signaling.gyp -@@ -184,7 +184,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', - ], - }], - ['OS=="win"', { -@@ -212,8 +211,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', -- '-Wno-error=conversion' - ], - }], - ], -@@ -633,7 +630,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', - ], - }], - ['OS=="win"', { -@@ -752,8 +748,6 @@ - ], - - 'cflags_mozilla': [ -- '-Werror', -- '-Wno-error=conversion' - ], - }], - ], Deleted: trunk/www/seamonkey/files/patch-bug806139 ============================================================================== --- trunk/www/seamonkey/files/patch-bug806139 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,29 +0,0 @@ ---- mozilla/content/html/content/public/nsHTMLMediaElement.h~ -+++ mozilla/content/html/content/public/nsHTMLMediaElement.h -@@ -311,7 +311,7 @@ public: - static bool IsH264Enabled(); - static bool IsH264Type(const nsACString& aType); - static const char gH264Types[3][16]; -- static char const *const gH264Codecs[7]; -+ static char const *const gH264Codecs[9]; - #endif - - #ifdef MOZ_MEDIA_PLUGINS ---- mozilla/content/html/content/src/nsHTMLMediaElement.cpp~ -+++ mozilla/content/html/content/src/nsHTMLMediaElement.cpp -@@ -2135,12 +2135,14 @@ nsHTMLMediaElement::IsWebMType(const nsA - #endif - - #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) --char const *const nsHTMLMediaElement::gH264Codecs[7] = { -+char const *const nsHTMLMediaElement::gH264Codecs[9] = { - "avc1.42E01E", - "avc1.42001E", - "avc1.58A01E", - "avc1.4D401E", - "avc1.64001E", -+ "avc1.64001F", -+ "mp4v.20.3", - "mp4a.40.2", - nullptr - }; Modified: trunk/www/seamonkey/files/patch-bug807492 ============================================================================== --- trunk/www/seamonkey/files/patch-bug807492 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/seamonkey/files/patch-bug807492 Mon Jan 14 01:55:17 2013 (r1141) @@ -81,11 +81,11 @@ if test -n "$MOZ_WEBRTC"; then AC_MSG_RESULT("generating WebRTC Makefiles...") + dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries + dnl so that regeneration via dependencies works correctly WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi" GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}" - - $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \ diff --git js/src/config/system-headers js/src/config/system-headers index 9bd1efa..1095a01 100644 --- mozilla/js/src/config/system-headers @@ -591,10 +591,10 @@ index a7c47e1..4f191de 100644 --- mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c +++ mozilla/media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b +@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData) { static const char fname[] = "cprGetMessage"; - + void *buffer = 0; cpr_msg_queue_t *msgq; cpr_msgq_node_t *node; @@ -609,12 +609,12 @@ int tz_dsttime; /* type of dst correction to apply */ } tz; +#endif - + /* Initialize ppUserData */ if (ppUserData) { *ppUserData = NULL; } - + msgq = (cpr_msg_queue_t *) msgQueue; if (msgq == NULL) { diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in @@ -1278,7 +1278,6 @@ +#include +#endif + - #include #include #include "ref_count.h" @@ -1286,6 +1285,7 @@ #include "thread_wrapper.h" #include "critical_section_wrapper.h" #include "video_capture_linux.h" + diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc index e3f7bb5..882cede 100644 --- mozilla/media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc Modified: trunk/www/seamonkey/files/patch-bug815025 ============================================================================== --- trunk/www/seamonkey/files/patch-bug815025 Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/seamonkey/files/patch-bug815025 Mon Jan 14 01:55:17 2013 (r1141) @@ -1,8 +1,8 @@ --- mozilla/mfbt/SHA1.h~ +++ mozilla/mfbt/SHA1.h -@@ -27,6 +27,11 @@ - #include "mozilla/StandardInteger.h" - #include "mozilla/Types.h" +@@ -13,6 +13,11 @@ + + #include +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 +/* c++/36107: mark SHA1Sum constructor as weak manually */ @@ -10,18 +10,18 @@ +#endif + namespace mozilla { - class SHA1Sum { - union { -@@ -39,7 +43,12 @@ class SHA1Sum { - public: - static const unsigned int HashSize = 20; + /** +@@ -44,7 +49,12 @@ class SHA1Sum + bool mDone; + + public: +#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API() SHA1Sum(); ++ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ ++ MOZ_IMPORT_API SHA1Sum(); +#else - MFBT_API() SHA1Sum(); + MFBT_API SHA1Sum(); +#endif - MFBT_API(void) update(const void* dataIn, uint32_t len); - MFBT_API(void) finish(uint8_t hashout[20]); - }; + + static const size_t HashSize = 20; + typedef uint8_t Hash[HashSize]; Added: trunk/www/seamonkey/files/patch-bug817267 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug817267 Mon Jan 14 01:55:17 2013 (r1141) @@ -0,0 +1,36 @@ +commit faafeb1 +Author: Jan Beich +Date: Sat Dec 1 21:25:24 2012 -0500 + + Bug 817267 - dirfd() is a macro on some BSDs, fix build there. r=yoric +--- + dom/system/OSFileConstants.cpp | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp +index 75a41dc..63fc6b1 100644 +--- mozilla/dom/system/OSFileConstants.cpp ++++ mozilla/dom/system/OSFileConstants.cpp +@@ -41,6 +41,11 @@ + #include "OSFileConstants.h" + #include "nsIOSFileConstantsService.h" + ++#if defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#define __dd_fd dd_fd ++#endif ++ + /** + * This module defines the basic libc constants (error numbers, open modes, + * etc.) used by OS.File and possibly other OS-bound JavaScript libraries. +@@ -383,8 +388,8 @@ static dom::ConstantSpec gLibcProperties[] = + { "OSFILE_OFFSETOF_DIRENT_D_TYPE", INT_TO_JSVAL(offsetof (struct dirent, d_type)) }, + #endif // defined(DT_UNKNOWN) + +- // Under MacOS X, |dirfd| is a macro rather than a function, so we +- // need a little help to get it to work ++ // Under MacOS X and BSDs, |dirfd| is a macro rather than a ++ // function, so we need a little help to get it to work + #if defined(dirfd) + { "OSFILE_SIZEOF_DIR", INT_TO_JSVAL(sizeof (DIR)) }, + Modified: trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp Mon Jan 14 01:55:17 2013 (r1141) @@ -1,5 +1,5 @@ ---- mozilla/content/media/nsAudioStream.cpp~ -+++ mozilla/content/media/nsAudioStream.cpp +--- mozilla/content/media/AudioStream.cpp~ ++++ mozilla/content/media/AudioStream.cpp @@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure) gVolumeScale = NS_MAX(0, PR_strtod(utf8.get(), nullptr)); } Added: trunk/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h Mon Jan 14 01:55:17 2013 (r1141) @@ -0,0 +1,18 @@ +diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h +index f42822e..1a5a699 100644 +--- mozilla/gfx/ots/include/opentype-sanitiser.h ++++ mozilla/gfx/ots/include/opentype-sanitiser.h +@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t; + #include + #endif + ++#ifdef __FreeBSD__ ++# include ++# if __FreeBSD_version < 800067 ++# include // for off_t ++# endif ++#endif ++ + #include // for std::min + #include + #include Modified: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Mon Jan 14 01:55:01 2013 (r1140) +++ trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Mon Jan 14 01:55:17 2013 (r1141) @@ -1,9 +1,9 @@ --- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~ +++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc -@@ -15,7 +15,7 @@ - #include "base/scoped_nsautorelease_pool.h" +@@ -16,7 +16,7 @@ #include "base/scoped_ptr.h" #include "base/time.h" + #include "nsDependentSubstring.h" -#include "third_party/libevent/event.h" +#include "event.h" Deleted: trunk/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-xpcom-base-AvailableMemoryTracker.cpp Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- mozilla/xpcom/base/AvailableMemoryTracker.cpp~ -+++ mozilla/xpcom/base/AvailableMemoryTracker.cpp -@@ -499,6 +499,6 @@ nsJemallocFreeDirtyPagesRunnable::Run() - MOZ_ASSERT(NS_IsMainThread()); - - #if defined(MOZ_JEMALLOC) -- mallctl("arenas.purge", nullptr, 0, nullptr, 0); -+// mallctl("arenas.purge", nullptr, 0, nullptr, 0); - #elif defined(MOZ_MEMORY) - jemalloc_free_dirty_pages(); Deleted: trunk/www/seamonkey/files/patch-z-bug762445 ============================================================================== --- trunk/www/seamonkey/files/patch-z-bug762445 Mon Jan 14 01:55:17 2013 (r1140) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,70 +0,0 @@ -commit b44dc8e -Author: Jan Beich -Date: Fri Oct 12 18:49:59 2012 +0000 - - Bug 762445 - Add jemalloc3 glue for heap-committed, heap-dirty in about:memory. ---- - memory/build/mozjemalloc_compat.c | 34 ++++++++++++++++++++++++++++------ - 1 file changed, 28 insertions(+), 6 deletions(-) - -diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c -index 94ad96e..7adfef5 100644 ---- mozilla/memory/build/mozjemalloc_compat.c -+++ mozilla/memory/build/mozjemalloc_compat.c -@@ -11,15 +11,50 @@ - #define wrap(a) je_ ## a - #endif - --extern MOZ_IMPORT_API(int) -+/* -+ * CTL_* macros are from memory/jemalloc/src/src/stats.c with changes: -+ * - drop `t' argument to avoid redundancy in calculating type size -+ * - require `i' argument for arena number explicitly -+ */ -+ -+#define CTL_GET(n, v) do { \ -+ size_t sz = sizeof(v); \ -+ wrap(mallctl)(n, &v, &sz, NULL, 0); \ -+} while (0) -+ -+#define CTL_I_GET(n, v, i) do { \ -+ size_t mib[6]; \ -+ size_t miblen = sizeof(mib) / sizeof(mib[0]); \ -+ size_t sz = sizeof(v); \ -+ wrap(mallctlnametomib)(n, mib, &miblen); \ -+ mib[2] = i; \ -+ wrap(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0); \ -+} while (0) -+ -+MOZ_IMPORT_API(int) - wrap(mallctl)(const char*, void*, size_t*, void*, size_t); -+MOZ_IMPORT_API(int) -+wrap(mallctlnametomib)(const char *name, size_t *mibp, size_t *miblenp); -+MOZ_IMPORT_API(int) -+wrap(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp, void *newp, size_t newlen); - - MOZ_EXPORT_API(void) - jemalloc_stats(jemalloc_stats_t *stats) - { -- size_t size = sizeof(stats->mapped); -- wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0); -- wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0); -- stats->committed = -1; -- stats->dirty = -1; -+ unsigned narenas; -+ size_t active, allocated, mapped, page, pdirty; -+ -+ CTL_GET("arenas.narenas", narenas); -+ CTL_GET("arenas.page", page); -+ CTL_GET("stats.active", active); -+ CTL_GET("stats.allocated", allocated); -+ CTL_GET("stats.mapped", mapped); -+ -+ /* get the summation for all arenas, i == narenas */ -+ CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas); -+ -+ stats->allocated = allocated; -+ stats->mapped = mapped; -+ stats->dirty = pdirty * page; -+ stats->committed = active + stats->dirty; - } From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 14 01:55:37 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 2AFBD37C for ; Mon, 14 Jan 2013 01:55:37 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 98271B5E for ; Mon, 14 Jan 2013 01:55:36 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0E1tZPx097895 for ; Mon, 14 Jan 2013 01:55:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0E1tUt5092380 for freebsd-gecko@freebsd.org; Mon, 14 Jan 2013 01:55:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 14 Jan 2013 01:55:30 GMT Message-Id: <201301140155.r0E1tUt5092380@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1142 - in trunk: . mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly/files www/firefox/files www/seamonkey www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 01:55:37 -0000 Author: jbeich Date: Mon Jan 14 01:55:30 2013 New Revision: 1142 Log: de-support gcc42 following upstream since gecko18 Deleted: trunk/mail/thunderbird/files/patch-bug732340 trunk/mail/thunderbird/files/patch-bug783505 trunk/mail/thunderbird/files/patch-bug815025 trunk/mail/thunderbird/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h trunk/www/firefox-nightly/files/patch-bug732340 trunk/www/firefox-nightly/files/patch-bug783505 trunk/www/firefox-nightly/files/patch-bug815025 trunk/www/firefox-nightly/files/patch-content-base-src-nsTextFragmentImpl.h trunk/www/firefox/files/patch-bug732340 trunk/www/firefox/files/patch-bug783505 trunk/www/firefox/files/patch-bug815025 trunk/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h trunk/www/seamonkey/files/patch-bug732340 trunk/www/seamonkey/files/patch-bug783505 trunk/www/seamonkey/files/patch-bug815025 trunk/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h Modified: trunk/Gecko_ChangeLog trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in trunk/www/firefox/Makefile trunk/www/firefox/files/patch-ipc-chromium-Makefile.in trunk/www/seamonkey/Makefile trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/Gecko_ChangeLog Mon Jan 14 01:55:30 2013 (r1142) @@ -1 +1,2 @@ 19.0: +- make firefox/seamonkey use gcc47 when CXX is unset and "c++" isn't clang Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/mail/thunderbird/Makefile Mon Jan 14 01:55:30 2013 (r1142) @@ -68,6 +68,10 @@ XPI_LIBDIR= ${PREFIX}/lib/xpi +.if defined(WITHOUT_CLANG_IS_CC) || ${CXX:Mc++} && ${OSVERSION} < 1000024 +USE_GCC?= 4.7+ +.endif + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Modified: trunk/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile ============================================================================== --- trunk/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/mail/thunderbird/files/extrapatch-enigmail-ipc-src-Makefile Mon Jan 14 01:55:30 2013 (r1142) @@ -31,18 +31,6 @@ CFLAGS += -fPIC endif endif -@@ -62,7 +62,11 @@ libs: source - $(CC) $(LDFLAGS) -o $(libname) $(objfiles) - - source: $(source) -+ifneq (,$(filter 4.2.%, $(CC_VERSION))) -+ $(CC) $(CFLAGS) -c -o $(objfiles) $^ -+else - $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ -+endif - - - clean: --- mailnews/extensions/enigmail/ipc/src/Makefile.in~ +++ mailnews/extensions/enigmail/ipc/src/Makefile.in @@ -19,26 +19,26 @@ endif @@ -76,15 +64,3 @@ CFLAGS += -fPIC endif endif -@@ -62,7 +62,11 @@ libs: source - $(CC) $(LDFLAGS) -o $(libname) $(objfiles) - - source: $(source) -+ifneq (,$(filter 4.2.%, $(CC_VERSION))) -+ $(CC) $(CFLAGS) -c -o $(objfiles) $^ -+else - $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ -+endif - - - clean: Deleted: trunk/mail/thunderbird/files/patch-bug732340 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug732340 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t - GPOS::position_finish (buffer); - } - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf::search(unsigned int const &) const; -+#endif - - Deleted: trunk/mail/thunderbird/files/patch-bug783505 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug783505 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ -commit b5f97ee -Author: Rafael Ávila de Espíndola -Date: Mon Aug 20 10:28:08 2012 -0400 - - Bug 783505 - OS X gcc builds failing. r=jorendorff. - This patch adds a workaround for - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608 ---- - js/src/jstypedarray.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git mozilla/js/src/jstypedarray.cpp mozilla/js/src/jstypedarray.cpp -index 1eaeea0..1957086 100644 ---- mozilla/js/src/jstypedarray.cpp -+++ mozilla/js/src/jstypedarray.cpp -@@ -1423,8 +1423,14 @@ class TypedArrayTemplate - Getter(JSContext *cx, unsigned argc, Value *vp) - { - CallArgs args = CallArgsFromVp(argc, vp); -+ // FIXME: Hack to keep us building with gcc 4.2. Remove this once we -+ // drop support for gcc 4.2. See bug 783505 for the details. -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ return CallNonGenericMethod(cx, IsThisClass, GetterImpl, args); -+#else - return CallNonGenericMethod >(cx, args); -+#endif - } - - // Define an accessor for a read-only property that invokes a native getter ---- mozilla/build/autoconf/gcc-pr39608.m4~ -+++ mozilla/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) ---- mozilla/js/src/build/autoconf/gcc-pr39608.m4~ -+++ mozilla/js/src/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) Deleted: trunk/mail/thunderbird/files/patch-bug815025 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug815025 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ ---- mozilla/mfbt/SHA1.h~ -+++ mozilla/mfbt/SHA1.h -@@ -13,6 +13,11 @@ - - #include - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+/* c++/36107: mark SHA1Sum constructor as weak manually */ -+__asm__(".weak _ZN7mozilla7SHA1SumC1Ev"); -+#endif -+ - namespace mozilla { - - /** -@@ -44,7 +49,12 @@ class SHA1Sum - bool mDone; - - public: -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API SHA1Sum(); -+#else - MFBT_API SHA1Sum(); -+#endif - - static const size_t HashSize = 20; - typedef uint8_t Hash[HashSize]; Deleted: trunk/mail/thunderbird/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/content/base/src/nsTextFragmentImpl.h -+++ mozilla/content/base/src/nsTextFragmentImpl.h -@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> { - }; - - template<> struct Non8BitParameters<8> { -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ static inline size_t mask() { return 0xff00ff00ff00ff00ULL; } -+#else - static inline size_t mask() { return 0xff00ff00ff00ff00; } -+#endif - static inline uint32_t alignMask() { return 0x7; } - static inline uint32_t numUnicharsPerWord() { return 4; } - }; Modified: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Mon Jan 14 01:55:30 2013 (r1142) @@ -1,20 +1,5 @@ --- mozilla/ipc/chromium/Makefile.in~ +++ mozilla/ipc/chromium/Makefile.in -@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk - - OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) - -+# workaround IPC hang with libevent2 -+ifndef MOZ_DEBUG -+ifneq (,$(filter 4.2.%, $(CXX_VERSION))) -+MOZ_OPTIMIZE_FLAGS = -O1 -+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) -+endif -+endif -+ - LIBRARY_NAME = chromium_s - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 @@ -55,9 +60,7 @@ vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL) Deleted: trunk/www/firefox-nightly/files/patch-bug732340 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug732340 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -496,3 +497,11 @@ hb_ot_layout_position_finish (hb_font_t - { - OT::GPOS::position_finish (font, buffer, zero_width_attached_marks); - } -+ -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+template int OT::SortedArrayOf >::search(unsigned int const &) const; -+template int OT::SortedArrayOf >::search(unsigned int const &) const; -+template int OT::SortedArrayOf >::search(unsigned int const &) const; -+template int OT::SortedArrayOf::search(unsigned int const &) const; -+#endif Deleted: trunk/www/firefox-nightly/files/patch-bug783505 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug783505 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ -commit b5f97ee -Author: Rafael Ávila de Espíndola -Date: Mon Aug 20 10:28:08 2012 -0400 - - Bug 783505 - OS X gcc builds failing. r=jorendorff. - This patch adds a workaround for - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608 ---- - js/src/jstypedarray.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git js/src/jstypedarray.cpp js/src/jstypedarray.cpp -index 1eaeea0..1957086 100644 ---- js/src/jstypedarray.cpp -+++ js/src/jstypedarray.cpp -@@ -1423,8 +1423,14 @@ class TypedArrayTemplate - Getter(JSContext *cx, unsigned argc, Value *vp) - { - CallArgs args = CallArgsFromVp(argc, vp); -+ // FIXME: Hack to keep us building with gcc 4.2. Remove this once we -+ // drop support for gcc 4.2. See bug 783505 for the details. -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ return CallNonGenericMethod(cx, IsThisClass, GetterImpl, args); -+#else - return CallNonGenericMethod >(cx, args); -+#endif - } - - // Define an accessor for a read-only property that invokes a native getter ---- build/autoconf/gcc-pr39608.m4~ -+++ build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) ---- js/src/build/autoconf/gcc-pr39608.m4~ -+++ js/src/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) Deleted: trunk/www/firefox-nightly/files/patch-bug815025 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug815025 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ ---- mfbt/SHA1.h~ -+++ mfbt/SHA1.h -@@ -13,6 +13,11 @@ - - #include - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+/* c++/36107: mark SHA1Sum constructor as weak manually */ -+__asm__(".weak _ZN7mozilla7SHA1SumC1Ev"); -+#endif -+ - namespace mozilla { - - /** -@@ -44,7 +49,12 @@ class SHA1Sum - bool mDone; - - public: -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API SHA1Sum(); -+#else - MFBT_API SHA1Sum(); -+#endif - - static const size_t HashSize = 20; - typedef uint8_t Hash[HashSize]; Deleted: trunk/www/firefox-nightly/files/patch-content-base-src-nsTextFragmentImpl.h ============================================================================== --- trunk/www/firefox-nightly/files/patch-content-base-src-nsTextFragmentImpl.h Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- content/base/src/nsTextFragmentImpl.h -+++ content/base/src/nsTextFragmentImpl.h -@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> { - }; - - template<> struct Non8BitParameters<8> { -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ static inline size_t mask() { return 0xff00ff00ff00ff00ULL; } -+#else - static inline size_t mask() { return 0xff00ff00ff00ff00; } -+#endif - static inline uint32_t alignMask() { return 0x7; } - static inline uint32_t numUnicharsPerWord() { return 4; } - }; Modified: trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Mon Jan 14 01:55:30 2013 (r1142) @@ -1,20 +1,5 @@ --- ipc/chromium/Makefile.in~ +++ ipc/chromium/Makefile.in -@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk - - OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) - -+# workaround IPC hang with libevent2 -+ifndef MOZ_DEBUG -+ifneq (,$(filter 4.2.%, $(CXX_VERSION))) -+MOZ_OPTIMIZE_FLAGS = -O1 -+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) -+endif -+endif -+ - LIBRARY_NAME = chromium_s - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 @@ -55,9 +60,7 @@ vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL) Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/firefox/Makefile Mon Jan 14 01:55:30 2013 (r1142) @@ -56,6 +56,10 @@ WRKSRC:= ${WRKDIR}/mozilla-beta +.if defined(WITHOUT_CLANG_IS_CC) || ${CXX:Mc++} && ${OSVERSION} < 1000024 +USE_GCC?= 4.7+ +.endif + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Deleted: trunk/www/firefox/files/patch-bug732340 ============================================================================== --- trunk/www/firefox/files/patch-bug732340 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t - GPOS::position_finish (buffer); - } - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf::search(unsigned int const &) const; -+#endif - Deleted: trunk/www/firefox/files/patch-bug783505 ============================================================================== --- trunk/www/firefox/files/patch-bug783505 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ -commit b5f97ee -Author: Rafael Ávila de Espíndola -Date: Mon Aug 20 10:28:08 2012 -0400 - - Bug 783505 - OS X gcc builds failing. r=jorendorff. - This patch adds a workaround for - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608 ---- - js/src/jstypedarray.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git js/src/jstypedarray.cpp js/src/jstypedarray.cpp -index 1eaeea0..1957086 100644 ---- js/src/jstypedarray.cpp -+++ js/src/jstypedarray.cpp -@@ -1423,8 +1423,14 @@ class TypedArrayTemplate - Getter(JSContext *cx, unsigned argc, Value *vp) - { - CallArgs args = CallArgsFromVp(argc, vp); -+ // FIXME: Hack to keep us building with gcc 4.2. Remove this once we -+ // drop support for gcc 4.2. See bug 783505 for the details. -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ return CallNonGenericMethod(cx, IsThisClass, GetterImpl, args); -+#else - return CallNonGenericMethod >(cx, args); -+#endif - } - - // Define an accessor for a read-only property that invokes a native getter ---- build/autoconf/gcc-pr39608.m4~ -+++ build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) ---- js/src/build/autoconf/gcc-pr39608.m4~ -+++ js/src/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) Deleted: trunk/www/firefox/files/patch-bug815025 ============================================================================== --- trunk/www/firefox/files/patch-bug815025 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ ---- mfbt/SHA1.h~ -+++ mfbt/SHA1.h -@@ -13,6 +13,11 @@ - - #include - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+/* c++/36107: mark SHA1Sum constructor as weak manually */ -+__asm__(".weak _ZN7mozilla7SHA1SumC1Ev"); -+#endif -+ - namespace mozilla { - - /** -@@ -44,7 +49,12 @@ class SHA1Sum - bool mDone; - - public: -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API SHA1Sum(); -+#else - MFBT_API SHA1Sum(); -+#endif - - static const size_t HashSize = 20; - typedef uint8_t Hash[HashSize]; Deleted: trunk/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h ============================================================================== --- trunk/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- content/base/src/nsTextFragmentImpl.h -+++ content/base/src/nsTextFragmentImpl.h -@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> { - }; - - template<> struct Non8BitParameters<8> { -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ static inline size_t mask() { return 0xff00ff00ff00ff00ULL; } -+#else - static inline size_t mask() { return 0xff00ff00ff00ff00; } -+#endif - static inline uint32_t alignMask() { return 0x7; } - static inline uint32_t numUnicharsPerWord() { return 4; } - }; Modified: trunk/www/firefox/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/firefox/files/patch-ipc-chromium-Makefile.in Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/firefox/files/patch-ipc-chromium-Makefile.in Mon Jan 14 01:55:30 2013 (r1142) @@ -1,20 +1,5 @@ --- ipc/chromium/Makefile.in~ +++ ipc/chromium/Makefile.in -@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk - - OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) - -+# workaround IPC hang with libevent2 -+ifndef MOZ_DEBUG -+ifneq (,$(filter 4.2.%, $(CXX_VERSION))) -+MOZ_OPTIMIZE_FLAGS = -O1 -+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) -+endif -+endif -+ - LIBRARY_NAME = chromium_s - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 @@ -55,9 +60,7 @@ vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL) Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/seamonkey/Makefile Mon Jan 14 01:55:30 2013 (r1142) @@ -71,6 +71,10 @@ XPI_LIBDIR= ${PREFIX}/lib/xpi +.if defined(WITHOUT_CLANG_IS_CC) || ${CXX:Mc++} && ${OSVERSION} < 1000024 +USE_GCC?= 4.7+ +.endif + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Modified: trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile ============================================================================== --- trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile Mon Jan 14 01:55:30 2013 (r1142) @@ -31,18 +31,6 @@ CFLAGS += -fPIC endif endif -@@ -62,7 +62,11 @@ libs: source - $(CC) $(LDFLAGS) -o $(libname) $(objfiles) - - source: $(source) -+ifneq (,$(filter 4.2.%, $(CC_VERSION))) -+ $(CC) $(CFLAGS) -c -o $(objfiles) $^ -+else - $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ -+endif - - - clean: --- mailnews/extensions/enigmail/ipc/src/Makefile.in~ +++ mailnews/extensions/enigmail/ipc/src/Makefile.in @@ -19,26 +19,26 @@ endif @@ -76,15 +64,3 @@ CFLAGS += -fPIC endif endif -@@ -62,7 +62,11 @@ libs: source - $(CC) $(LDFLAGS) -o $(libname) $(objfiles) - - source: $(source) -+ifneq (,$(filter 4.2.%, $(CC_VERSION))) -+ $(CC) $(CFLAGS) -c -o $(objfiles) $^ -+else - $(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^ -+endif - - - clean: Deleted: trunk/www/seamonkey/files/patch-bug732340 ============================================================================== --- trunk/www/seamonkey/files/patch-bug732340 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t - GPOS::position_finish (buffer); - } - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf::search(unsigned int const &) const; -+#endif - - Deleted: trunk/www/seamonkey/files/patch-bug783505 ============================================================================== --- trunk/www/seamonkey/files/patch-bug783505 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ -commit b5f97ee -Author: Rafael Ávila de Espíndola -Date: Mon Aug 20 10:28:08 2012 -0400 - - Bug 783505 - OS X gcc builds failing. r=jorendorff. - This patch adds a workaround for - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608 ---- - js/src/jstypedarray.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git mozilla/js/src/jstypedarray.cpp mozilla/js/src/jstypedarray.cpp -index 1eaeea0..1957086 100644 ---- mozilla/js/src/jstypedarray.cpp -+++ mozilla/js/src/jstypedarray.cpp -@@ -1423,8 +1423,14 @@ class TypedArrayTemplate - Getter(JSContext *cx, unsigned argc, Value *vp) - { - CallArgs args = CallArgsFromVp(argc, vp); -+ // FIXME: Hack to keep us building with gcc 4.2. Remove this once we -+ // drop support for gcc 4.2. See bug 783505 for the details. -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ return CallNonGenericMethod(cx, IsThisClass, GetterImpl, args); -+#else - return CallNonGenericMethod >(cx, args); -+#endif - } - - // Define an accessor for a read-only property that invokes a native getter ---- mozilla/build/autoconf/gcc-pr39608.m4~ -+++ mozilla/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) ---- mozilla/js/src/build/autoconf/gcc-pr39608.m4~ -+++ mozilla/js/src/build/autoconf/gcc-pr39608.m4 -@@ -31,7 +31,6 @@ AC_LANG_RESTORE - - AC_MSG_RESULT($ac_have_gcc_pr39608) - if test "$ac_have_gcc_pr39608" = "yes"; then -- echo This compiler would fail to build firefox, plase upgrade. -- exit 1 -+ echo This compiler may fail to build firefox, plase upgrade. - fi - ]) Deleted: trunk/www/seamonkey/files/patch-bug815025 ============================================================================== --- trunk/www/seamonkey/files/patch-bug815025 Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,27 +0,0 @@ ---- mozilla/mfbt/SHA1.h~ -+++ mozilla/mfbt/SHA1.h -@@ -13,6 +13,11 @@ - - #include - -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+/* c++/36107: mark SHA1Sum constructor as weak manually */ -+__asm__(".weak _ZN7mozilla7SHA1SumC1Ev"); -+#endif -+ - namespace mozilla { - - /** -@@ -44,7 +49,12 @@ class SHA1Sum - bool mDone; - - public: -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 -+ /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */ -+ MOZ_IMPORT_API SHA1Sum(); -+#else - MFBT_API SHA1Sum(); -+#endif - - static const size_t HashSize = 20; - typedef uint8_t Hash[HashSize]; Deleted: trunk/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-content-base-src-nsTextFragmentImpl.h Mon Jan 14 01:55:30 2013 (r1141) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/content/base/src/nsTextFragmentImpl.h -+++ mozilla/content/base/src/nsTextFragmentImpl.h -@@ -16,7 +16,11 @@ template<> struct Non8BitParameters<4> { - }; - - template<> struct Non8BitParameters<8> { -+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 -+ static inline size_t mask() { return 0xff00ff00ff00ff00ULL; } -+#else - static inline size_t mask() { return 0xff00ff00ff00ff00; } -+#endif - static inline uint32_t alignMask() { return 0x7; } - static inline uint32_t numUnicharsPerWord() { return 4; } - }; Modified: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Mon Jan 14 01:55:17 2013 (r1141) +++ trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Mon Jan 14 01:55:30 2013 (r1142) @@ -1,20 +1,5 @@ --- mozilla/ipc/chromium/Makefile.in~ +++ mozilla/ipc/chromium/Makefile.in -@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk - - OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) - -+# workaround IPC hang with libevent2 -+ifndef MOZ_DEBUG -+ifneq (,$(filter 4.2.%, $(CXX_VERSION))) -+MOZ_OPTIMIZE_FLAGS = -O1 -+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS) -+endif -+endif -+ - LIBRARY_NAME = chromium_s - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 @@ -55,9 +60,7 @@ vpath %.c \ $(srcdir)/src/third_party/libevent \ $(NULL) From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 14 11:07:01 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7D12A630 for ; Mon, 14 Jan 2013 11:07:01 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 6F78467E for ; Mon, 14 Jan 2013 11:07:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0EB71F4086685 for ; Mon, 14 Jan 2013 11:07:01 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0EB71lU086683 for gecko@FreeBSD.org; Mon, 14 Jan 2013 11:07:01 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 14 Jan 2013 11:07:01 GMT Message-Id: <201301141107.r0EB71lU086683@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: gecko@FreeBSD.org Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 11:07:01 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/174096 gecko mail/thunderbird 17 and 16 crashes when try write a ne o ports/173937 gecko mail/thunderbird core dumps when using enigmail to gen p ports/171255 gecko Fix www/firefox on FreeBSD 7.4/amd64 o ports/171219 gecko www/firefox-i18n russian language pack don't translate o ports/170402 gecko www/linux-firefox: crash with flashplugin o ports/170310 gecko mail/thunderbird: coredump/crash when used with OpenLD o ports/169729 gecko www/firefox-esr "make package" produces package with z o ports/169366 gecko www/xpi-* ports need re-install after each Firefox upd o ports/169241 gecko www/firefox Right mouse buttom click freeze screen o ports/168091 gecko Mk/bsd.gecko.mk error: USE_FIREFOX doesn't work correc o ports/167397 gecko mail/thunderbird-i18n Version 12.0 and freebsd 9.0: ca f ports/165263 gecko mail/thunderbird: core dumping most time when users ar o ports/164239 gecko [PATCH] mail/thunderbird: crash with nss_ldap o ports/164013 gecko www/firefox: Firefox-9 Icons & xpi-addons from ports o ports/162939 gecko www/firefox crashes with Zotero add-on o ports/162075 gecko www/firefox >= 7.0.1_2 bug with respect to pentadactyl o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local o ports/156335 gecko www/firefox: Repeatable firefox-4.0_1,1 crash f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 20 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 14 16:53:02 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C8EC08F2 for ; Mon, 14 Jan 2013 16:53:02 +0000 (UTC) (envelope-from flo@smeets.im) Received: from mail.solomo.de (mail.solomo.de [IPv6:2a01:4f8:162:1142::2]) by mx1.freebsd.org (Postfix) with ESMTP id 68658674 for ; Mon, 14 Jan 2013 16:53:02 +0000 (UTC) Received: from cpos1.nexxtmobile.de (localhost [127.0.0.1]) by mail.solomo.de (Postfix) with ESMTP id E2E0D464C; Mon, 14 Jan 2013 17:53:00 +0100 (CET) X-Virus-Scanned: amavisd-new at nexxtmobile.de Received: from mail.solomo.de ([127.0.0.1]) by cpos1.nexxtmobile.de (cpos1.nexxtmobile.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id SeJpDnEg8ted; Mon, 14 Jan 2013 17:52:55 +0100 (CET) Received: from [192.168.43.222] (tmo-103-142.customers.d1-online.com [80.187.103.142]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.solomo.de (Postfix) with ESMTPSA id 4CFFB4643; Mon, 14 Jan 2013 17:52:52 +0100 (CET) Message-ID: <50F437DA.7040409@smeets.im> Date: Mon, 14 Jan 2013 17:52:42 +0100 From: Florian Smeets User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Thunderbird/21.0a1 MIME-Version: 1.0 To: Jan Beich Subject: Re: [SVN-Commit] r1141 - in trunk: . mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files www/seamonkey www/seamonkey/files References: <201301140155.r0E1tI6i079235@trillian.chruetertee.ch> In-Reply-To: <201301140155.r0E1tI6i079235@trillian.chruetertee.ch> X-Enigmail-Version: 1.6a1pre Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="----enig2OAOGISRRWHFJFLRGRJXE" Cc: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 16:53:02 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2OAOGISRRWHFJFLRGRJXE Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 14.01.13 02:55, svn-freebsd-gecko@chruetertee.ch wrote: > Author: jbeich > Date: Mon Jan 14 01:55:17 2013 > New Revision: 1141 >=20 > Log: > update (gcc42 build is broken) >=20 >=20 > Modified: trunk/mail/thunderbird/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- trunk/mail/thunderbird/Makefile Mon Jan 14 01:55:01 2013 (r1140) > +++ trunk/mail/thunderbird/Makefile Mon Jan 14 01:55:17 2013 (r1141) > @@ -2,17 +2,21 @@ > # $FreeBSD: head/mail/thunderbird/Makefile 310165 2013-01-09 23:28:19Z= flo $ > =20 > PORTNAME=3D thunderbird > -DISTVERSION=3D 18.0b1 > +PORTVERSION=3D 19.0.b1 > +DISTVERSION=3D 2.16b1 > CATEGORIES=3D mail ipv6 > MASTER_SITES=3D ${MASTER_SITE_MOZILLA} > -MASTER_SITE_SUBDIR=3D ${PORTNAME}/releases/${DISTVERSION}/source > -DISTFILES=3D ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} > -EXTRACT_ONLY=3D ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} > +MASTER_SITE_SUBDIR=3D seamonkey/releases/${DISTVERSION}/source > +DISTFILES=3D seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} > +EXTRACT_ONLY=3D seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} > +#MASTER_SITE_SUBDIR=3D ${PORTNAME}/releases/${DISTVERSION}/source > +#DISTFILES=3D ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} > +#EXTRACT_ONLY=3D ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} > =20 > Modified: trunk/mail/thunderbird/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- trunk/mail/thunderbird/distinfo Mon Jan 14 01:55:01 2013 (r1140) > +++ trunk/mail/thunderbird/distinfo Mon Jan 14 01:55:17 2013 (r1141) > @@ -1,4 +1,4 @@ > -SHA256 (thunderbird-18.0b1.source.tar.bz2) =3D 60a31745fc0ee4fc5597de6= 663a757f55c0bd61494f67607e3b914c73e236c72 > -SIZE (thunderbird-18.0b1.source.tar.bz2) =3D 119356332 > +SHA256 (seamonkey-2.16b1.source.tar.bz2) =3D 4feabd38674595c839e689142= 106bb1428dcdc1d5575e02ad5375039e1d047e7 > +SIZE (seamonkey-2.16b1.source.tar.bz2) =3D 122349139 > SHA256 (enigmail-1.5.0.tar.gz) =3D 51f55573448586718c8d7e664329d519b02= c4b28af4910bcb550961ace9a9e71 > SIZE (enigmail-1.5.0.tar.gz) =3D 1216071 >=20 This doesn't really look right i think? :) Florian ------enig2OAOGISRRWHFJFLRGRJXE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAlD0N9sACgkQapo8P8lCvwlc5QCg1Ci26T76pi9IKEjhj/XFfwNb f3MAnjsF1rqkiFVzS1WpDSFQVdXdAX27 =i4Lr -----END PGP SIGNATURE----- ------enig2OAOGISRRWHFJFLRGRJXE-- From owner-freebsd-gecko@FreeBSD.ORG Tue Jan 15 18:31:50 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 37ED5E18 for ; Tue, 15 Jan 2013 18:31:50 +0000 (UTC) (envelope-from aftaha@cirp.usp.br) Received: from proxy02.cirp.usp.br (imap.cirp.usp.br [143.107.200.125]) by mx1.freebsd.org (Postfix) with ESMTP id E84F0E0A for ; Tue, 15 Jan 2013 18:31:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by proxy02.cirp.usp.br (Postfix) with ESMTP id E755D169F51 for ; Tue, 15 Jan 2013 16:26:35 -0200 (BRST) X-Virus-Scanned: amavisd-new at proxy02.cirp.usp.br Received: from proxy02.cirp.usp.br ([127.0.0.1]) by localhost (proxy02.cirp.usp.br [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xVBpMTC-RJ3i for ; Tue, 15 Jan 2013 16:26:33 -0200 (BRST) Received: from granito2.cirp.usp.br (granito2.cirp.usp.br [143.107.185.11]) by proxy02.cirp.usp.br (Postfix) with ESMTPA id DA762169F44 for ; Tue, 15 Jan 2013 16:26:33 -0200 (BRST) Message-ID: <50F5AE52.6090508@cirp.usp.br> Date: Tue, 15 Jan 2013 16:30:26 -0300 From: Ali Faiez Taha Organization: Centro de =?UTF-8?B?SW5mb3Jtw6F0aWNhIC0gVVNQIC0gUmliZWlyw6Nv?= =?UTF-8?B?IFByZXRv?= User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:14.0) Gecko/20120808 Thunderbird/14.0 MIME-Version: 1.0 To: gecko@FreeBSD.org Subject: errors with Firefox installation X-Enigmail-Version: 1.4.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: aftaha@cirp.usp.br List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2013 18:31:50 -0000 Dear Sir. Iḿ trying to install Firefox 18.0_1 (pkg_add -r firefox), but there are many errors. When I run firefox the error is: $> firefox XPCOMGlueLoad error for file /usr/local/lib/firefox/libxpcom.so: /lib/libc.so.7: version FBSD_1.2 required by /usr/local/lib/firefox/libxul.so not found Couldn't load XPCOM. More informations: * uname -a FreeBSD granito2.cirp.usp.br 8.3-STABLE FreeBSD 8.3-STABLE #1: Wed Jun 13 23:41:51 BRT 2012 root@granito2.cirp.usp.br:/usr/obj/usr/src/sys/GRANITO2 i386 * Output from 'ident /usr/ports/www/firefox/Makefile' /usr/ports/www/firefox/Makefile: $FreeBSD: ports/www/firefox/Makefile,v 1.287 2013/01/11 11:12:40 svnexp Exp $ When I use make, the compilation stops and abort. What I need to solve this ? Thanks a lot. From owner-freebsd-gecko@FreeBSD.ORG Wed Jan 16 17:43:42 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1942FB58 for ; Wed, 16 Jan 2013 17:43:42 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (neu.net [199.48.129.194]) by mx1.freebsd.org (Postfix) with ESMTP id C0682DA4 for ; Wed, 16 Jan 2013 17:43:40 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.6/8.14.5) with ESMTP id r0GHhWfj082668 for ; Wed, 16 Jan 2013 12:43:33 -0500 (EST) (envelope-from andy@neu.net) Date: Wed, 16 Jan 2013 12:43:32 -0500 (EST) From: AN To: gecko@freebsd.org Subject: error: conflicting types for operator new Message-ID: User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Virus-Scanned: clamav-milter 0.97.6 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=4.5 tests=RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2013 17:43:42 -0000 FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #23 r245402: Sun Jan 13 22:39:58 EST 2013 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 c++ -o nsGnomeVFSProtocolHandler.o -c -I../../dist/stl_wrappers -I../../dist/system_wrappers -include ../../../config/gcc_hidden.h -DMOZ_GLUE_IN_PROGRAM -DNO_NSPR_10_SUPPORT -I/usr/local/include/gnome-vfs-2.0 -I/usr/local/include/gnome-vfs-module-2.0 -I/usr/local/lib/gnome-vfs-2.0/include -I/usr/local/include/gconf/2 -I/usr/local/include/orbit-2.0 -DORBIT2=1 -D_REENTRANT -I/usr/local/include/glib-2.0 -I../../../extensions/gnomevfs -I. -I../../dist/include -I/usr/local/include/nspr -I/usr/ports/www/FF_nightly/work/mozilla-central-8d8912467c41/obj-x86_64-portbld-freebsd10.0/dist/include/nss -I/usr/local/include -I/usr/local/include -fPIC -Qunused-arguments -isystem/usr/local/include -I/usr/local/include -Qunused-arguments -Wall -Wpointer-arith -Woverloaded-virtual -Werror=return-type -Wtype-limits -Wempty-body -Wno-ctor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros -Wno-c++0x-extensions -Wno-extended-offsetof -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-mismatched-tags -O2 -pipe -fno-strict-aliasing -fno-exceptions -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -std=gnu++0x -pipe -DNDEBUG -DTRIMMED -O2 -fomit-frame-pointer -Qunused-arguments -isystem/usr/local/include -I/usr/local/include -DMOZILLA_CLIENT -include ../../mozilla-config.h -MD -MF .deps/nsGnomeVFSProtocolHandler.o.pp /usr/ports/www/FF_nightly/work/mozilla-central-8d8912467c41/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp In file included from /usr/ports/www/FF_nightly/work/mozilla-central-8d8912467c41/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp:11: In file included from ../../dist/stl_wrappers/algorithm:38: ../../dist/include/mozilla/mozalloc.h:204:7: error: conflicting types for 'operator new' void* operator new(size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:198:7: note: previous definition is here void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC ^ ../../dist/include/mozilla/mozalloc.h:216:7: error: conflicting types for 'operator new[]' void* operator new[](size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:210:7: note: previous definition is here void* operator new[](size_t size) MOZALLOC_THROW_BAD_ALLOC ^ ../../dist/include/mozilla/mozalloc.h:228:6: error: conflicting types for 'operator delete' void operator delete(void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:222:6: note: previous definition is here void operator delete(void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:240:6: error: conflicting types for 'operator delete[]' void operator delete[](void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:234:6: note: previous definition is here void operator delete[](void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:266:7: error: conflicting types for 'operator new' void* operator new(size_t size, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:198:7: note: previous definition is here void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC ^ ../../dist/include/mozilla/mozalloc.h:272:7: error: conflicting types for 'operator new[]' void* operator new[](size_t size, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:210:7: note: previous definition is here void* operator new[](size_t size) MOZALLOC_THROW_BAD_ALLOC ^ ../../dist/include/mozilla/mozalloc.h:278:6: error: conflicting types for 'operator delete' void operator delete(void* ptr, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:222:6: note: previous definition is here void operator delete(void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:284:6: error: conflicting types for 'operator delete[]' void operator delete[](void* ptr, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:234:6: note: previous definition is here void operator delete[](void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ In file included from /usr/ports/www/FF_nightly/work/mozilla-central-8d8912467c41/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp:11: In file included from ../../dist/stl_wrappers/algorithm:54: In file included from ../../dist/system_wrappers/algorithm:2: In file included from /usr/include/c++/4.2/algorithm:64: In file included from /usr/include/c++/4.2/bits/stl_algobase.h:66: In file included from ../../dist/stl_wrappers/cstring:54: In file included from ../../dist/system_wrappers/cstring:2: /usr/include/c++/4.2/cstring:100:3: error: declaration conflicts with target of using declaration already in scope memchr(void* __p, int __c, size_t __n) ^ /usr/include/string.h:57:7: note: target of using declaration void *memchr(const void *, int, size_t) __pure; ^ /usr/include/c++/4.2/cstring:97:11: note: using declaration using ::memchr; ^ /usr/include/c++/4.2/cstring:106:3: error: declaration conflicts with target of using declaration already in scope strchr(char* __s1, int __n) ^ /usr/include/string.h:76:7: note: target of using declaration char *strchr(const char *, int) __pure; ^ /usr/include/c++/4.2/cstring:103:11: note: using declaration using ::strchr; ^ /usr/include/c++/4.2/cstring:112:3: error: declaration conflicts with target of using declaration already in scope strpbrk(char* __s1, const char* __s2) ^ /usr/include/string.h:106:7: note: target of using declaration char *strpbrk(const char *, const char *) __pure; ^ /usr/include/c++/4.2/cstring:109:11: note: using declaration using ::strpbrk; ^ /usr/include/c++/4.2/cstring:118:3: error: declaration conflicts with target of using declaration already in scope strrchr(char* __s1, int __n) ^ /usr/include/string.h:107:7: note: target of using declaration char *strrchr(const char *, int) __pure; ^ /usr/include/c++/4.2/cstring:115:11: note: using declaration using ::strrchr; ^ /usr/include/c++/4.2/cstring:124:3: error: declaration conflicts with target of using declaration already in scope strstr(char* __s1, const char* __s2) ^ /usr/include/string.h:115:7: note: target of using declaration char *strstr(const char *, const char *) __pure; ^ /usr/include/c++/4.2/cstring:121:11: note: using declaration using ::strstr; ^ In file included from /usr/ports/www/FF_nightly/work/mozilla-central-8d8912467c41/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp:11: In file included from ../../dist/stl_wrappers/algorithm:54: In file included from ../../dist/system_wrappers/algorithm:2: In file included from /usr/include/c++/4.2/algorithm:64: In file included from /usr/include/c++/4.2/bits/stl_algobase.h:68: In file included from ../../dist/stl_wrappers/cstdlib:54: In file included from ../../dist/system_wrappers/cstdlib:2: /usr/include/c++/4.2/cstdlib:142:3: error: declaration conflicts with target of using declaration already in scope abs(long __i) { return labs(__i); } ^ /usr/include/stdlib.h:83:6: note: target of using declaration int abs(int) __pure2; ^ /usr/include/c++/4.2/cstdlib:109:11: note: using declaration using ::abs; ^ /usr/include/c++/4.2/cstdlib:145:3: error: declaration conflicts with target of using declaration already in scope div(long __i, long __j) { return ldiv(__i, __j); } ^ /usr/include/stdlib.h:91:8: note: target of using declaration div_t div(int, int) __pure2; ^ /usr/include/c++/4.2/cstdlib:116:11: note: using declaration using ::div; ^ In file included from /usr/ports/www/FF_nightly/work/mozilla-central-8d8912467c41/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp:11: In file included from ../../dist/stl_wrappers/algorithm:54: In file included from ../../dist/system_wrappers/algorithm:2: In file included from /usr/include/c++/4.2/algorithm:64: In file included from /usr/include/c++/4.2/bits/stl_algobase.h:70: In file included from /usr/include/c++/4.2/iosfwd:48: In file included from /usr/include/c++/4.2/bits/postypes.h:45: In file included from ../../dist/stl_wrappers/cwchar:54: /usr/include/c++/4.2/cwchar:210:3: error: declaration conflicts with target of using declaration already in scope wcschr(wchar_t* __p, wchar_t __c) ^ /usr/include/wchar.h:135:10: note: target of using declaration wchar_t *wcschr(const wchar_t *, wchar_t) __pure; ^ /usr/include/c++/4.2/cwchar:207:11: note: using declaration using ::wcschr; ^ /usr/include/c++/4.2/cwchar:216:3: error: declaration conflicts with target of using declaration already in scope wcspbrk(wchar_t* __s1, const wchar_t* __s2) ^ /usr/include/wchar.h:147:10: note: target of using declaration wchar_t *wcspbrk(const wchar_t *, const wchar_t *) __pure; ^ /usr/include/c++/4.2/cwchar:213:11: note: using declaration using ::wcspbrk; ^ /usr/include/c++/4.2/cwchar:222:3: error: declaration conflicts with target of using declaration already in scope wcsrchr(wchar_t* __p, wchar_t __c) ^ /usr/include/wchar.h:148:10: note: target of using declaration wchar_t *wcsrchr(const wchar_t *, wchar_t) __pure; ^ /usr/include/c++/4.2/cwchar:219:11: note: using declaration using ::wcsrchr; ^ /usr/include/c++/4.2/cwchar:228:3: error: declaration conflicts with target of using declaration already in scope wcsstr(wchar_t* __s1, const wchar_t* __s2) ^ /usr/include/wchar.h:152:10: note: target of using declaration wchar_t *wcsstr(const wchar_t * __restrict, const wchar_t * __restrict) ^ /usr/include/c++/4.2/cwchar:225:11: note: using declaration using ::wcsstr; ^ fatal error: too many errors emitted, stopping now [-ferror-limit=] 20 errors generated. gmake[4]: *** [nsGnomeVFSProtocolHandler.o] Error 1 gmake[4]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-central-8d8912467c41/obj-x86_64-portbld-freebsd10.0/extensions/gnomevfs' gmake[3]: *** [gnomevfs_libs] Error 2 gmake[3]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-central-8d8912467c41/obj-x86_64-portbld-freebsd10.0/extensions' gmake[2]: *** [libs_tier_app] Error 2 gmake[2]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-central-8d8912467c41/obj-x86_64-portbld-freebsd10.0' gmake[1]: *** [tier_app] Error 2 gmake[1]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-central-8d8912467c41/obj-x86_64-portbld-freebsd10.0' gmake: *** [default] Error 2 *** [do-build] Error code 1 Stop in /usr/ports/www/FF_nightly. *** [/usr/ports/www/FF_nightly/work/.build_done.firefox._usr_local] Error code 1 From owner-freebsd-gecko@FreeBSD.ORG Thu Jan 17 05:28:03 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6CEDA5F2 for ; Thu, 17 Jan 2013 05:28:03 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 07692636 for ; Thu, 17 Jan 2013 05:28:02 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0H5RtX8042986 for ; Thu, 17 Jan 2013 05:27:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0H5RnqL042569 for freebsd-gecko@freebsd.org; Thu, 17 Jan 2013 05:27:49 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 17 Jan 2013 05:27:49 GMT Message-Id: <201301170527.r0H5RnqL042569@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1143 - trunk/Mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2013 05:28:03 -0000 Author: jbeich Date: Thu Jan 17 05:27:49 2013 New Revision: 1143 Log: chase r1100 for GIO option Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Mon Jan 14 01:55:30 2013 (r1142) +++ trunk/Mk/bsd.gecko.mk Thu Jan 17 05:27:49 2013 (r1143) @@ -707,7 +707,7 @@ MOZ_OPTIONS+= --disable-gconf .endif -.if ${PORT_OPTIONS:MGIO} && ! ${PORT_OPTIONS:MQT4} +.if ${PORT_OPTIONS:MGIO} && ! ${MOZ_TOOLKIT:Mcairo-qt} MOZ_OPTIONS+= --enable-gio .else MOZ_OPTIONS+= --disable-gio From owner-freebsd-gecko@FreeBSD.ORG Fri Jan 18 16:47:11 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 81F99A5E for ; Fri, 18 Jan 2013 16:47:11 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 25F4272A for ; Fri, 18 Jan 2013 16:47:10 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0IGl93V044015 for ; Fri, 18 Jan 2013 16:47:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0IGl4OO042962 for freebsd-gecko@freebsd.org; Fri, 18 Jan 2013 16:47:04 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 18 Jan 2013 16:47:04 GMT Message-Id: <201301181647.r0IGl4OO042962@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1144 - in trunk/www: firefox firefox-nightly firefox-nightly/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2013 16:47:11 -0000 Author: jbeich Date: Fri Jan 18 16:47:04 2013 New Revision: 1144 Log: update Deleted: trunk/www/firefox-nightly/files/patch-bug828003 Modified: trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox/Makefile trunk/www/firefox/distinfo Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Thu Jan 17 05:27:49 2013 (r1143) +++ trunk/www/firefox-nightly/Makefile.hgrev Fri Jan 18 16:47:04 2013 (r1144) @@ -1 +1 @@ -HGREV= 118722:43d65f5d22b2 +HGREV= 119127:b52c02f77cf5 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Thu Jan 17 05:27:49 2013 (r1143) +++ trunk/www/firefox-nightly/distinfo Fri Jan 18 16:47:04 2013 (r1144) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/43d65f5d22b2.tar.bz2) = 0e4f6c8765a182814e2b349e8ce6c202e8bc2719983ff4b59814d31aef0cc0b3 -SIZE (firefox-nightly/43d65f5d22b2.tar.bz2) = 98245517 +SHA256 (firefox-nightly/b52c02f77cf5.tar.bz2) = 1e64e6907fbaf4b72cacf91a40143c24ba128733d9d26fa2781decdf42d261e8 +SIZE (firefox-nightly/b52c02f77cf5.tar.bz2) = 98505599 Deleted: trunk/www/firefox-nightly/files/patch-bug828003 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug828003 Fri Jan 18 16:47:04 2013 (r1143) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,36 +0,0 @@ ---- gfx/qcms/qcmstypes.h -+++ gfx/qcms/qcmstypes.h -@@ -7,30 +7,12 @@ - #include "mozilla/StandardInteger.h" - - /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */ -+/* StandardInteger.h defines int*_t and uintptr_t */ - --#if defined (__SVR4) && defined (__sun) --/* int_types.h gets included somehow, so avoid redefining the types differently */ --#include --#elif defined (_AIX) -+#if defined(_AIX) - #include --#elif defined(__OpenBSD__) --#include --#elif !defined(ANDROID) --typedef int8_t int8_t; --typedef uint8_t uint8_t; --typedef int16_t int16_t; --typedef uint16_t uint16_t; --typedef int32_t int32_t; --typedef uint32_t uint32_t; --typedef int64_t int64_t; --typedef uint64_t uint64_t; -- --#ifdef __OS2__ --/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ -+#elif defined(__OS2__) - #include --#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED) --typedef unsigned long uintptr_t; --#endif - #endif - - #else // MOZ_QCMS Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Thu Jan 17 05:27:49 2013 (r1143) +++ trunk/www/firefox/Makefile Fri Jan 18 16:47:04 2013 (r1144) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 19.0b1 +DISTVERSION= 19.0b2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Thu Jan 17 05:27:49 2013 (r1143) +++ trunk/www/firefox/distinfo Fri Jan 18 16:47:04 2013 (r1144) @@ -1,2 +1,2 @@ -SHA256 (firefox-19.0b1.source.tar.bz2) = f46c5641c8fc06fab7a2f6ce977f9ee3c7c783fb23e01a6fc3a9299aa91e8f40 -SIZE (firefox-19.0b1.source.tar.bz2) = 99068309 +SHA256 (firefox-19.0b2.source.tar.bz2) = 2430d20cbc23d2c7483757cc7bbd7303cd12d8fe749bd6a7e6069bb69f7cb6fe +SIZE (firefox-19.0b2.source.tar.bz2) = 98893896 From owner-freebsd-gecko@FreeBSD.ORG Fri Jan 18 17:49:54 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 55D1FD4B for ; Fri, 18 Jan 2013 17:49:54 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (neu.net [199.48.129.194]) by mx1.freebsd.org (Postfix) with ESMTP id F3945C42 for ; Fri, 18 Jan 2013 17:49:53 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.6/8.14.5) with ESMTP id r0IHnjHa033327 for ; Fri, 18 Jan 2013 12:49:46 -0500 (EST) (envelope-from andy@neu.net) Date: Fri, 18 Jan 2013 12:49:45 -0500 (EST) From: AN To: freebsd-gecko@freebsd.org Subject: Re: [SVN-Commit] r1144 - in trunk/www: firefox firefox-nightly firefox-nightly/files In-Reply-To: <201301181647.r0IGl4OO042962@trillian.chruetertee.ch> Message-ID: References: <201301181647.r0IGl4OO042962@trillian.chruetertee.ch> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Virus-Scanned: clamav-milter 0.97.6 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=4.5 tests=RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2013 17:49:54 -0000 In file included from ../../dist/stl_wrappers/algorithm:38: ../../dist/include/mozilla/mozalloc.h:204:7: error: conflicting types for 'operator new' void* operator new(size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:198:7: note: previous definition is here void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC ^ ../../dist/include/mozilla/mozalloc.h:216:7: error: conflicting types for 'operator new[]' void* operator new[](size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:210:7: note: previous definition is here void* operator new[](size_t size) MOZALLOC_THROW_BAD_ALLOC ^ ../../dist/include/mozilla/mozalloc.h:228:6: error: conflicting types for 'operator delete' void operator delete(void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:222:6: note: previous definition is here void operator delete(void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:240:6: error: conflicting types for 'operator delete[]' void operator delete[](void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:234:6: note: previous definition is here void operator delete[](void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:266:7: error: conflicting types for 'operator new' void* operator new(size_t size, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:198:7: note: previous definition is here void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC ^ ../../dist/include/mozilla/mozalloc.h:272:7: error: conflicting types for 'operator new[]' void* operator new[](size_t size, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:210:7: note: previous definition is here void* operator new[](size_t size) MOZALLOC_THROW_BAD_ALLOC ^ ../../dist/include/mozilla/mozalloc.h:278:6: error: conflicting types for 'operator delete' void operator delete(void* ptr, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:222:6: note: previous definition is here void operator delete(void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:284:6: error: conflicting types for 'operator delete[]' void operator delete[](void* ptr, const mozilla::fallible_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ ../../dist/include/mozilla/mozalloc.h:234:6: note: previous definition is here void operator delete[](void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS ^ In file included from /usr/ports/www/FF_nightly/work/mozilla-central-b52c02f77cf5/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp:11: In file included from ../../dist/stl_wrappers/algorithm:54: In file included from ../../dist/system_wrappers/algorithm:2: In file included from /usr/include/c++/4.2/algorithm:64: In file included from /usr/include/c++/4.2/bits/stl_algobase.h:66: In file included from ../../dist/stl_wrappers/cstring:54: In file included from ../../dist/system_wrappers/cstring:2: /usr/include/c++/4.2/cstring:100:3: error: declaration conflicts with target of using declaration already in scope memchr(void* __p, int __c, size_t __n) ^ /usr/include/string.h:57:7: note: target of using declaration void *memchr(const void *, int, size_t) __pure; ^ /usr/include/c++/4.2/cstring:97:11: note: using declaration using ::memchr; ^ /usr/include/c++/4.2/cstring:106:3: error: declaration conflicts with target of using declaration already in scope strchr(char* __s1, int __n) ^ /usr/include/string.h:76:7: note: target of using declaration char *strchr(const char *, int) __pure; ^ /usr/include/c++/4.2/cstring:103:11: note: using declaration using ::strchr; ^ /usr/include/c++/4.2/cstring:112:3: error: declaration conflicts with target of using declaration already in scope strpbrk(char* __s1, const char* __s2) ^ /usr/include/string.h:106:7: note: target of using declaration char *strpbrk(const char *, const char *) __pure; ^ /usr/include/c++/4.2/cstring:109:11: note: using declaration using ::strpbrk; ^ /usr/include/c++/4.2/cstring:118:3: error: declaration conflicts with target of using declaration already in scope strrchr(char* __s1, int __n) ^ /usr/include/string.h:107:7: note: target of using declaration char *strrchr(const char *, int) __pure; ^ /usr/include/c++/4.2/cstring:115:11: note: using declaration using ::strrchr; ^ /usr/include/c++/4.2/cstring:124:3: error: declaration conflicts with target of using declaration already in scope strstr(char* __s1, const char* __s2) ^ /usr/include/string.h:115:7: note: target of using declaration char *strstr(const char *, const char *) __pure; ^ /usr/include/c++/4.2/cstring:121:11: note: using declaration using ::strstr; ^ In file included from /usr/ports/www/FF_nightly/work/mozilla-central-b52c02f77cf5/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp:11: In file included from ../../dist/stl_wrappers/algorithm:54: In file included from ../../dist/system_wrappers/algorithm:2: In file included from /usr/include/c++/4.2/algorithm:64: In file included from /usr/include/c++/4.2/bits/stl_algobase.h:68: In file included from ../../dist/stl_wrappers/cstdlib:54: In file included from ../../dist/system_wrappers/cstdlib:2: /usr/include/c++/4.2/cstdlib:142:3: error: declaration conflicts with target of using declaration already in scope abs(long __i) { return labs(__i); } ^ /usr/include/stdlib.h:83:6: note: target of using declaration int abs(int) __pure2; ^ /usr/include/c++/4.2/cstdlib:109:11: note: using declaration using ::abs; ^ /usr/include/c++/4.2/cstdlib:145:3: error: declaration conflicts with target of using declaration already in scope div(long __i, long __j) { return ldiv(__i, __j); } ^ /usr/include/stdlib.h:91:8: note: target of using declaration div_t div(int, int) __pure2; ^ /usr/include/c++/4.2/cstdlib:116:11: note: using declaration using ::div; ^ In file included from /usr/ports/www/FF_nightly/work/mozilla-central-b52c02f77cf5/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp:11: In file included from ../../dist/stl_wrappers/algorithm:54: In file included from ../../dist/system_wrappers/algorithm:2: In file included from /usr/include/c++/4.2/algorithm:64: In file included from /usr/include/c++/4.2/bits/stl_algobase.h:70: In file included from /usr/include/c++/4.2/iosfwd:48: In file included from /usr/include/c++/4.2/bits/postypes.h:45: In file included from ../../dist/stl_wrappers/cwchar:54: /usr/include/c++/4.2/cwchar:210:3: error: declaration conflicts with target of using declaration already in scope wcschr(wchar_t* __p, wchar_t __c) ^ /usr/include/wchar.h:135:10: note: target of using declaration wchar_t *wcschr(const wchar_t *, wchar_t) __pure; ^ /usr/include/c++/4.2/cwchar:207:11: note: using declaration using ::wcschr; ^ /usr/include/c++/4.2/cwchar:216:3: error: declaration conflicts with target of using declaration already in scope wcspbrk(wchar_t* __s1, const wchar_t* __s2) ^ /usr/include/wchar.h:147:10: note: target of using declaration wchar_t *wcspbrk(const wchar_t *, const wchar_t *) __pure; ^ /usr/include/c++/4.2/cwchar:213:11: note: using declaration using ::wcspbrk; ^ /usr/include/c++/4.2/cwchar:222:3: error: declaration conflicts with target of using declaration already in scope wcsrchr(wchar_t* __p, wchar_t __c) ^ /usr/include/wchar.h:148:10: note: target of using declaration wchar_t *wcsrchr(const wchar_t *, wchar_t) __pure; ^ /usr/include/c++/4.2/cwchar:219:11: note: using declaration using ::wcsrchr; ^ /usr/include/c++/4.2/cwchar:228:3: error: declaration conflicts with target of using declaration already in scope wcsstr(wchar_t* __s1, const wchar_t* __s2) ^ /usr/include/wchar.h:152:10: note: target of using declaration wchar_t *wcsstr(const wchar_t * __restrict, const wchar_t * __restrict) ^ /usr/include/c++/4.2/cwchar:225:11: note: using declaration using ::wcsstr; ^ fatal error: too many errors emitted, stopping now [-ferror-limit=] 20 errors generated. gmake[4]: *** [nsGnomeVFSProtocolHandler.o] Error 1 gmake[4]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-central-b52c02f77cf5/obj-x86_64-portbld-freebsd10.0/extensions/gnomevfs' gmake[3]: *** [gnomevfs_libs] Error 2 gmake[3]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-central-b52c02f77cf5/obj-x86_64-portbld-freebsd10.0/extensions' gmake[2]: *** [libs_tier_app] Error 2 gmake[2]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-central-b52c02f77cf5/obj-x86_64-portbld-freebsd10.0' gmake[1]: *** [tier_app] Error 2 gmake[1]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-central-b52c02f77cf5/obj-x86_64-portbld-freebsd10.0' gmake: *** [default] Error 2 *** [do-build] Error code 1 Stop in /usr/ports/www/FF_nightly. *** [/usr/ports/www/FF_nightly/work/.build_done.firefox._usr_local] Error code 1 Stop in /usr/ports/www/FF_nightly. *** [build] Error code 1 From owner-freebsd-gecko@FreeBSD.ORG Fri Jan 18 18:34:29 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A879F520; Fri, 18 Jan 2013 18:34:29 +0000 (UTC) (envelope-from awarecons@gmail.com) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com [209.85.223.182]) by mx1.freebsd.org (Postfix) with ESMTP id 6DE9DEEF; Fri, 18 Jan 2013 18:34:29 +0000 (UTC) Received: by mail-ie0-f182.google.com with SMTP id s9so6709985iec.13 for ; Fri, 18 Jan 2013 10:34:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:content-type; bh=2g9P2EBPVf1lfTxIMS35f0gGmD0i0Mi9/+XS+Zyp5gY=; b=FeWk+vviRW+B2Aw7+jTrvGQNeICg5mFKhcZvjjDWNNpX1dP8A3hPCVAJjWWXOS5s3W 54fM9G9gFPLN6x8qWHzwIjs1tNz0/+v8ef+PND3BNjnQesfwFxhCNrniOVJh15Eidrf2 wOJlDtdYNdJhaMGpaAX3iOco0eKnOc82vNSK43dzxUZ4IKiw4rDCqQg5+MqiWdxBUzWA XkLTxNoqqNz6F3gXGtOaWQCe+ILKzB70/12T921QhvN9yzAYCVgdJXaJfEtqqbN9wOVt oQSo62cOvFcoSyxiS+j48ZpJ1vQ4q4fbEovfFuDpCPptfONpvz4TShHJAYch1kaeuMpL 5YWQ== MIME-Version: 1.0 X-Received: by 10.50.188.199 with SMTP id gc7mr2878074igc.4.1358534068839; Fri, 18 Jan 2013 10:34:28 -0800 (PST) Received: by 10.64.176.175 with HTTP; Fri, 18 Jan 2013 10:34:28 -0800 (PST) In-Reply-To: References: Date: Fri, 18 Jan 2013 22:34:28 +0400 Message-ID: Subject: Re: www/firefox [18.0,1] compilation error From: awarecons To: ports@freebsd.org, ports-bugs@freebsd.org, gecko@FreeBSD.org Content-Type: text/plain; charset=ISO-8859-1 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2013 18:34:29 -0000 Looks a bit variative (after patches of January, 11th?): g++46 -o Debugger.o -c -I./../../dist/system_wrappers_js -include /usr/ports/www/firefox/work/mozilla-release/js/src/config/gcc_hidden.h -DENABLE_TYPEDARRAY_MOVE -DENABLE_YARR_JIT=1 -DMOZ_GLUE_IN_PROGRAM -DEXPORT_JS_API -DJS_HAS_CTYPES -DDLL_PREFIX=\"lib\" -DDLL_SUFFIX=\".so\" -DNO_NSPR_10_SUPPORT -DUSE_ZLIB -I/usr/local/lib/libffi-3.0.9/include -I. -I/usr/ports/www/firefox/work/mozilla-release/js/src/../../mfbt/double-conversion -I/usr/ports/www/firefox/work/mozilla-release/js/src -I. -I./../../dist/include -I/usr/local/include/nspr -I/usr/ports/www/firefox/work/mozilla-release/js/src -I/usr/ports/www/firefox/work/mozilla-release/js/src/assembler -I/usr/ports/www/firefox/work/mozilla-release/js/src/yarr -fPIC -O2 -pipe -march=pentium4 -mtune=pentium4 -Wno-error -w -isystem/usr/local/include -I/usr/local/include -Wall -Wpointer-arith -Woverloaded-virtual -Werror=return-type -Wtype-limits -Wempty-body -Werror=conversion-null -Wno-ctor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros -Wcast-align -O2 -pipe -march=pentium4 -mtune=pentium4 -Wl,-rpath=/usr/local/lib/gcc46 -fno-strict-aliasing -O2 -pipe -march=pentium4 -mtune=pentium4 -Wno-error -w -Wl,-rpath=/usr/local/lib/gcc46 -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -pipe -DNDEBUG -DTRIMMED -fprofile-use -fprofile-correction -Wcoverage-mismatch -O2 -fomit-frame-pointer -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 -O2 -pipe -march=pentium4 -mtune=pentium4 -Wno-error -w -isystem/usr/local/include -I/usr/local/include -DMOZILLA_CLIENT -include ./js-confdefs.h -MD -MF .deps/Debugger.o.pp /usr/ports/www/firefox/work/mozilla-release/js/src/vm/Debugger.cpp /usr/ports/www/firefox/work/mozilla-release/js/src/vm/Debugger.cpp: In static member function 'static JSTrapStatus js::Debugger::onSingleStep(JSContext*, JS::Value*)': /usr/ports/www/firefox/work/mozilla-release/js/src/vm/Debugger.cpp:1170:14: error: 'frame' was not declared in this scope gmake[5]: *** [Debugger.o] Error 1 2013/1/13 awarecons : > gmake[6]: Entering directory > `/usr/ports/www/firefox/work/mozilla-release/obj-i386-portbld-freebsd9.0/layout/style' > g++46 -o nsCSSRuleProcessor.i_o -c -I../../dist/stl_wrappers > -I../../dist/system_wrappers -include > /usr/ports/www/firefox/work/mozilla-release/config/gcc_hidden.h > -DMOZ_GLUE_IN_PROGRAM -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM > -DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET > -DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES -DSTATIC_EXPORTABLE_JS_API > -DEXCLUDE_SKIA_DEPENDENCIES -DOS_POSIX=1 -DOS_FREEBSD=1 -DOS_BSD=1 > -D_IMPL_NS_LAYOUT > -I/usr/ports/www/firefox/work/mozilla-release/ipc/chromium/src > -I/usr/ports/www/firefox/work/mozilla-release/ipc/glue > -I../../ipc/ipdl/_ipdlheaders > -I/usr/ports/www/firefox/work/mozilla-release/layout/style/../base > -I/usr/ports/www/firefox/work/mozilla-release/layout/style/../generic > -I/usr/ports/www/firefox/work/mozilla-release/layout/style/../xul/base/src > -I/usr/ports/www/firefox/work/mozilla-release/layout/style/../../content/base/src > -I/usr/ports/www/firefox/work/mozilla-release/layout/style/../../content/html/content/src > -I/usr/ports/www/firefox/work/mozilla-release/layout/style/../../content/xbl/src > -I/usr/ports/www/firefox/work/mozilla-release/layout/style/../../content/xul/document/src > -I/usr/ports/www/firefox/work/mozilla-release/layout/style -I. > -I../../dist/include -I/usr/local/include/nspr > -I/usr/local/include/nss -I/usr/local/include/nss/nss > -I/usr/local/include -I/usr/local/include -fPIC -O2 -pipe > -march=pentium4 -mtune=pentium4 -Wno-error -w > -isystem/usr/local/include -I/usr/local/include -Wall -Wpointer-arith > -Woverloaded-virtual -Werror=return-type -Wtype-limits -Wempty-body > -Werror=conversion-null -Wno-ctor-dtor-privacy -Wno-overlength-strings > -Wno-invalid-offsetof -Wno-variadic-macros -Wcast-align -O2 -pipe > -march=pentium4 -mtune=pentium4 -Wl,-rpath=/usr/local/lib/gcc46 > -fno-strict-aliasing -O2 -pipe -march=pentium4 -mtune=pentium4 > -Wno-error -w -Wl,-rpath=/usr/local/lib/gcc46 -fno-exceptions > -fno-strict-aliasing -fno-rtti -ffunction-sections -fdata-sections > -fno-exceptions -std=gnu++0x -pipe -DNDEBUG -DTRIMMED > -fprofile-generate -O2 -fomit-frame-pointer -O2 -pipe -march=pentium4 > -mtune=pentium4 -Wno-error -w -isystem/usr/local/include > -I/usr/local/include -DMOZILLA_CLIENT -include ../../mozilla-config.h > -MD -MF .deps/nsCSSRuleProcessor.i_o.pp > /usr/ports/www/firefox/work/mozilla-release/layout/style/nsCSSRuleProcessor.cpp > /usr/ports/www/firefox/work/mozilla-release/layout/style/nsCSSRuleProcessor.cpp: > In function 'bool SelectorMatches(mozilla::dom::Element*, > nsCSSSelector*, NodeMatchContext&, TreeMatchContext&, bool*)': > /usr/ports/www/firefox/work/mozilla-release/layout/style/nsCSSRuleProcessor.cpp:1790:9: > error: expected ';' before '{' token > /usr/ports/www/firefox/work/mozilla-release/layout/style/nsCSSRuleProcessor.cpp:3301:1: > error: expected '}' at end of input > /usr/ports/www/firefox/work/mozilla-release/layout/style/nsCSSRuleProcessor.cpp:3301:1: > error: expected '}' at end of input > /usr/ports/www/firefox/work/mozilla-release/layout/style/nsCSSRuleProcessor.cpp:3301:1: > error: expected '}' at end of input > /usr/ports/www/firefox/work/mozilla-release/layout/style/nsCSSRuleProcessor.cpp:3301:1: > error: expected '}' at end of input > gmake[6]: *** [nsCSSRuleProcessor.i_o] Error 1 > gmake[6]: Leaving directory > `/usr/ports/www/firefox/work/mozilla-release/obj-i386-portbld-freebsd9.0/layout/style' > gmake[5]: *** [style_libs] Error 2 > gmake[5]: Leaving directory > `/usr/ports/www/firefox/work/mozilla-release/obj-i386-portbld-freebsd9.0/layout' > gmake[4]: *** [libs_tier_platform] Error 2 > gmake[4]: Leaving directory > `/usr/ports/www/firefox/work/mozilla-release/obj-i386-portbld-freebsd9.0' > gmake[3]: *** [tier_platform] Error 2 > gmake[3]: Leaving directory > `/usr/ports/www/firefox/work/mozilla-release/obj-i386-portbld-freebsd9.0' > gmake[2]: *** [default] Error 2 > gmake[2]: Leaving directory > `/usr/ports/www/firefox/work/mozilla-release/obj-i386-portbld-freebsd9.0' > gmake[1]: *** [realbuild] Error 2 > gmake[1]: Leaving directory > `/usr/ports/www/firefox/work/mozilla-release/obj-i386-portbld-freebsd9.0' > gmake: *** [profiledbuild] Error 2 > *** Error code 1 > > Stop in /usr/ports/www/firefox. > *** Error code 1 > > Stop in /usr/ports/www/firefox. From owner-freebsd-gecko@FreeBSD.ORG Fri Jan 18 22:07:01 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7A3825C0 for ; Fri, 18 Jan 2013 22:07:01 +0000 (UTC) (envelope-from roberthuff@rcn.com) Received: from smtp02.lnh.mail.rcn.net (smtp02.lnh.mail.rcn.net [207.172.157.102]) by mx1.freebsd.org (Postfix) with ESMTP id 2A487A36 for ; Fri, 18 Jan 2013 22:07:00 +0000 (UTC) Received: from mr17.lnh.mail.rcn.net ([207.172.157.37]) by smtp02.lnh.mail.rcn.net with ESMTP; 18 Jan 2013 17:06:55 -0500 Received: from smtp01.lnh.mail.rcn.net (smtp01.lnh.mail.rcn.net [207.172.4.11]) by mr17.lnh.mail.rcn.net (MOS 4.3.4-GA) with ESMTP id BWV22629; Fri, 18 Jan 2013 17:06:54 -0500 X-Auth-ID: roberthuff@rcn.com Received: from 209-6-84-183.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com (HELO jerusalem.litteratus.org.litteratus.org) ([209.6.84.183]) by smtp01.lnh.mail.rcn.net with ESMTP; 18 Jan 2013 17:06:55 -0500 From: Robert Huff MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <20729.51070.126628.835506@jerusalem.litteratus.org> Date: Fri, 18 Jan 2013 17:06:54 -0500 To: gecko@freebsd.org Subject: problem building FireFox X-Auth-ID: roberthuff@rcn.com X-Mailer: VM 7.17 under 21.4 (patch 22) "Instant Classic" XEmacs Lucid X-Junkmail-Whitelist: YES (by domain whitelist at mr17.lnh.mail.rcn.net) X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2013 22:07:01 -0000 DQoJICBPbiBhIHN5c3RlbSBydW5uaW5nOg0KDQpGcmVlQlNEIDEwLjAtQ1VSUkVOVCAjMDog U3VuIERlYyAzMCAxMjo1MjowOSBFU1QgMjAxMiAgYW1kNjQgDQoNCgkgICBJIHRyeSB0byBj b21waWxlIEZpcmVGb3gtMTggYW5kIGdldDoNCg0KZ21ha2VbNV06IEVudGVyaW5nIGRpcmVj dG9yeSBgL2RhdGEvcG9ydC13b3JrL3Vzci9wb3J0cy93d3cvZmlyZWZveC93b3JrL21vemls bGEtcmVsZWFzZS9vYmoteDg2XzY0LXBvcnRibGQtZnJlZWJzZDEwLjAvbWVkaWEvbXRyYW5z cG9ydC90aGlyZF9wYXJ0eS9uSUNFci9uaWNlcl9uaWNlcicNCmdjYzQ2IC1vIHNyYy91dGls L21ic2xlbi5vIC1jIC1JLi4vLi4vLi4vLi4vLi4vZGlzdC9zeXN0ZW1fd3JhcHBlcnMgLWlu Y2x1ZGUgL2RhdGEvcG9ydC13b3JrL3Vzci9wb3J0cy93d3cvZmlyZWZveC93b3JrL21vemls bGEtcmVsZWFzZS9jb25maWcvZ2NjX2hpZGRlbi5oIC1ETU9aX0dMVUVfSU5fUFJPR1JBTSAt RF9GSUxFX09GRlNFVF9CSVRTPTY0IC1EQ0hST01JVU1fQlVJTEQgLURVU0VfTlNTPTEgLURH VEtfRElTQUJMRV9TSU5HTEVfSU5DTFVERVM9MSAtREVOQUJMRV9SRU1PVElORz0xIC1ERU5B QkxFX1dFQlJUQz0xIC1ERU5BQkxFX0NPTkZJR1VSQVRJT05fUE9MSUNZIC1ERU5BQkxFX0lO UFVUX1NQRUVDSCAtREVOQUJMRV9OT1RJRklDQVRJT05TIC1ERU5BQkxFX0dQVT0xIC1ERU5B QkxFX0VHTElNQUdFPTEgLURVU0VfU0tJQT0xIC1ERU5BQkxFX1RBU0tfTUFOQUdFUj0xIC1E RU5BQkxFX1dFQl9JTlRFTlRTPTEgLURFTkFCTEVfRVhURU5TSU9OUz0xIC1ERU5BQkxFX1BM VUdJTl9JTlNUQUxMQVRJT049MSAtREVOQUJMRV9QUk9URUNUT1JfU0VSVklDRT0xIC1ERU5B QkxFX1NFU1NJT05fU0VSVklDRT0xIC1ERU5BQkxFX1RIRU1FUz0xIC1ERU5BQkxFX0JBQ0tH Uk9VTkQ9MSAtREVOQUJMRV9BVVRPTUFUSU9OPTEgLURFTkFCTEVfUFJJTlRJTkc9MSAtREVO QUJMRV9DQVBUSVZFX1BPUlRBTF9ERVRFQ1RJT049MSAtRFNBTklUWV9DSEVDS1MgLURVU0Vf VFVSTiAtRFVTRV9JQ0UgLURVU0VfUkZDXzM0ODlfQkFDS1dBUkRTX0NPTVBBVElCTEUgLURV U0VfU1RVTkRfMF85NiAtRFVTRV9TVFVOX1BFREFOVElDIC1ETlJfU09DS0VUX0lTX1ZPSURf UFRSIC1EcmVzdHJpY3Q9IC1EUl9QTEFURk9STV9JTlRfVFlQRVM9JyJtb3ppbGxhL1N0YW5k YXJkSW50ZWdlci5oIicgLURSX0RFRklORURfSU5UMj1pbnQxNl90IC1EUl9ERUZJTkVEX1VJ TlQyPXVpbnQxNl90IC1EUl9ERUZJTkVEX0lOVDQ9aW50MzJfdCAtRFJfREVGSU5FRF9VSU5U ND11aW50MzJfdCAtRFJfREVGSU5FRF9JTlQ4PWludDY0X3QgLURSX0RFRklORURfVUlOVDg9 dWludDY0X3QgLURCU0QgLURIQVZFX0xJQk09MSAtREhBVkVfU1RSRFVQPTEgLURIQVZFX1NU UkxDUFk9MSAtREhBVkVfU1lTX1RJTUVfSD0xIC1ESEFWRV9WRlBSSU5URj0xIC1ETkVXX1NU RElPUkVUU0lHVFlQRT12b2lkIC1EVElNRV9XSVRIX1NZU19USU1FX0g9MSAtRF9fVU5VU0VE X189Il9fYXR0cmlidXRlX18oKHVudXNlZCkpIiAtRE5ERUJVRyAtRE5WQUxHUklORCAtRERZ TkFNSUNfQU5OT1RBVElPTlNfRU5BQkxFRD0wIC1JLiAtSS9kYXRhL3BvcnQtd29yay91c3Iv cG9ydHMvd3d3L2ZpcmVmb3gvd29yay9tb3ppbGxhLXJlbGVhc2UvbWVkaWEvbXRyYW5zcG9y dC90aGlyZF9wYXJ0eS9uSUNFci8vLi4vbnJhcHBraXQvc3JjL2V2ZW50IC1JL2RhdGEvcG9y dC13b3JrL3Vzci9wb3J0cy93d3cvZmlyZWZveC93b3JrL21vemlsbGEtcmVsZWFzZS9tZWRp YS9tdHJhbnNwb3J0L3RoaXJkX3BhcnR5L25JQ0VyLy8uLi9ucmFwcGtpdC9zcmMvbG9nIC1J L2RhdGEvcG9ydC13b3JrL3Vzci9wb3J0cy93d3cvZmlyZWZveC93b3JrL21vemlsbGEtcmVs ZWFzZS9tZWRpYS9tdHJhbnNwb3J0L3RoaXJkX3BhcnR5L25JQ0VyLy8uLi9ucmFwcGtpdC9z cmMvcGx1Z2luIC1JL2RhdGEvcG9ydC13b3JrL3Vzci9wb3J0cy93d3cvZmlyZWZveC93b3Jr L21vemlsbGEtcmVsZWFzZS9tZWRpYS9tdHJhbnNwb3J0L3RoaXJkX3BhcnR5L25JQ0VyLy8u Li9ucmFwcGtpdC9zcmMvcmVnaXN0cnkgLUkvZGF0YS9wb3J0LXdvcmsvdXNyL3BvcnRzL3d3 dy9maXJlZm94L3dvcmsvbW96aWxsYS1yZWxlYXNlL21lZGlhL210cmFuc3BvcnQvdGhpcmRf cGFydHkvbklDRXIvLy4uL25yYXBwa2l0L3NyYy9zaGFyZSAtSS9kYXRhL3BvcnQtd29yay91 c3IvcG9ydHMvd3d3L2ZpcmVmb3gvd29yay9tb3ppbGxhLXJlbGVhc2UvbWVkaWEvbXRyYW5z cG9ydC90aGlyZF9wYXJ0eS9uSUNFci8vLi4vbnJhcHBraXQvc3JjL3N0YXRzIC1JL2RhdGEv cG9ydC13b3JrL3Vzci9wb3J0cy93d3cvZmlyZWZveC93b3JrL21vemlsbGEtcmVsZWFzZS9t ZWRpYS9tdHJhbnNwb3J0L3RoaXJkX3BhcnR5L25JQ0VyLy8uLi9ucmFwcGtpdC9zcmMvdXRp bCAtSS9kYXRhL3BvcnQtd29yay91c3IvcG9ydHMvd3d3L2ZpcmVmb3gvd29yay9tb3ppbGxh LXJlbGVhc2UvbWVkaWEvbXRyYW5zcG9ydC90aGlyZF9wYXJ0eS9uSUNFci8vLi4vbnJhcHBr aXQvc3JjL3V0aWwvbGliZWtyIC1JL2RhdGEvcG9ydC13b3JrL3Vzci9wb3J0cy93d3cvZmly ZWZveC93b3JrL21vemlsbGEtcmVsZWFzZS9tZWRpYS9tdHJhbnNwb3J0L3RoaXJkX3BhcnR5 L25JQ0VyLy8uLi9ucmFwcGtpdC9zcmMvcG9ydC9nZW5lcmljL2luY2x1ZGUgLUkvZGF0YS9w b3J0LXdvcmsvdXNyL3BvcnRzL3d3dy9maXJlZm94L3dvcmsvbW96aWxsYS1yZWxlYXNlL21l ZGlhL210cmFuc3BvcnQvdGhpcmRfcGFydHkvbklDRXIvLy4vc3JjL2NyeXB0byAtSS9kYXRh L3BvcnQtd29yay91c3IvcG9ydHMvd3d3L2ZpcmVmb3gvd29yay9tb3ppbGxhLXJlbGVhc2Uv bWVkaWEvbXRyYW5zcG9ydC90aGlyZF9wYXJ0eS9uSUNFci8vLi9zcmMvaWNlIC1JL2RhdGEv cG9ydC13b3JrL3Vzci9wb3J0cy93d3cvZmlyZWZveC93b3JrL21vemlsbGEtcmVsZWFzZS9t ZWRpYS9tdHJhbnNwb3J0L3RoaXJkX3BhcnR5L25JQ0VyLy8uL3NyYy9uZXQgLUkvZGF0YS9w b3J0LXdvcmsvdXNyL3BvcnRzL3d3dy9maXJlZm94L3dvcmsvbW96aWxsYS1yZWxlYXNlL21l ZGlhL210cmFuc3BvcnQvdGhpcmRfcGFydHkvbklDRXIvLy4vc3JjL3N0dW4gLUkvZGF0YS9w b3J0LXdvcmsvdXNyL3BvcnRzL3d3dy9maXJlZm94L3dvcmsvbW96aWxsYS1yZWxlYXNlL21l ZGlhL210cmFuc3BvcnQvdGhpcmRfcGFydHkvbklDRXIvLy4vc3JjL3V0aWwgLUkuLi8uLi8u Li8uLi8uLi9kaXN0L2luY2x1ZGUgLUkvZGF0YS9wb3J0LXdvcmsvdXNyL3BvcnRzL3d3dy9m aXJlZm94L3dvcmsvbW96aWxsYS1yZWxlYXNlL21lZGlhL210cmFuc3BvcnQvdGhpcmRfcGFy dHkvbklDRXIvLy4uL25yYXBwa2l0L3NyYy9wb3J0L2Rhcndpbi9pbmNsdWRlICAtZlBJQyAt aXN5c3RlbS91c3IvbG9jYWwvaW5jbHVkZSAgLUkvdXNyL2xvY2FsL2luY2x1ZGUgLVdhbGwg LVdwb2ludGVyLWFyaXRoIC1XZGVjbGFyYXRpb24tYWZ0ZXItc3RhdGVtZW50IC1XZXJyb3I9 cmV0dXJuLXR5cGUgLVd0eXBlLWxpbWl0cyAtV2VtcHR5LWJvZHkgLVduby11bnVzZWQgLVdu by1vdmVybGVuZ3RoLXN0cmluZ3MgLVdjYXN0LWFsaWduIC1PIC1waXBlIC1nIC1XbCwtcnBh dGg9L3Vzci9sb2NhbC9saWIvZ2NjNDYgLWZuby1zdHJpY3QtYWxpYXNpbmcgLWZmdW5jdGlv bi1zZWN0aW9ucyAtZmRhdGEtc2VjdGlvbnMgLXBpcGUgLUROREVCVUcgLURUUklNTUVEIC1m bm8tb21pdC1mcmFtZS1wb2ludGVyICAtV2FsbCAtV25vLXBhcmVudGhlc2VzIC1Xbm8tc3Ry aWN0LXByb3RvdHlwZXMgLVdtaXNzaW5nLXByb3RvdHlwZXMgICAtaXN5c3RlbS91c3IvbG9j YWwvaW5jbHVkZSAgLUkvdXNyL2xvY2FsL2luY2x1ZGUgLWluY2x1ZGUgLi4vLi4vLi4vLi4v Li4vbW96aWxsYS1jb25maWcuaCAtRE1PWklMTEFfQ0xJRU5UIC1NRCAtTUYgLmRlcHMvbWJz bGVuLm8ucHAgIC9kYXRhL3BvcnQtd29yay91c3IvcG9ydHMvd3d3L2ZpcmVmb3gvd29yay9t b3ppbGxhLXJlbGVhc2UvbWVkaWEvbXRyYW5zcG9ydC90aGlyZF9wYXJ0eS9uSUNFci9zcmMv dXRpbC9tYnNsZW4uYw0KSW4gZmlsZSBpbmNsdWRlZCBmcm9tIC91c3IvaW5jbHVkZS94bG9j YWxlLmg6Nzc6MCwNCiAgICAgICAgICAgICAgICAgZnJvbSAuLi8uLi8uLi8uLi8uLi9kaXN0 L3N5c3RlbV93cmFwcGVycy94bG9jYWxlLmg6MywNCiAgICAgICAgICAgICAgICAgZnJvbSAv ZGF0YS9wb3J0LXdvcmsvdXNyL3BvcnRzL3d3dy9maXJlZm94L3dvcmsvbW96aWxsYS1yZWxl YXNlL21lZGlhL210cmFuc3BvcnQvdGhpcmRfcGFydHkvbklDRXIvc3JjL3V0aWwvbWJzbGVu LmM6NTU6DQovdXNyL2luY2x1ZGUveGxvY2FsZS9fd2NoYXIuaDo1ODoyMDogZXJyb3I6IHVu a25vd24gdHlwZSBuYW1lICdGSUxFJw0KL3Vzci9pbmNsdWRlL3hsb2NhbGUvX3djaGFyLmg6 NTk6NDg6IGVycm9yOiB1bmtub3duIHR5cGUgbmFtZSAnRklMRScNCi91c3IvaW5jbHVkZS94 bG9jYWxlL193Y2hhci5oOjYxOjI5OiBlcnJvcjogdW5rbm93biB0eXBlIG5hbWUgJ0ZJTEUn DQovdXNyL2luY2x1ZGUveGxvY2FsZS9fd2NoYXIuaDo2Mjo0NTogZXJyb3I6IHVua25vd24g dHlwZSBuYW1lICdGSUxFJw0KL3Vzci9pbmNsdWRlL3hsb2NhbGUvX3djaGFyLmg6NjQ6MTk6 IGVycm9yOiB1bmtub3duIHR5cGUgbmFtZSAnRklMRScNCi91c3IvaW5jbHVkZS94bG9jYWxl L193Y2hhci5oOjY2OjE4OiBlcnJvcjogdW5rbm93biB0eXBlIG5hbWUgJ0ZJTEUnDQovdXNy L2luY2x1ZGUveGxvY2FsZS9fd2NoYXIuaDo2ODoxOTogZXJyb3I6IHVua25vd24gdHlwZSBu YW1lICdGSUxFJw0KL3Vzci9pbmNsdWRlL3hsb2NhbGUvX3djaGFyLmg6Nzk6Mjg6IGVycm9y OiB1bmtub3duIHR5cGUgbmFtZSAnRklMRScNCi91c3IvaW5jbHVkZS94bG9jYWxlL193Y2hh ci5oOjg1OjI5OiBlcnJvcjogdW5rbm93biB0eXBlIG5hbWUgJ0ZJTEUnDQovdXNyL2luY2x1 ZGUveGxvY2FsZS9fd2NoYXIuaDo4NjoyMDogZXJyb3I6IHVua25vd24gdHlwZSBuYW1lICdG SUxFJw0KL3Vzci9pbmNsdWRlL3hsb2NhbGUvX3djaGFyLmg6MTExOjE5OiBlcnJvcjogdW5r bm93biB0eXBlIG5hbWUgJ0ZJTEUnDQpnbWFrZVs1XTogKioqIFtzcmMvdXRpbC9tYnNsZW4u b10gRXJyb3IgMQ0KZ21ha2VbNV06IExlYXZpbmcgZGlyZWN0b3J5IGAvZGF0YS9wb3J0LXdv cmsvdXNyL3BvcnRzL3d3dy9maXJlZm94L3dvcmsvbW96aWxsYS1yZWxlYXNlL29iai14ODZf NjQtcG9ydGJsZC1mcmVlYnNkMTAuMC9tZWRpYS9tdHJhbnNwb3J0L3RoaXJkX3BhcnR5L25J Q0VyL25pY2VyX25pY2VyJw0KZ21ha2VbNF06ICoqKiBbbmljZXJfbmljZXJfbGlic10gRXJy b3IgMg0KZ21ha2VbNF06IExlYXZpbmcgZGlyZWN0b3J5IGAvZGF0YS9wb3J0LXdvcmsvdXNy L3BvcnRzL3d3dy9maXJlZm94L3dvcmsvbW96aWxsYS1yZWxlYXNlL29iai14ODZfNjQtcG9y dGJsZC1mcmVlYnNkMTAuMC9tZWRpYS9tdHJhbnNwb3J0L3RoaXJkX3BhcnR5L25JQ0VyJw0K Z21ha2VbM106ICoqKiBbbklDRXJfbGlic10gRXJyb3IgMg0KZ21ha2VbM106IExlYXZpbmcg ZGlyZWN0b3J5IGAvZGF0YS9wb3J0LXdvcmsvdXNyL3BvcnRzL3d3dy9maXJlZm94L3dvcmsv bW96aWxsYS1yZWxlYXNlL29iai14ODZfNjQtcG9ydGJsZC1mcmVlYnNkMTAuMC9tZWRpYS9t dHJhbnNwb3J0L3RoaXJkX3BhcnR5Jw0KZ21ha2VbMl06ICoqKiBbbGlic190aWVyX3BsYXRm b3JtXSBFcnJvciAyDQpnbWFrZVsyXTogTGVhdmluZyBkaXJlY3RvcnkgYC9kYXRhL3BvcnQt d29yay91c3IvcG9ydHMvd3d3L2ZpcmVmb3gvd29yay9tb3ppbGxhLXJlbGVhc2Uvb2JqLXg4 Nl82NC1wb3J0YmxkLWZyZWVic2QxMC4wJw0KZ21ha2VbMV06ICoqKiBbdGllcl9wbGF0Zm9y bV0gRXJyb3IgMg0KZ21ha2VbMV06IExlYXZpbmcgZGlyZWN0b3J5IGAvZGF0YS9wb3J0LXdv cmsvdXNyL3BvcnRzL3d3dy9maXJlZm94L3dvcmsvbW96aWxsYS1yZWxlYXNlL29iai14ODZf NjQtcG9ydGJsZC1mcmVlYnNkMTAuMCcNCmdtYWtlOiAqKiogW2RlZmF1bHRdIEVycm9yIDIN CioqKiBbZG8tYnVpbGRdIEVycm9yIGNvZGUgMQ0KDQoNCiAgICBXaGF0IGhhdmUgSSBtdWNr ZWQgdXA/DQoNCiAgICBSZXNwZWN0ZnVsbHksDQoNCg0KDQoJCQkJICAgUm9iZXJ0IEh1ZmY= From owner-freebsd-gecko@FreeBSD.ORG Fri Jan 18 22:10:09 2013 Return-Path: Delivered-To: gecko@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E76C6614; Fri, 18 Jan 2013 22:10:09 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id C4294A48; Fri, 18 Jan 2013 22:10:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0IMA9PH033464; Fri, 18 Jan 2013 22:10:09 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0IMA9aP033460; Fri, 18 Jan 2013 22:10:09 GMT (envelope-from edwin) Date: Fri, 18 Jan 2013 22:10:09 GMT Message-Id: <201301182210.r0IMA9aP033460@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Subject: Re: ports/175421: [WORKAROUND] www/firefox is MAKE_JOBS_SAFE but never uses more than one cpu X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2013 22:10:10 -0000 Synopsis: [WORKAROUND] www/firefox is MAKE_JOBS_SAFE but never uses more than one cpu Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Fri Jan 18 22:10:09 UTC 2013 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=175421 From owner-freebsd-gecko@FreeBSD.ORG Sat Jan 19 04:58:50 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9CB61F92 for ; Sat, 19 Jan 2013 04:58:50 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from outgoing.tormail.org (outgoing.tormail.org [82.221.96.22]) by mx1.freebsd.org (Postfix) with ESMTP id 4D246A4E for ; Sat, 19 Jan 2013 04:58:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=internal.tormail.org) by outgoing.tormail.org with esmtp (Exim 4.72) (envelope-from ) id 1TwQVz-0003m7-H3; Sat, 19 Jan 2013 07:58:48 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Transfer-Encoding:Content-Type:MIME-Version:References:Date:In-Reply-To:Subject:Cc:To:From; bh=gclrybfqn9FiXt+LCIk8H0i6qNj/uxZk9vSET5GcTPo=; b=InfyO+r2T6HMabfqBY+tbPm09Vxylwn7J+bk6u+rsWR/FAdYrpX7NnDcCqTf/cevPC4ykHkTSJAtipa6KR+bZsd1n2mXtSNF4NbE1XcxKpqh9dYZPm0g8Y7+lEoTAfaRhk+9KOC7YGnv7fP/vuEmwZxOgRDzQ1eONj4dTK0ZQuY=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1TwQTK-000O0t-JL; Sat, 19 Jan 2013 04:56:06 +0000 From: Jan Beich To: Robert Huff Subject: Re: problem building FireFox In-Reply-To: <20729.51070.126628.835506@jerusalem.litteratus.org> (Robert Huff's message of "Fri, 18 Jan 2013 17:06:54 -0500") Date: Sat, 19 Jan 2013 15:53:25 +1100 References: <20729.51070.126628.835506@jerusalem.litteratus.org> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-TorMail-User: jbeich Message-Id: <1TwQTK-000O0t-JL@internal.tormail.org> Cc: gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2013 04:58:50 -0000 Robert Huff writes: > gmake[5]: Entering directory `/data/port-work/usr/ports/www/firefox/work/= mozilla-release/obj-x86_64-portbld-freebsd10.0/media/mtransport/third_party= /nICEr/nicer_nicer' > gcc46 -o src/util/mbslen.o -c -I../../../../../dist/system_wrappers -incl= ude /data/port-work/usr/ports/www/firefox/work/mozilla-release/config/gcc_h= idden.h -DMOZ_GLUE_IN_PROGRAM -D_FILE_OFFSET_BITS=3D64 -DCHROMIUM_BUILD -DU= SE_NSS=3D1 -DGTK_DISABLE_SINGLE_INCLUDES=3D1 -DENABLE_REMOTING=3D1 -DENABLE= _WEBRTC=3D1 -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NO= TIFICATIONS -DENABLE_GPU=3D1 -DENABLE_EGLIMAGE=3D1 -DUSE_SKIA=3D1 -DENABLE_= TASK_MANAGER=3D1 -DENABLE_WEB_INTENTS=3D1 -DENABLE_EXTENSIONS=3D1 -DENABLE_= PLUGIN_INSTALLATION=3D1 -DENABLE_PROTECTOR_SERVICE=3D1 -DENABLE_SESSION_SER= VICE=3D1 -DENABLE_THEMES=3D1 -DENABLE_BACKGROUND=3D1 -DENABLE_AUTOMATION=3D= 1 -DENABLE_PRINTING=3D1 -DENABLE_CAPTIVE_PORTAL_DETECTION=3D1 -DSANITY_CHEC= KS -DUSE_TURN -DUSE_ICE -DUSE_RFC_3489_BACKWARDS_COMPATIBLE -DUSE_STUND_0_9= 6 -DUSE_STUN_PEDANTIC -DNR_SOCKET_IS_VOID_PTR -Drestrict=3D -DR_PLATFORM_IN= T_TYPES=3D'"mozilla/StandardInteger.h"' -DR_DEFINED_INT2=3Dint16_t -DR_DEFI= NED_UINT2=3Duint16_t -DR_DEFINED_INT4=3Dint32_t -DR_DEFINED_UINT4=3Duint32_= t -DR_DEFINED_INT8=3Dint64_t -DR_DEFINED_UINT8=3Duint64_t -DBSD -DHAVE_LIBM= =3D1 -DHAVE_STRDUP=3D1 -DHAVE_STRLCPY=3D1 -DHAVE_SYS_TIME_H=3D1 -DHAVE_VFPR= INTF=3D1 -DNEW_STDIORETSIGTYPE=3Dvoid -DTIME_WITH_SYS_TIME_H=3D1 -D__UNUSED= __=3D"__attribute__((unused))" -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_E= NABLED=3D0 -I. -I/data/port-work/usr/ports/www/firefox/work/mozilla-release= /media/mtransport/third_party/nICEr//../nrappkit/src/event -I/data/port-wor= k/usr/ports/www/firefox/work/mozilla-release/media/mtransport/third_party/n= ICEr//../nrappkit/src/log -I/data/port-work/usr/ports/www/firefox/work/mozi= lla-release/media/mtransport/third_party/nICEr//../nrappkit/src/plugin -I/d= ata/port-work/usr/ports/www/firefox/work/mozilla-release/media/mtransport/t= hird_party/nICEr//../nrappkit/src/registry -I/data/port-work/usr/ports/www/= firefox/work/mozilla-release/media/mtransport/third_party/nICEr//../nrappki= t/src/share -I/data/port-work/usr/ports/www/firefox/work/mozilla-release/me= dia/mtransport/third_party/nICEr//../nrappkit/src/stats -I/data/port-work/u= sr/ports/www/firefox/work/mozilla-release/media/mtransport/third_party/nICE= r//../nrappkit/src/util -I/data/port-work/usr/ports/www/firefox/work/mozill= a-release/media/mtransport/third_party/nICEr//../nrappkit/src/util/libekr -= I/data/port-work/usr/ports/www/firefox/work/mozilla-release/media/mtranspor= t/third_party/nICEr//../nrappkit/src/port/generic/include -I/data/port-work= /usr/ports/www/firefox/work/mozilla-release/media/mtransport/third_party/nI= CEr//./src/crypto -I/data/port-work/usr/ports/www/firefox/work/mozilla-rele= ase/media/mtransport/third_party/nICEr//./src/ice -I/data/port-work/usr/por= ts/www/firefox/work/mozilla-release/media/mtransport/third_party/nICEr//./s= rc/net -I/data/port-work/usr/ports/www/firefox/work/mozilla-release/media/m= transport/third_party/nICEr//./src/stun -I/data/port-work/usr/ports/www/fir= efox/work/mozilla-release/media/mtransport/third_party/nICEr//./src/util -I= ../../../../../dist/include -I/data/port-work/usr/ports/www/firefox/work/mo= zilla-release/media/mtransport/third_party/nICEr//../nrappkit/src/port/darw= in/include -fPIC -isystem/usr/local/include -I/usr/local/include -Wall -W= pointer-arith -Wdeclaration-after-statement -Werror=3Dreturn-type -Wtype-li= mits -Wempty-body -Wno-unused -Wno-overlength-strings -Wcast-align -O -pipe= -g -Wl,-rpath=3D/usr/local/lib/gcc46 -fno-strict-aliasing -ffunction-secti= ons -fdata-sections -pipe -DNDEBUG -DTRIMMED -fno-omit-frame-pointer -Wall= -Wno-parentheses -Wno-strict-prototypes -Wmissing-prototypes -isystem/us= r/local/include -I/usr/local/include -include ../../../../../mozilla-confi= g.h -DMOZILLA_CLIENT -MD -MF .deps/mbslen.o.pp /data/port-work/usr/ports/w= ww/firefox/work/mozilla-release/media/mtransport/third_party/nICEr/src/util= /mbslen.c > In file included from /usr/include/xlocale.h:77:0, > from ../../../../../dist/system_wrappers/xlocale.h:3, > from /data/port-work/usr/ports/www/firefox/work/mozilla-= release/media/mtransport/third_party/nICEr/src/util/mbslen.c:55: > /usr/include/xlocale/_wchar.h:58:20: error: unknown type name 'FILE' > /usr/include/xlocale/_wchar.h:59:48: error: unknown type name 'FILE' > /usr/include/xlocale/_wchar.h:61:29: error: unknown type name 'FILE' > /usr/include/xlocale/_wchar.h:62:45: error: unknown type name 'FILE' > /usr/include/xlocale/_wchar.h:64:19: error: unknown type name 'FILE' > /usr/include/xlocale/_wchar.h:66:18: error: unknown type name 'FILE' > /usr/include/xlocale/_wchar.h:68:19: error: unknown type name 'FILE' > /usr/include/xlocale/_wchar.h:79:28: error: unknown type name 'FILE' > /usr/include/xlocale/_wchar.h:85:29: error: unknown type name 'FILE' > /usr/include/xlocale/_wchar.h:86:20: error: unknown type name 'FILE' > /usr/include/xlocale/_wchar.h:111:19: error: unknown type name 'FILE' > gmake[5]: *** [src/util/mbslen.o] Error 1 Does including work at all? If not try rebuilding gcc46 or regen "fixed" headers. /usr/local/lib/gcc46/gcc/x86_64-portbld-freebsd10.0/4.6.?/include-fixed From owner-freebsd-gecko@FreeBSD.ORG Sat Jan 19 06:26:36 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8C92C96 for ; Sat, 19 Jan 2013 06:26:36 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 26651DA3 for ; Sat, 19 Jan 2013 06:26:35 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0J6QYrm051790 for ; Sat, 19 Jan 2013 06:26:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r0J6QTdE051305 for freebsd-gecko@freebsd.org; Sat, 19 Jan 2013 06:26:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 19 Jan 2013 06:26:29 GMT Message-Id: <201301190626.r0J6QTdE051305@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1145 - in trunk/www: firefox firefox-esr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2013 06:26:36 -0000 Author: jbeich Date: Sat Jan 19 06:26:28 2013 New Revision: 1145 Log: remove duplicate dependency on py-sqlite3 since r917 Modified: trunk/www/firefox-esr/Makefile trunk/www/firefox/Makefile Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Fri Jan 18 16:47:04 2013 (r1144) +++ trunk/www/firefox-esr/Makefile Sat Jan 19 06:26:28 2013 (r1145) @@ -68,7 +68,6 @@ .endif .if ${PORT_OPTIONS:MPGO} -BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Fri Jan 18 16:47:04 2013 (r1144) +++ trunk/www/firefox/Makefile Sat Jan 19 06:26:28 2013 (r1145) @@ -72,7 +72,6 @@ .endif .if ${PORT_OPTIONS:MPGO} -BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" From owner-freebsd-gecko@FreeBSD.ORG Sat Jan 19 06:36:25 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 314DA75A for ; Sat, 19 Jan 2013 06:36:25 +0000 (UTC) (envelope-from roberthuff@rcn.com) Received: from smtp02.lnh.mail.rcn.net (smtp02.lnh.mail.rcn.net [207.172.157.102]) by mx1.freebsd.org (Postfix) with ESMTP id F2C5EE24 for ; Sat, 19 Jan 2013 06:36:24 +0000 (UTC) Received: from mr17.lnh.mail.rcn.net ([207.172.157.37]) by smtp02.lnh.mail.rcn.net with ESMTP; 19 Jan 2013 01:36:24 -0500 Received: from smtp04.lnh.mail.rcn.net (smtp04.lnh.mail.rcn.net [207.172.157.104]) by mr17.lnh.mail.rcn.net (MOS 4.3.4-GA) with ESMTP id BWV52482; Sat, 19 Jan 2013 01:36:24 -0500 X-Auth-ID: roberthuff@rcn.com Received: from 209-6-84-183.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com (HELO jerusalem.litteratus.org.litteratus.org) ([209.6.84.183]) by smtp04.lnh.mail.rcn.net with ESMTP; 19 Jan 2013 01:36:24 -0500 From: Robert Huff MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <20730.16104.111807.653559@jerusalem.litteratus.org> Date: Sat, 19 Jan 2013 01:36:24 -0500 To: gecko@freebsd.org Subject: SOLVED: problem building FireFox In-Reply-To: <1TwQTK-000O0t-JL@internal.tormail.org> References: <20729.51070.126628.835506@jerusalem.litteratus.org> <1TwQTK-000O0t-JL@internal.tormail.org> X-Mailer: VM 7.17 under 21.4 (patch 22) "Instant Classic" XEmacs Lucid X-Junkmail-Whitelist: YES (by domain whitelist at mr17.lnh.mail.rcn.net) X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2013 06:36:25 -0000 Turns out I had the compiler set to gcc-46. Setting it back to clang made everything happy. "Sorry about that, Chief!" Robert Huff