From owner-freebsd-gecko@FreeBSD.ORG Mon Aug 6 02:00:05 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BEB81065670 for ; Mon, 6 Aug 2012 02:00:05 +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 9042D8FC14 for ; Mon, 6 Aug 2012 02:00:04 +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 q761xvE4092828 for ; Mon, 6 Aug 2012 01:59:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q761xqVl092571 for freebsd-gecko@freebsd.org; Mon, 6 Aug 2012 01:59:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 6 Aug 2012 01:59:52 GMT Message-Id: <201208060159.q761xqVl092571@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r912 - branches/experimental/www/linux-seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 06 Aug 2012 02:00:05 -0000 Author: jbeich Date: Mon Aug 6 01:59:51 2012 New Revision: 912 Log: use symlink like www/firefox Modified: branches/experimental/www/linux-seamonkey/Makefile.common Modified: branches/experimental/www/linux-seamonkey/Makefile.common ============================================================================== --- branches/experimental/www/linux-seamonkey/Makefile.common Fri Aug 3 13:19:25 2012 (r911) +++ branches/experimental/www/linux-seamonkey/Makefile.common Mon Aug 6 01:59:51 2012 (r912) @@ -53,9 +53,7 @@ @${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${PREFIX}/share/applications/ @${CP} -pR ${WRKSRC}/ ${FDIR}/ @${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/ - @${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/${APP_NAME}-run - @${ECHO_CMD} 'exec ${FDIR}/${BIN_NAME} "$$@"' >> ${WRKDIR}/${APP_NAME}-run - @${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}-run ${PREFIX}/bin/${APP_NAME} + @${LN} -sf ${FDIR}/${BIN_NAME} ${PREFIX}/bin/${APP_NAME} @${CP} -R ${LOCALBASE}/lib/npapi/symlinks/${APP_NAME}/ \ ${FDIR}/plugins/ ${_Q} @${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \ From owner-freebsd-gecko@FreeBSD.ORG Mon Aug 6 02:10:50 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A0EC106566C; Mon, 6 Aug 2012 02:10:50 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F22F58FC08; Mon, 6 Aug 2012 02:10:49 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q762Anse030597; Mon, 6 Aug 2012 02:10:49 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q762AnBR030593; Mon, 6 Aug 2012 02:10:49 GMT (envelope-from edwin) Date: Mon, 6 Aug 2012 02:10:49 GMT Message-Id: <201208060210.q762AnBR030593@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/170402: www/linux-firefox: crash with flashplugin X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Aug 2012 02:10:50 -0000 Synopsis: www/linux-firefox: crash with flashplugin Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Mon Aug 6 02:10:49 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=170402 From owner-freebsd-gecko@FreeBSD.ORG Mon Aug 6 11:07:35 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAEF11065673 for ; Mon, 6 Aug 2012 11:07:35 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8B8938FC20 for ; Mon, 6 Aug 2012 11:07:35 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q76B7ZgL022069 for ; Mon, 6 Aug 2012 11:07:35 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q76B7YFK022067 for gecko@FreeBSD.org; Mon, 6 Aug 2012 11:07:34 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 6 Aug 2012 11:07:34 GMT Message-Id: <201208061107.q76B7YFK022067@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 Cc: Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Aug 2012 11:07:35 -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/170402 gecko www/linux-firefox: crash with flashplugin o ports/170310 gecko mail/thunderbird: coredump/crash when used with OpenLD o ports/170236 gecko [patch] www/firefox: add support for PREFIX != LOCALBA 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/168898 gecko mail/thunderbird: nsDirPrefs.cpp:378:9: error: case va o ports/168718 gecko www/firefox: core dumping or refuse to compile 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 o ports/167298 gecko mail/thunderbird-i18n and www/firefox-i18n fail to fet f ports/165263 gecko mail/thunderbird: core dumping most time when users ar o ports/164919 gecko www/seamonkey fails to build on pre-SSE2 processor 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/160933 gecko Bad port interactions between Mozilla projects o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local o ports/159831 gecko www/firefox is broken 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 23 problems total. From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 8 07:24:36 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A34E51065670; Wed, 8 Aug 2012 07:24:36 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 760A88FC08; Wed, 8 Aug 2012 07:24:36 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q787OaCF010672; Wed, 8 Aug 2012 07:24:36 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q787Oanw010668; Wed, 8 Aug 2012 07:24:36 GMT (envelope-from flo) Date: Wed, 8 Aug 2012 07:24:36 GMT Message-Id: <201208080724.q787Oanw010668@freefall.freebsd.org> To: freebsd-announce@chthonic.com, flo@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Cc: Subject: Re: ports/170097: devel/libunwind 20110911: prevents upgrade to current version of Seamonkey and Firefox X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2012 07:24:36 -0000 Synopsis: devel/libunwind 20110911: prevents upgrade to current version of Seamonkey and Firefox State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Wed Aug 8 07:22:53 UTC 2012 State-Changed-Why: This should have been fixed by committs r301582+r301586 Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: flo Responsible-Changed-When: Wed Aug 8 07:22:53 UTC 2012 Responsible-Changed-Why: This should have been fixed by committs r301582+r301586 http://www.freebsd.org/cgi/query-pr.cgi?pr=170097 From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 8 07:28:13 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F251C106566B; Wed, 8 Aug 2012 07:28:12 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C48E88FC19; Wed, 8 Aug 2012 07:28:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q787SCLm012225; Wed, 8 Aug 2012 07:28:12 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q787SCXQ012221; Wed, 8 Aug 2012 07:28:12 GMT (envelope-from flo) Date: Wed, 8 Aug 2012 07:28:12 GMT Message-Id: <201208080728.q787SCXQ012221@freefall.freebsd.org> To: ohartman@zedat.fu-berlin.de, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Cc: Subject: Re: ports/168898: mail/thunderbird: nsDirPrefs.cpp:378:9: error: case value evaluates to 2147483648, which cannot be narrowed to type 'PRInt32' (aka 'int') [-Wc++11-narrowing] case DIR_POS_APPEND: X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2012 07:28:13 -0000 Synopsis: mail/thunderbird: nsDirPrefs.cpp:378:9: error: case value evaluates to 2147483648, which cannot be narrowed to type 'PRInt32' (aka 'int') [-Wc++11-narrowing] case DIR_POS_APPEND: State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Wed Aug 8 07:28:12 UTC 2012 State-Changed-Why: The latest version of mail/thunderbird should build with clang http://www.freebsd.org/cgi/query-pr.cgi?pr=168898 From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 9 06:40:23 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9A14B106566B for ; Thu, 9 Aug 2012 06:40:23 +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 0CDF18FC15 for ; Thu, 9 Aug 2012 06:40:22 +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 q796eFt9081831 for ; Thu, 9 Aug 2012 06:40:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q796eA1w076303 for freebsd-gecko@freebsd.org; Thu, 9 Aug 2012 06:40:10 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 9 Aug 2012 06:40:10 GMT Message-Id: <201208090640.q796eA1w076303@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r913 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/firefox36/files www/kompozer/files www/libxul/files www/libxul19/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Aug 2012 06:40:23 -0000 Author: jbeich Date: Thu Aug 9 06:40:10 2012 New Revision: 913 Log: remove -lc workaround for alpha/ia64 and 6.x FreeBSD alpha is no longer with us (since 7.0R). Support for ia64 needs to re-evaluated and/or require more recent toolchain from ports. Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in branches/experimental/mail/thunderbird3/files/patch-mozilla-config-rules.mk branches/experimental/www/firefox-esr/files/patch-js-src-Makefile.in branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in branches/experimental/www/firefox-nightly/files/patch-js-src-Makefile.in branches/experimental/www/firefox/files/patch-js-src-Makefile.in branches/experimental/www/firefox36/files/patch-js-src-Makefile.in branches/experimental/www/kompozer/files/patch-js-src-Makefile.in branches/experimental/www/libxul/files/patch-js-src-Makefile.in branches/experimental/www/libxul19/files/patch-config_rules.mk branches/experimental/www/libxul19/files/patch-js-src-Makefile.in branches/experimental/www/seamonkey/files/patch-config-rules.mk branches/experimental/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/www/firefox-esr/files/patch-config_autoconf.mk.in branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox/files/patch-config_autoconf.mk.in branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox36/files/patch-config_autoconf.mk.in branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/kompozer/files/patch-config_autoconf.mk.in branches/experimental/www/libxul/files/patch-config_autoconf.mk.in branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in Thu Aug 9 06:40:10 2012 (r913) @@ -19,13 +19,4 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 -+++ mozilla/js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 -@@ -793,7 +796,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:10 2012 (r913) @@ -32,7 +32,7 @@ endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in Thu Aug 9 06:40:10 2012 (r913) @@ -19,13 +19,4 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 -+++ mozilla/js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -737,7 +740,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),Linux) - EXTRA_LIBS += -ldl Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:10 2012 (r913) @@ -32,7 +32,7 @@ endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-config-rules.mk ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-config-rules.mk Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- mozilla/config/rules.mk.orig Thu Sep 14 14:07:03 2006 -+++ mozilla/config/rules.mk Wed Oct 18 11:00:09 2006 -@@ -442,9 +442,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic --endif -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - - ifeq ($(OS_ARCH),NetBSD) Modified: branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:10 2012 (r913) @@ -25,7 +25,7 @@ endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif Modified: branches/experimental/www/firefox-esr/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-config_autoconf.mk.in Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/firefox-esr/files/patch-config_autoconf.mk.in Thu Aug 9 06:40:10 2012 (r913) @@ -19,12 +19,3 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Deleted: branches/experimental/www/firefox-esr/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-js-src-Makefile.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 -+++ js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 -@@ -793,7 +796,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 Modified: branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:10 2012 (r913) @@ -32,7 +32,7 @@ endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif Deleted: branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200 -+++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200 -@@ -287,7 +287,7 @@ WCHAR_CFLAGS = @WCHAR_CFLAGS@ - OS_CPPFLAGS = @OS_CPPFLAGS@ - OS_CFLAGS = @OS_CFLAGS@ - OS_CXXFLAGS = @OS_CXXFLAGS@ --OS_LDFLAGS = @OS_LDFLAGS@ -+OS_LDFLAGS = @OS_LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = @OS_COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = @OS_COMPILE_CXXFLAGS@ Deleted: branches/experimental/www/firefox-nightly/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-js-src-Makefile.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 -+++ js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -737,7 +740,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),Linux) - EXTRA_LIBS += -ldl Modified: branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:10 2012 (r913) @@ -32,7 +32,7 @@ endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif Modified: branches/experimental/www/firefox/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/www/firefox/files/patch-config_autoconf.mk.in Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/firefox/files/patch-config_autoconf.mk.in Thu Aug 9 06:40:10 2012 (r913) @@ -19,12 +19,3 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Deleted: branches/experimental/www/firefox/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox/files/patch-js-src-Makefile.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 -+++ js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -737,7 +740,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),Linux) - EXTRA_LIBS += -ldl Modified: branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:10 2012 (r913) @@ -32,7 +32,7 @@ endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif Modified: branches/experimental/www/firefox36/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/www/firefox36/files/patch-config_autoconf.mk.in Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/firefox36/files/patch-config_autoconf.mk.in Thu Aug 9 06:40:10 2012 (r913) @@ -19,12 +19,3 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Deleted: branches/experimental/www/firefox36/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox36/files/patch-js-src-Makefile.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2009-05-11 15:21:19.000000000 +0200 -+++ js/src/Makefile.in 2009-05-11 15:21:34.000000000 +0200 -@@ -427,7 +427,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 Modified: branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:10 2012 (r913) @@ -32,7 +32,7 @@ endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif Modified: branches/experimental/www/kompozer/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/www/kompozer/files/patch-config_autoconf.mk.in Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/kompozer/files/patch-config_autoconf.mk.in Thu Aug 9 06:40:10 2012 (r913) @@ -17,12 +17,3 @@ mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) mrelibdir = $(mredir)/lib -@@ -251,7 +251,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Deleted: branches/experimental/www/kompozer/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/kompozer/files/patch-js-src-Makefile.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2009-05-02 18:40:20.000000000 +0200 -+++ js/src/Makefile.in 2009-09-02 12:20:39.000000000 +0200 -@@ -260,7 +260,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --LDFLAGS += -pthread -+LDFLAGS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 Modified: branches/experimental/www/libxul/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/www/libxul/files/patch-config_autoconf.mk.in Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/libxul/files/patch-config_autoconf.mk.in Thu Aug 9 06:40:10 2012 (r913) @@ -19,12 +19,3 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Deleted: branches/experimental/www/libxul/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/libxul/files/patch-js-src-Makefile.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 -+++ js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 -@@ -793,7 +796,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 Modified: branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:10 2012 (r913) @@ -32,7 +32,7 @@ endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif Deleted: branches/experimental/www/libxul19/files/patch-config_rules.mk ============================================================================== --- branches/experimental/www/libxul19/files/patch-config_rules.mk Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- config/rules.mk.orig Thu Sep 14 14:07:03 2006 -+++ config/rules.mk Wed Oct 18 11:00:09 2006 -@@ -442,9 +442,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic --endif -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - - ifeq ($(OS_ARCH),NetBSD) Deleted: branches/experimental/www/libxul19/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/libxul19/files/patch-js-src-Makefile.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- js/src/Makefile.in.orig 2009-05-11 15:21:19.000000000 +0200 -+++ js/src/Makefile.in 2009-05-11 15:21:34.000000000 +0200 -@@ -427,7 +427,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 Modified: branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk ============================================================================== --- branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk Thu Aug 9 06:40:10 2012 (r913) @@ -32,7 +32,7 @@ endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif Deleted: branches/experimental/www/seamonkey/files/patch-config-rules.mk ============================================================================== --- branches/experimental/www/seamonkey/files/patch-config-rules.mk Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- config/rules.mk.orig Thu Sep 14 14:07:03 2006 -+++ config/rules.mk Wed Oct 18 11:00:09 2006 -@@ -442,9 +442,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic --endif -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - - ifeq ($(OS_ARCH),NetBSD) Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/config/autoconf.mk.in.orig 2009-09-17 19:09:10.000000000 +0200 -+++ mozilla/config/autoconf.mk.in 2009-09-17 19:09:26.000000000 +0200 -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in Thu Aug 9 06:40:10 2012 (r912) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100 -+++ mozilla/js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100 -@@ -737,7 +740,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),Linux) - EXTRA_LIBS += -ldl Modified: branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Mon Aug 6 01:59:51 2012 (r912) +++ branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:10 2012 (r913) @@ -32,7 +32,7 @@ endif -MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ ++MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 9 06:40:32 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2404A106564A for ; Thu, 9 Aug 2012 06:40:32 +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 4FF4D8FC0A for ; Thu, 9 Aug 2012 06:40:31 +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 q796eUlh089548 for ; Thu, 9 Aug 2012 06:40:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q796eOYg083334 for freebsd-gecko@freebsd.org; Thu, 9 Aug 2012 06:40:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 9 Aug 2012 06:40:24 GMT Message-Id: <201208090640.q796eOYg083334@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r914 - in branches/experimental: Mk mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/firefox36/files www/libxul/files www/libxul19/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Aug 2012 06:40:32 -0000 Author: jbeich Date: Thu Aug 9 06:40:24 2012 New Revision: 914 Log: nuke patches for bundled nss Let's maintain only one place - security/nss port. There patches are in better shape, more up to date and try to push some upstream. Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-nss-lib-Makefile branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird/files/patch-mozilla-security-nss-lib-Makefile branches/experimental/mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird3/files/patch-mozilla-security-nss-lib-Makefile branches/experimental/mail/thunderbird3/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox-esr/files/patch-security-nss-lib-Makefile branches/experimental/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-Makefile branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox/files/patch-security-nss-lib-Makefile branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile branches/experimental/www/firefox36/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/libxul/files/patch-security-nss-lib-Makefile branches/experimental/www/libxul/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk branches/experimental/www/libxul19/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:10 2012 (r913) +++ branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:24 2012 (r914) @@ -575,7 +575,8 @@ nss_LIB_DEPENDS= nss3:${PORTSDIR}/security/nss nss_MOZ_OPTIONS= --with-system-nss -#nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/security/nss +nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/security/coreconf \ + --exclude mozilla*/security/nss nss_CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-nss-lib-Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ ---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 -+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 -@@ -733,6 +733,32 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +812,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-security-nss-lib-Makefile ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ ---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 -+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 -@@ -733,6 +733,32 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +812,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,39 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-04-30 19:44:32.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-05-10 13:04:45.000000000 +0000 -@@ -52,6 +52,19 @@ - ifeq ($(CPU_ARCH),amd64) - CPU_ARCH = x86_64 - endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -78,7 +87,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +96,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-security-nss-lib-Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ ---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 -+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 -@@ -733,6 +733,32 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +812,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/firefox-esr/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 -@@ -733,6 +733,34 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +814,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 -@@ -733,6 +733,34 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +814,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/firefox/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/firefox/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c ============================================================================== --- branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 -@@ -733,6 +733,34 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +814,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/firefox36/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/www/firefox36/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,44 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 18:44:42.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 18:46:41.000000000 +0100 -@@ -733,6 +733,33 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +813,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/libxul/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/libxul/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/libxul/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c ============================================================================== --- branches/experimental/www/libxul/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 -@@ -733,6 +733,34 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +814,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk ============================================================================== --- branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/libxul19/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/www/libxul19/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,44 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 18:44:42.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 18:46:41.000000000 +0100 -@@ -733,6 +733,33 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +813,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 9 06:40:41 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7EACF1065670 for ; Thu, 9 Aug 2012 06:40:41 +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 F343B8FC14 for ; Thu, 9 Aug 2012 06:40:40 +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 q796edj8092981 for ; Thu, 9 Aug 2012 06:40:39 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q796eY9g091636 for freebsd-gecko@freebsd.org; Thu, 9 Aug 2012 06:40:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 9 Aug 2012 06:40:34 GMT Message-Id: <201208090640.q796eY9g091636@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r915 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr www/firefox www/firefox-esr www/firefox-nightly www/seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Aug 2012 06:40:41 -0000 Author: jbeich Date: Thu Aug 9 06:40:34 2012 New Revision: 915 Log: - look for system includes last[1] - use LDFLAGS instead of LIBS PR: ports/159831, ports/160933, ports/170467[1] Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:24 2012 (r914) +++ branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:34 2012 (r915) @@ -544,7 +544,8 @@ MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin -LIBS+= -L${LOCALBASE}/lib +CPPFLAGS+= -isystem${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib # Standard depends _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip @@ -619,8 +620,6 @@ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --with-pthreads # Configure options for install -MOZ_OPTIONS+= --x-includes=${LOCALBASE}/include \ - --x-libraries=${LOCALBASE}/lib .if !defined(MOZ_EXTENSIONS) MOZ_OPTIONS+= --enable-extensions=default .else Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Thu Aug 9 06:40:24 2012 (r914) +++ branches/experimental/mail/thunderbird-esr/Makefile Thu Aug 9 06:40:34 2012 (r915) @@ -21,8 +21,6 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -CONFLICTS_BUILD= spidermonkey-* - USE_AUTOTOOLS= autoconf213:env LATEST_LINK= thunderbird-esr USE_GECKO= gecko Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Thu Aug 9 06:40:24 2012 (r914) +++ branches/experimental/mail/thunderbird/Makefile Thu Aug 9 06:40:34 2012 (r915) @@ -21,8 +21,6 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -CONFLICTS_BUILD= spidermonkey-* - USE_AUTOTOOLS= autoconf213:env USE_GECKO= gecko CONFLICTS= thunderbird-10.* Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Thu Aug 9 06:40:24 2012 (r914) +++ branches/experimental/www/firefox-esr/Makefile Thu Aug 9 06:40:34 2012 (r915) @@ -22,8 +22,6 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -CONFLICTS_BUILD= spidermonkey-* - USE_AUTOTOOLS= autoconf213:env LATEST_LINK= firefox-esr USE_GECKO= gecko Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Thu Aug 9 06:40:24 2012 (r914) +++ branches/experimental/www/firefox-nightly/Makefile Thu Aug 9 06:40:34 2012 (r915) @@ -24,8 +24,6 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -CONFLICTS_BUILD= spidermonkey-* - USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=yes USE_GECKO= gecko Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Thu Aug 9 06:40:24 2012 (r914) +++ branches/experimental/www/firefox/Makefile Thu Aug 9 06:40:34 2012 (r915) @@ -22,8 +22,6 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -CONFLICTS_BUILD= spidermonkey-* - USE_AUTOTOOLS= autoconf213:env USE_GECKO= gecko CONFLICTS= firefox-10.* Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Thu Aug 9 06:40:24 2012 (r914) +++ branches/experimental/www/seamonkey/Makefile Thu Aug 9 06:40:34 2012 (r915) @@ -21,7 +21,6 @@ unzip:${PORTSDIR}/archivers/unzip USE_AUTOTOOLS= autoconf213:env -CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_BZIP2= yes USE_GMAKE= yes USE_GECKO= gecko From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 9 06:40:53 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C1F41065670 for ; Thu, 9 Aug 2012 06:40:53 +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 577C78FC17 for ; Thu, 9 Aug 2012 06:40:52 +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 q796epeR095449 for ; Thu, 9 Aug 2012 06:40:51 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q796ekGT093950 for freebsd-gecko@freebsd.org; Thu, 9 Aug 2012 06:40:46 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 9 Aug 2012 06:40:46 GMT Message-Id: <201208090640.q796ekGT093950@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r916 - in branches/experimental: Mk mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Aug 2012 06:40:53 -0000 Author: jbeich Date: Thu Aug 9 06:40:45 2012 New Revision: 916 Log: sync with bug#753046 Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-esr/files/patch-bug753046 branches/experimental/mail/thunderbird/files/patch-bug753046 branches/experimental/www/firefox-esr/files/patch-bug753046 branches/experimental/www/firefox-nightly/files/patch-bug753046 branches/experimental/www/firefox/files/patch-bug753046 branches/experimental/www/libxul/files/patch-bug753046 branches/experimental/www/seamonkey/files/patch-bug753046 Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:34 2012 (r915) +++ branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:45 2012 (r916) @@ -824,12 +824,19 @@ .endif .for subdir in "" nsprpub js/src @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \ - ${ECHO_CMD} "cairo-qt.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ - ${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ - ${ECHO_CMD} "malloc_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ - ${ECHO_CMD} "pthread_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ - ${ECHO_CMD} "pulse/pulseaudio.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ - ${ECHO_CMD} "unwind.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ + for f in \ + cairo-qt.h \ + fenv.h \ + kvm.h \ + malloc_np.h \ + pthread_np.h \ + pulse/pulseaudio.h \ + spawn.h \ + sys/thr.h \ + sys/user.h \ + unwind.h; do \ + ${ECHO_CMD} "$$f" >> ${MOZSRC}/${subdir}/config/system-headers ; \ + done; \ fi .endfor @for f in \ Modified: branches/experimental/mail/thunderbird-esr/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Thu Aug 9 06:40:34 2012 (r915) +++ branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916) @@ -4,15 +4,14 @@ --- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp -@@ -33,6 +33,8 @@ - #include "nsPluginsDir.h" - #include "nsXULAppAPI.h" +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#include -+ - #ifdef MOZ_X11 - # include "mozilla/X11Util.h" - #endif + #ifdef MOZ_WIDGET_QT ++#include // for _exit() + #include + #include "nsQAppInstance.h" + #include "NestedLoopTimer.h" @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -65,7 +64,7 @@ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -244,7 +243,7 @@ // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -252,6 +251,8 @@ + being_debugged = (info.kp_flags & P_TRACED) != 0; +#elif defined(OS_FREEBSD) + being_debugged = (info.ki_flag & P_TRACED) != 0; ++#elif defined(OS_OPENBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif @@ -394,105 +395,19 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include - #elif defined(OS_POSIX) - #include --#include - #include -+#include - #endif +diff --git mozilla/ipc/chromium/src/base/file_util_linux.cc mozilla/ipc/chromium/src/base/file_util_linux.cc +index 171e44f..0c6dfcc 100644 +--- mozilla/ipc/chromium/src/base/file_util_linux.cc ++++ mozilla/ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } - #include -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,80 @@ -+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include -+#include -+ -+#include -+#include -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -532,11 +447,15 @@ --- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE + #elif defined(OS_POSIX) + #include + typedef pthread_t PlatformThreadHandle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) #include typedef pid_t PlatformThreadId; -+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include @@ -545,7 +464,7 @@ --- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,18 @@ +@@ -9,9 +9,23 @@ #if defined(OS_MACOSX) #include @@ -557,14 +476,19 @@ +#elif defined(OS_DRAGONFLY) +#include +#elif defined(OS_FREEBSD) ++#include ++#if __FreeBSD_version > 802500 ++#include ++#else +_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); // XXX #include ++extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") ++#endif +#include #endif #if defined(OS_MACOSX) -@@ -38,7 +45,19 @@ +@@ -38,9 +45,20 @@ // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); @@ -582,9 +506,38 @@ + return lwpid; +# endif +#elif defined(OS_OPENBSD) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); +- // TODO(BSD): find a better thread ID +- return (intptr_t)(pthread_self()); ++ return (intptr_t) (pthread_self()); #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif +diff --git mozilla/ipc/chromium/src/base/ref_counted.h mozilla/ipc/chromium/src/base/ref_counted.h +index 013bd66..18e2794 100644 +--- mozilla/ipc/chromium/src/base/ref_counted.h ++++ mozilla/ipc/chromium/src/base/ref_counted.h +@@ -28,7 +28,7 @@ class RefCountedBase { + bool in_dtor_; + #endif + +- DFAKE_MUTEX(add_release_); ++ DFAKE_MUTEX(add_release_) + + DISALLOW_COPY_AND_ASSIGN(RefCountedBase); + }; +diff --git mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +index 342e6d9..b011baf 100644 +--- mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ++++ mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { + // In debugging mode, it's a fatal error to try and add more than this number + // of descriptors to a FileDescriptorSet. + enum { +- MAX_DESCRIPTORS_PER_MESSAGE = 4, ++ MAX_DESCRIPTORS_PER_MESSAGE = 4 + }; + + // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -626,7 +579,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,322 @@ +@@ -0,0 +1,320 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -635,35 +588,20 @@ + +#include "base/process_util.h" + -+#include -+#include -+#include -+#include -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ -+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") -+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") -+#else -+#define PRE_SYS_INCLUDE -+#define POST_SYS_INCLUDE -+#endif -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#include +#include ++#include +#include -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include -+POST_SYS_INCLUDE +#endif + ++#include ++#include ++#include ++#include ++ ++#include ++ +#include "base/debug_util.h" +#include "base/eintr_wrapper.h" +#include "base/file_util.h" @@ -671,15 +609,28 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + ++#ifdef OS_NETBSD ++#include ++#if __NetBSD_Version__ >= 599006500 ++#define HAVE_POSIX_SPAWN 1 ++#endif ++#endif ++ +#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif ++#endif ++ +#ifdef HAVE_POSIX_SPAWN -+PRE_SYS_INCLUDE +#include -+extern "C" char **environ; -+POST_SYS_INCLUDE ++extern "C" char **environ __dso_public; +#endif + +namespace { @@ -1091,24 +1042,30 @@ --- mozilla/ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -27,9 +33,16 @@ #error Please add support for your platform in build/build_config.h #endif ++// For access to standard BSD features, use OS_BSD instead of a ++// more specific macro. ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) ++#define OS_BSD 1 ++#endif ++ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) @@ -1150,7 +1107,7 @@ #endif -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) ++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) // There size_t is a synonym for |unsigned long| ... template <> struct ParamTraits { @@ -1159,7 +1116,7 @@ #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) ++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| template <> struct ParamTraits { @@ -1181,7 +1138,7 @@ }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#elif defined(OS_MACOSX) || defined(OS_BSD) typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; @@ -1259,7 +1216,7 @@ +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ ++# keep `environ' unresolved, see bug 14426 for binutils +EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols +endif + Modified: branches/experimental/mail/thunderbird/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-bug753046 Thu Aug 9 06:40:34 2012 (r915) +++ branches/experimental/mail/thunderbird/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916) @@ -4,15 +4,14 @@ --- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp -@@ -33,6 +33,8 @@ - #include "nsPluginsDir.h" - #include "nsXULAppAPI.h" +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#include -+ - #ifdef MOZ_X11 - # include "mozilla/X11Util.h" - #endif + #ifdef MOZ_WIDGET_QT ++#include // for _exit() + #include + #include "nsQAppInstance.h" + #include "NestedLoopTimer.h" @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -65,7 +64,7 @@ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -244,7 +243,7 @@ // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -252,6 +251,8 @@ + being_debugged = (info.kp_flags & P_TRACED) != 0; +#elif defined(OS_FREEBSD) + being_debugged = (info.ki_flag & P_TRACED) != 0; ++#elif defined(OS_OPENBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif @@ -399,105 +400,19 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include - #elif defined(OS_POSIX) - #include --#include - #include -+#include - #endif +diff --git mozilla/ipc/chromium/src/base/file_util_linux.cc mozilla/ipc/chromium/src/base/file_util_linux.cc +index 171e44f..0c6dfcc 100644 +--- mozilla/ipc/chromium/src/base/file_util_linux.cc ++++ mozilla/ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } - #include -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,80 @@ -+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include -+#include -+ -+#include -+#include -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -537,11 +452,15 @@ --- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE + #elif defined(OS_POSIX) + #include + typedef pthread_t PlatformThreadHandle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) #include typedef pid_t PlatformThreadId; -+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include @@ -550,7 +469,7 @@ --- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,18 @@ +@@ -9,9 +9,23 @@ #if defined(OS_MACOSX) #include @@ -562,14 +481,19 @@ +#elif defined(OS_DRAGONFLY) +#include +#elif defined(OS_FREEBSD) ++#include ++#if __FreeBSD_version > 802500 ++#include ++#else +_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); // XXX #include ++extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") ++#endif +#include #endif #if defined(OS_MACOSX) -@@ -38,7 +45,19 @@ +@@ -38,9 +45,20 @@ // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); @@ -587,9 +511,38 @@ + return lwpid; +# endif +#elif defined(OS_OPENBSD) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); +- // TODO(BSD): find a better thread ID +- return (intptr_t)(pthread_self()); ++ return (intptr_t) (pthread_self()); #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif +diff --git mozilla/ipc/chromium/src/base/ref_counted.h mozilla/ipc/chromium/src/base/ref_counted.h +index 013bd66..18e2794 100644 +--- mozilla/ipc/chromium/src/base/ref_counted.h ++++ mozilla/ipc/chromium/src/base/ref_counted.h +@@ -28,7 +28,7 @@ class RefCountedBase { + bool in_dtor_; + #endif + +- DFAKE_MUTEX(add_release_); ++ DFAKE_MUTEX(add_release_) + + DISALLOW_COPY_AND_ASSIGN(RefCountedBase); + }; +diff --git mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +index 342e6d9..b011baf 100644 +--- mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ++++ mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { + // In debugging mode, it's a fatal error to try and add more than this number + // of descriptors to a FileDescriptorSet. + enum { +- MAX_DESCRIPTORS_PER_MESSAGE = 4, ++ MAX_DESCRIPTORS_PER_MESSAGE = 4 + }; + + // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -631,7 +584,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,322 @@ +@@ -0,0 +1,320 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -640,35 +593,20 @@ + +#include "base/process_util.h" + -+#include -+#include -+#include -+#include -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ -+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") -+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") -+#else -+#define PRE_SYS_INCLUDE -+#define POST_SYS_INCLUDE -+#endif -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#include +#include ++#include +#include -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include -+POST_SYS_INCLUDE +#endif + ++#include ++#include ++#include ++#include ++ ++#include ++ +#include "base/debug_util.h" +#include "base/eintr_wrapper.h" +#include "base/file_util.h" @@ -676,15 +614,28 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + ++#ifdef OS_NETBSD ++#include ++#if __NetBSD_Version__ >= 599006500 ++#define HAVE_POSIX_SPAWN 1 ++#endif ++#endif ++ +#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif ++#endif ++ +#ifdef HAVE_POSIX_SPAWN -+PRE_SYS_INCLUDE +#include -+extern "C" char **environ; -+POST_SYS_INCLUDE ++extern "C" char **environ __dso_public; +#endif + +namespace { @@ -1096,24 +1047,30 @@ --- mozilla/ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -27,9 +33,16 @@ #error Please add support for your platform in build/build_config.h #endif ++// For access to standard BSD features, use OS_BSD instead of a ++// more specific macro. ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) ++#define OS_BSD 1 ++#endif ++ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) @@ -1155,7 +1112,7 @@ #endif -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) ++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) // There size_t is a synonym for |unsigned long| ... template <> struct ParamTraits { @@ -1164,7 +1121,7 @@ #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) ++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| template <> struct ParamTraits { @@ -1186,7 +1143,7 @@ }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#elif defined(OS_MACOSX) || defined(OS_BSD) typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; @@ -1264,7 +1221,7 @@ +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ ++# keep `environ' unresolved, see bug 14426 for binutils +EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols +endif + Modified: branches/experimental/www/firefox-esr/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-bug753046 Thu Aug 9 06:40:34 2012 (r915) +++ branches/experimental/www/firefox-esr/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916) @@ -4,15 +4,14 @@ --- dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.cpp -@@ -33,6 +33,8 @@ - #include "nsPluginsDir.h" - #include "nsXULAppAPI.h" +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#include -+ - #ifdef MOZ_X11 - # include "mozilla/X11Util.h" - #endif + #ifdef MOZ_WIDGET_QT ++#include // for _exit() + #include + #include "nsQAppInstance.h" + #include "NestedLoopTimer.h" @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -65,7 +64,7 @@ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -244,7 +243,7 @@ // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -252,6 +251,8 @@ + being_debugged = (info.kp_flags & P_TRACED) != 0; +#elif defined(OS_FREEBSD) + being_debugged = (info.ki_flag & P_TRACED) != 0; ++#elif defined(OS_OPENBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif @@ -394,105 +395,19 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include - #elif defined(OS_POSIX) - #include --#include - #include -+#include - #endif +diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc +index 171e44f..0c6dfcc 100644 +--- ipc/chromium/src/base/file_util_linux.cc ++++ ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } - #include -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,80 @@ -+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include -+#include -+ -+#include -+#include -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -532,11 +447,15 @@ --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE + #elif defined(OS_POSIX) + #include + typedef pthread_t PlatformThreadHandle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) #include typedef pid_t PlatformThreadId; -+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include @@ -545,7 +464,7 @@ --- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,18 @@ +@@ -9,9 +9,23 @@ #if defined(OS_MACOSX) #include @@ -557,14 +476,19 @@ +#elif defined(OS_DRAGONFLY) +#include +#elif defined(OS_FREEBSD) ++#include ++#if __FreeBSD_version > 802500 ++#include ++#else +_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); // XXX #include ++extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") ++#endif +#include #endif #if defined(OS_MACOSX) -@@ -38,7 +45,19 @@ +@@ -38,9 +45,20 @@ // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); @@ -582,9 +506,38 @@ + return lwpid; +# endif +#elif defined(OS_OPENBSD) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); +- // TODO(BSD): find a better thread ID +- return (intptr_t)(pthread_self()); ++ return (intptr_t) (pthread_self()); #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif +diff --git ipc/chromium/src/base/ref_counted.h ipc/chromium/src/base/ref_counted.h +index 013bd66..18e2794 100644 +--- ipc/chromium/src/base/ref_counted.h ++++ ipc/chromium/src/base/ref_counted.h +@@ -28,7 +28,7 @@ class RefCountedBase { + bool in_dtor_; + #endif + +- DFAKE_MUTEX(add_release_); ++ DFAKE_MUTEX(add_release_) + + DISALLOW_COPY_AND_ASSIGN(RefCountedBase); + }; +diff --git ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +index 342e6d9..b011baf 100644 +--- ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ++++ ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { + // In debugging mode, it's a fatal error to try and add more than this number + // of descriptors to a FileDescriptorSet. + enum { +- MAX_DESCRIPTORS_PER_MESSAGE = 4, ++ MAX_DESCRIPTORS_PER_MESSAGE = 4 + }; + + // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -626,7 +579,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,322 @@ +@@ -0,0 +1,320 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -635,35 +588,20 @@ + +#include "base/process_util.h" + -+#include -+#include -+#include -+#include -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ -+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") -+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") -+#else -+#define PRE_SYS_INCLUDE -+#define POST_SYS_INCLUDE -+#endif -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#include +#include ++#include +#include -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include -+POST_SYS_INCLUDE +#endif + ++#include ++#include ++#include ++#include ++ ++#include ++ +#include "base/debug_util.h" +#include "base/eintr_wrapper.h" +#include "base/file_util.h" @@ -671,15 +609,28 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + ++#ifdef OS_NETBSD ++#include ++#if __NetBSD_Version__ >= 599006500 ++#define HAVE_POSIX_SPAWN 1 ++#endif ++#endif ++ +#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif ++#endif ++ +#ifdef HAVE_POSIX_SPAWN -+PRE_SYS_INCLUDE +#include -+extern "C" char **environ; -+POST_SYS_INCLUDE ++extern "C" char **environ __dso_public; +#endif + +namespace { @@ -1091,24 +1042,30 @@ --- ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -27,9 +33,16 @@ #error Please add support for your platform in build/build_config.h #endif ++// For access to standard BSD features, use OS_BSD instead of a ++// more specific macro. ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) ++#define OS_BSD 1 ++#endif ++ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) @@ -1150,7 +1107,7 @@ #endif -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) ++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) // There size_t is a synonym for |unsigned long| ... template <> struct ParamTraits { @@ -1159,7 +1116,7 @@ #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) ++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| template <> struct ParamTraits { @@ -1181,7 +1138,7 @@ }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#elif defined(OS_MACOSX) || defined(OS_BSD) typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; @@ -1259,7 +1216,7 @@ +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ ++# keep `environ' unresolved, see bug 14426 for binutils +EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols +endif + Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-bug753046 Thu Aug 9 06:40:34 2012 (r915) +++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916) @@ -4,15 +4,14 @@ --- dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.cpp -@@ -33,6 +33,8 @@ - #include "nsPluginsDir.h" - #include "nsXULAppAPI.h" +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#include -+ - #ifdef MOZ_X11 - # include "mozilla/X11Util.h" - #endif + #ifdef MOZ_WIDGET_QT ++#include // for _exit() + #include + #include "nsQAppInstance.h" + #include "NestedLoopTimer.h" @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -65,7 +64,7 @@ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -244,7 +243,7 @@ // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -252,6 +251,8 @@ + being_debugged = (info.kp_flags & P_TRACED) != 0; +#elif defined(OS_FREEBSD) + being_debugged = (info.ki_flag & P_TRACED) != 0; ++#elif defined(OS_OPENBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif @@ -399,105 +400,19 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include - #elif defined(OS_POSIX) - #include --#include - #include -+#include - #endif +diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc +index 171e44f..0c6dfcc 100644 +--- ipc/chromium/src/base/file_util_linux.cc ++++ ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } - #include -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,80 @@ -+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include -+#include -+ -+#include -+#include -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -537,11 +452,15 @@ --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE + #elif defined(OS_POSIX) + #include + typedef pthread_t PlatformThreadHandle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) #include typedef pid_t PlatformThreadId; -+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include @@ -550,7 +469,7 @@ --- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,16 +9,25 @@ +@@ -9,16 +9,30 @@ #if defined(OS_MACOSX) #include @@ -563,9 +482,14 @@ -#elif !defined(__NetBSD__) -#include +#elif defined(OS_FREEBSD) ++#include ++#if __FreeBSD_version > 802500 ++#include ++#else +_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); // XXX #include ++extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") ++#endif #endif + +#if !defined(OS_MACOSX) @@ -579,7 +503,7 @@ #if defined(OS_MACOSX) namespace base { void InitThreading(); -@@ -38,7 +45,19 @@ PlatformThreadId PlatformThread::CurrentId() { +@@ -38,9 +45,20 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); @@ -597,9 +521,12 @@ + return lwpid; +# endif +#elif defined(OS_OPENBSD) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); +- // TODO(BSD): find a better thread ID +- return (intptr_t)(pthread_self()); ++ return (intptr_t) (pthread_self()); #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif @@ -102,9 +102,9 @@ void PlatformThread::SetName(const char* name) { // Note that glibc also has a 'pthread_setname_np' api, but it may not be // available everywhere and it's only benefit over using prctl directly is @@ -612,6 +539,32 @@ pthread_setname_np(pthread_self(), "%s", name); #else prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); +diff --git ipc/chromium/src/base/ref_counted.h ipc/chromium/src/base/ref_counted.h +index 013bd66..18e2794 100644 +--- ipc/chromium/src/base/ref_counted.h ++++ ipc/chromium/src/base/ref_counted.h +@@ -28,7 +28,7 @@ class RefCountedBase { + bool in_dtor_; + #endif + +- DFAKE_MUTEX(add_release_); ++ DFAKE_MUTEX(add_release_) + + DISALLOW_COPY_AND_ASSIGN(RefCountedBase); + }; +diff --git ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +index 342e6d9..b011baf 100644 +--- ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ++++ ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { + // In debugging mode, it's a fatal error to try and add more than this number + // of descriptors to a FileDescriptorSet. + enum { +- MAX_DESCRIPTORS_PER_MESSAGE = 4, ++ MAX_DESCRIPTORS_PER_MESSAGE = 4 + }; + + // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -653,7 +606,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,371 @@ +@@ -0,0 +1,369 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -662,35 +615,20 @@ + +#include "base/process_util.h" + -+#include -+#include -+#include -+#include -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ -+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") -+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") -+#else -+#define PRE_SYS_INCLUDE -+#define POST_SYS_INCLUDE -+#endif -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#include +#include ++#include +#include -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include -+POST_SYS_INCLUDE +#endif + ++#include ++#include ++#include ++#include ++ ++#include ++ +#include "base/debug_util.h" +#include "base/eintr_wrapper.h" +#include "base/file_util.h" @@ -698,6 +636,17 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + ++#ifdef OS_NETBSD ++#include ++#if __NetBSD_Version__ >= 599006500 ++#define HAVE_POSIX_SPAWN 1 ++#endif ++#endif ++ ++#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 ++#define HAVE_POSIX_SPAWN 1 ++#endif ++ +/* + * On platforms that are not gonk based, we fall back to an arbitrary + * UID. This is generally the UID for user `nobody', albeit it is not @@ -712,15 +661,17 @@ +# define CHILD_UNPRIVILEGED_GID 65534 +#endif + -+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 -+#define HAVE_POSIX_SPAWN 1 ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif +#endif + +#ifdef HAVE_POSIX_SPAWN -+PRE_SYS_INCLUDE +#include -+extern "C" char **environ; -+POST_SYS_INCLUDE ++extern "C" char **environ __dso_public; +#endif + +namespace { @@ -1116,24 +1067,30 @@ --- ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -27,9 +33,16 @@ #error Please add support for your platform in build/build_config.h #endif ++// For access to standard BSD features, use OS_BSD instead of a ++// more specific macro. ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) ++#define OS_BSD 1 ++#endif ++ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) @@ -1175,7 +1132,7 @@ #endif -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) ++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) // There size_t is a synonym for |unsigned long| ... template <> struct ParamTraits { @@ -1184,7 +1141,7 @@ #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) ++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| template <> struct ParamTraits { @@ -1206,7 +1163,7 @@ }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#elif defined(OS_MACOSX) || defined(OS_BSD) typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; @@ -1284,7 +1241,7 @@ +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ ++# keep `environ' unresolved, see bug 14426 for binutils +EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols +endif + Modified: branches/experimental/www/firefox/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox/files/patch-bug753046 Thu Aug 9 06:40:34 2012 (r915) +++ branches/experimental/www/firefox/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916) @@ -4,15 +4,14 @@ --- dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.cpp -@@ -33,6 +33,8 @@ - #include "nsPluginsDir.h" - #include "nsXULAppAPI.h" +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#include -+ - #ifdef MOZ_X11 - # include "mozilla/X11Util.h" - #endif + #ifdef MOZ_WIDGET_QT ++#include // for _exit() + #include + #include "nsQAppInstance.h" + #include "NestedLoopTimer.h" @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -65,7 +64,7 @@ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -244,7 +243,7 @@ // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -252,6 +251,8 @@ + being_debugged = (info.kp_flags & P_TRACED) != 0; +#elif defined(OS_FREEBSD) + being_debugged = (info.ki_flag & P_TRACED) != 0; ++#elif defined(OS_OPENBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif @@ -399,105 +400,19 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include - #elif defined(OS_POSIX) - #include --#include - #include -+#include - #endif +diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc +index 171e44f..0c6dfcc 100644 +--- ipc/chromium/src/base/file_util_linux.cc ++++ ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } - #include -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,80 @@ -+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include -+#include -+ -+#include -+#include -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -537,11 +452,15 @@ --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE + #elif defined(OS_POSIX) + #include + typedef pthread_t PlatformThreadHandle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) #include typedef pid_t PlatformThreadId; -+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include @@ -550,7 +469,7 @@ --- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,18 @@ +@@ -9,9 +9,23 @@ #if defined(OS_MACOSX) #include @@ -562,14 +481,19 @@ +#elif defined(OS_DRAGONFLY) +#include +#elif defined(OS_FREEBSD) ++#include ++#if __FreeBSD_version > 802500 ++#include ++#else +_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); // XXX #include ++extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") ++#endif +#include #endif #if defined(OS_MACOSX) -@@ -38,7 +45,19 @@ +@@ -38,9 +45,20 @@ // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); @@ -587,9 +511,38 @@ + return lwpid; +# endif +#elif defined(OS_OPENBSD) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); +- // TODO(BSD): find a better thread ID +- return (intptr_t)(pthread_self()); ++ return (intptr_t) (pthread_self()); #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif +diff --git ipc/chromium/src/base/ref_counted.h ipc/chromium/src/base/ref_counted.h +index 013bd66..18e2794 100644 +--- ipc/chromium/src/base/ref_counted.h ++++ ipc/chromium/src/base/ref_counted.h +@@ -28,7 +28,7 @@ class RefCountedBase { + bool in_dtor_; + #endif + +- DFAKE_MUTEX(add_release_); ++ DFAKE_MUTEX(add_release_) + + DISALLOW_COPY_AND_ASSIGN(RefCountedBase); + }; +diff --git ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +index 342e6d9..b011baf 100644 +--- ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ++++ ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { + // In debugging mode, it's a fatal error to try and add more than this number + // of descriptors to a FileDescriptorSet. + enum { +- MAX_DESCRIPTORS_PER_MESSAGE = 4, ++ MAX_DESCRIPTORS_PER_MESSAGE = 4 + }; + + // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -631,7 +584,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,322 @@ +@@ -0,0 +1,320 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -640,35 +593,20 @@ + +#include "base/process_util.h" + -+#include -+#include -+#include -+#include -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ -+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") -+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") -+#else -+#define PRE_SYS_INCLUDE -+#define POST_SYS_INCLUDE -+#endif -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#include +#include ++#include +#include -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include -+POST_SYS_INCLUDE +#endif + ++#include ++#include ++#include ++#include ++ ++#include ++ +#include "base/debug_util.h" +#include "base/eintr_wrapper.h" +#include "base/file_util.h" @@ -676,15 +614,28 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + ++#ifdef OS_NETBSD ++#include ++#if __NetBSD_Version__ >= 599006500 ++#define HAVE_POSIX_SPAWN 1 ++#endif ++#endif ++ +#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif ++#endif ++ +#ifdef HAVE_POSIX_SPAWN -+PRE_SYS_INCLUDE +#include -+extern "C" char **environ; -+POST_SYS_INCLUDE ++extern "C" char **environ __dso_public; +#endif + +namespace { @@ -1096,24 +1047,30 @@ --- ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -27,9 +33,16 @@ #error Please add support for your platform in build/build_config.h #endif ++// For access to standard BSD features, use OS_BSD instead of a ++// more specific macro. ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) ++#define OS_BSD 1 ++#endif ++ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) @@ -1155,7 +1112,7 @@ #endif -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) ++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) // There size_t is a synonym for |unsigned long| ... template <> struct ParamTraits { @@ -1164,7 +1121,7 @@ #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) ++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| template <> struct ParamTraits { @@ -1186,7 +1143,7 @@ }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#elif defined(OS_MACOSX) || defined(OS_BSD) typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; @@ -1264,7 +1221,7 @@ +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ ++# keep `environ' unresolved, see bug 14426 for binutils +EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols +endif + Modified: branches/experimental/www/libxul/files/patch-bug753046 ============================================================================== --- branches/experimental/www/libxul/files/patch-bug753046 Thu Aug 9 06:40:34 2012 (r915) +++ branches/experimental/www/libxul/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916) @@ -4,15 +4,14 @@ --- dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.cpp -@@ -33,6 +33,8 @@ - #include "nsPluginsDir.h" - #include "nsXULAppAPI.h" +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#include -+ - #ifdef MOZ_X11 - # include "mozilla/X11Util.h" - #endif + #ifdef MOZ_WIDGET_QT ++#include // for _exit() + #include + #include "nsQAppInstance.h" + #include "NestedLoopTimer.h" @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -65,7 +64,7 @@ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -244,7 +243,7 @@ // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -252,6 +251,8 @@ + being_debugged = (info.kp_flags & P_TRACED) != 0; +#elif defined(OS_FREEBSD) + being_debugged = (info.ki_flag & P_TRACED) != 0; ++#elif defined(OS_OPENBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif @@ -394,105 +395,19 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include - #elif defined(OS_POSIX) - #include --#include - #include -+#include - #endif +diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc +index 171e44f..0c6dfcc 100644 +--- ipc/chromium/src/base/file_util_linux.cc ++++ ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } - #include -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,80 @@ -+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include -+#include -+ -+#include -+#include -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -532,11 +447,15 @@ --- ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE + #elif defined(OS_POSIX) + #include + typedef pthread_t PlatformThreadHandle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) #include typedef pid_t PlatformThreadId; -+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include @@ -545,7 +464,7 @@ --- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,18 @@ +@@ -9,9 +9,23 @@ #if defined(OS_MACOSX) #include @@ -557,14 +476,19 @@ +#elif defined(OS_DRAGONFLY) +#include +#elif defined(OS_FREEBSD) ++#include ++#if __FreeBSD_version > 802500 ++#include ++#else +_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); // XXX #include ++extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") ++#endif +#include #endif #if defined(OS_MACOSX) -@@ -38,7 +45,19 @@ +@@ -38,9 +45,20 @@ // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); @@ -582,9 +506,38 @@ + return lwpid; +# endif +#elif defined(OS_OPENBSD) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); +- // TODO(BSD): find a better thread ID +- return (intptr_t)(pthread_self()); ++ return (intptr_t) (pthread_self()); #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif +diff --git ipc/chromium/src/base/ref_counted.h ipc/chromium/src/base/ref_counted.h +index 013bd66..18e2794 100644 +--- ipc/chromium/src/base/ref_counted.h ++++ ipc/chromium/src/base/ref_counted.h +@@ -28,7 +28,7 @@ class RefCountedBase { + bool in_dtor_; + #endif + +- DFAKE_MUTEX(add_release_); ++ DFAKE_MUTEX(add_release_) + + DISALLOW_COPY_AND_ASSIGN(RefCountedBase); + }; +diff --git ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +index 342e6d9..b011baf 100644 +--- ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ++++ ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { + // In debugging mode, it's a fatal error to try and add more than this number + // of descriptors to a FileDescriptorSet. + enum { +- MAX_DESCRIPTORS_PER_MESSAGE = 4, ++ MAX_DESCRIPTORS_PER_MESSAGE = 4 + }; + + // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -626,7 +579,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,322 @@ +@@ -0,0 +1,320 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -635,35 +588,20 @@ + +#include "base/process_util.h" + -+#include -+#include -+#include -+#include -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ -+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") -+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") -+#else -+#define PRE_SYS_INCLUDE -+#define POST_SYS_INCLUDE -+#endif -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#include +#include ++#include +#include -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include -+POST_SYS_INCLUDE +#endif + ++#include ++#include ++#include ++#include ++ ++#include ++ +#include "base/debug_util.h" +#include "base/eintr_wrapper.h" +#include "base/file_util.h" @@ -671,15 +609,28 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + ++#ifdef OS_NETBSD ++#include ++#if __NetBSD_Version__ >= 599006500 ++#define HAVE_POSIX_SPAWN 1 ++#endif ++#endif ++ +#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif ++#endif ++ +#ifdef HAVE_POSIX_SPAWN -+PRE_SYS_INCLUDE +#include -+extern "C" char **environ; -+POST_SYS_INCLUDE ++extern "C" char **environ __dso_public; +#endif + +namespace { @@ -1091,24 +1042,30 @@ --- ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -27,9 +33,16 @@ #error Please add support for your platform in build/build_config.h #endif ++// For access to standard BSD features, use OS_BSD instead of a ++// more specific macro. ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) ++#define OS_BSD 1 ++#endif ++ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) @@ -1150,7 +1107,7 @@ #endif -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) ++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) // There size_t is a synonym for |unsigned long| ... template <> struct ParamTraits { @@ -1159,7 +1116,7 @@ #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) ++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| template <> struct ParamTraits { @@ -1181,7 +1138,7 @@ }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#elif defined(OS_MACOSX) || defined(OS_BSD) typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; @@ -1259,7 +1216,7 @@ +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ ++# keep `environ' unresolved, see bug 14426 for binutils +EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols +endif + Modified: branches/experimental/www/seamonkey/files/patch-bug753046 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bug753046 Thu Aug 9 06:40:34 2012 (r915) +++ branches/experimental/www/seamonkey/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916) @@ -4,15 +4,14 @@ --- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp -@@ -33,6 +33,8 @@ - #include "nsPluginsDir.h" - #include "nsXULAppAPI.h" +@@ -5,6 +5,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#include -+ - #ifdef MOZ_X11 - # include "mozilla/X11Util.h" - #endif + #ifdef MOZ_WIDGET_QT ++#include // for _exit() + #include + #include "nsQAppInstance.h" + #include "NestedLoopTimer.h" @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here @@ -65,7 +64,7 @@ + +CPPSRCS += \ + atomicops_internals_x86_gcc.cc \ -+ file_util_bsd.cc \ ++ file_util_linux.cc \ + process_util_bsd.cc \ + time_posix.cc \ + $(NULL) @@ -244,7 +243,7 @@ // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() { +@@ -71,7 +76,15 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -252,6 +251,8 @@ + being_debugged = (info.kp_flags & P_TRACED) != 0; +#elif defined(OS_FREEBSD) + being_debugged = (info.ki_flag & P_TRACED) != 0; ++#elif defined(OS_OPENBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif @@ -399,105 +400,19 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util.h -@@ -16,8 +16,8 @@ - #include - #elif defined(OS_POSIX) - #include --#include - #include -+#include - #endif +diff --git mozilla/ipc/chromium/src/base/file_util_linux.cc mozilla/ipc/chromium/src/base/file_util_linux.cc +index 171e44f..0c6dfcc 100644 +--- mozilla/ipc/chromium/src/base/file_util_linux.cc ++++ mozilla/ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) { + } - #include -$NetBSD: patch-ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/file_util_bsd.cc.orig 2012-01-07 18:21:18.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/file_util_bsd.cc -@@ -0,0 +1,80 @@ -+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// this is a derivative of file_util_linux.cc -+ -+#include "base/file_util.h" -+ -+#include -+#include -+ -+#include -+#include -+ -+#include "base/eintr_wrapper.h" -+#include "base/file_path.h" -+#include "base/string_util.h" -+ -+namespace file_util { -+ -+bool GetTempDir(FilePath* path) { -+ const char* tmp = getenv("TMPDIR"); -+ if (tmp) -+ *path = FilePath(tmp); -+ else -+ *path = FilePath("/tmp"); -+ return true; -+} -+ -+bool GetShmemTempDir(FilePath* path) { -+ return GetTempDir(path); -+} -+ -+bool CopyFile(const FilePath& from_path, const FilePath& to_path) { -+ int infile = open(from_path.value().c_str(), O_RDONLY); -+ if (infile < 0) -+ return false; -+ -+ int outfile = creat(to_path.value().c_str(), 0666); -+ if (outfile < 0) { -+ close(infile); -+ return false; -+ } -+ -+ const size_t kBufferSize = 32768; -+ std::vector buffer(kBufferSize); -+ bool result = true; -+ -+ while (result) { -+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size())); -+ if (bytes_read < 0) { -+ result = false; -+ break; -+ } -+ if (bytes_read == 0) -+ break; -+ // Allow for partial writes -+ ssize_t bytes_written_per_read = 0; -+ do { -+ ssize_t bytes_written_partial = HANDLE_EINTR(write( -+ outfile, -+ &buffer[bytes_written_per_read], -+ bytes_read - bytes_written_per_read)); -+ if (bytes_written_partial < 0) { -+ result = false; -+ break; -+ } -+ bytes_written_per_read += bytes_written_partial; -+ } while (bytes_written_per_read < bytes_read); -+ } -+ -+ if (HANDLE_EINTR(close(infile)) < 0) -+ result = false; -+ if (HANDLE_EINTR(close(outfile)) < 0) -+ result = false; -+ -+ return result; -+} -+ -+} // namespace file_util + bool GetShmemTempDir(FilePath* path) { +-#ifdef ANDROID ++#if defined(ANDROID) || defined(OS_BSD) + return GetTempDir(path); + #else + *path = FilePath("/dev/shm"); $NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000 @@ -537,11 +452,15 @@ --- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread.h -@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle; - #if defined(OS_LINUX) +@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; // HANDLE + #elif defined(OS_POSIX) + #include + typedef pthread_t PlatformThreadHandle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_OPENBSD) #include typedef pid_t PlatformThreadId; -+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD) ++#elif defined(OS_BSD) +typedef lwpid_t PlatformThreadId; #elif defined(OS_MACOSX) #include @@ -550,7 +469,7 @@ --- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,18 @@ +@@ -9,9 +9,23 @@ #if defined(OS_MACOSX) #include @@ -562,14 +481,19 @@ +#elif defined(OS_DRAGONFLY) +#include +#elif defined(OS_FREEBSD) ++#include ++#if __FreeBSD_version > 802500 ++#include ++#else +_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); // XXX #include ++extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") ++#endif +#include #endif #if defined(OS_MACOSX) -@@ -38,7 +45,19 @@ +@@ -38,9 +45,20 @@ // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); @@ -587,9 +511,38 @@ + return lwpid; +# endif +#elif defined(OS_OPENBSD) - // TODO(BSD): find a better thread ID - return (intptr_t)(pthread_self()); +- // TODO(BSD): find a better thread ID +- return (intptr_t)(pthread_self()); ++ return (intptr_t) (pthread_self()); #elif defined(OS_LINUX) + return syscall(__NR_gettid); + #endif +diff --git mozilla/ipc/chromium/src/base/ref_counted.h mozilla/ipc/chromium/src/base/ref_counted.h +index 013bd66..18e2794 100644 +--- mozilla/ipc/chromium/src/base/ref_counted.h ++++ mozilla/ipc/chromium/src/base/ref_counted.h +@@ -28,7 +28,7 @@ class RefCountedBase { + bool in_dtor_; + #endif + +- DFAKE_MUTEX(add_release_); ++ DFAKE_MUTEX(add_release_) + + DISALLOW_COPY_AND_ASSIGN(RefCountedBase); + }; +diff --git mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +index 342e6d9..b011baf 100644 +--- mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h ++++ mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h +@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::RefCountedThreadSafe { + // In debugging mode, it's a fatal error to try and add more than this number + // of descriptors to a FileDescriptorSet. + enum { +- MAX_DESCRIPTORS_PER_MESSAGE = 4, ++ MAX_DESCRIPTORS_PER_MESSAGE = 4 + }; + + // --------------------------------------------------------------------------- $NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.1 2012/03/06 12:34:09 ryoon Exp $ --- mozilla/ipc/chromium/src/base/process_util.h.orig 2011-12-21 00:28:19.000000000 +0100 @@ -631,7 +584,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,322 @@ +@@ -0,0 +1,320 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -640,35 +593,20 @@ + +#include "base/process_util.h" + -+#include -+#include -+#include -+#include -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) -+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */ -+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)") -+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop") -+#else -+#define PRE_SYS_INCLUDE -+#define POST_SYS_INCLUDE -+#endif -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#include +#include ++#include +#include -+#if defined(OS_DRAGONFLY) -+PRE_SYS_INCLUDE -+#include -+POST_SYS_INCLUDE -+#endif -+#if defined(OS_FREEBSD) -+PRE_SYS_INCLUDE ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) +#include -+POST_SYS_INCLUDE +#endif + ++#include ++#include ++#include ++#include ++ ++#include ++ +#include "base/debug_util.h" +#include "base/eintr_wrapper.h" +#include "base/file_util.h" @@ -676,15 +614,28 @@ +#include "base/string_tokenizer.h" +#include "base/string_util.h" + ++#ifdef OS_NETBSD ++#include ++#if __NetBSD_Version__ >= 599006500 ++#define HAVE_POSIX_SPAWN 1 ++#endif ++#endif ++ +#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 +#define HAVE_POSIX_SPAWN 1 +#endif + ++#ifndef __dso_public ++# ifdef __exported ++# define __dso_public __exported ++# else ++# define __dso_public __attribute__((__visibility__("default"))) ++# endif ++#endif ++ +#ifdef HAVE_POSIX_SPAWN -+PRE_SYS_INCLUDE +#include -+extern "C" char **environ; -+POST_SYS_INCLUDE ++extern "C" char **environ __dso_public; +#endif + +namespace { @@ -1096,24 +1047,30 @@ --- mozilla/ipc/chromium/src/build/build_config.h.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/build/build_config.h -@@ -19,17 +19,23 @@ +@@ -19,6 +19,12 @@ #define OS_MACOSX 1 #elif defined(__linux__) || defined(ANDROID) #define OS_LINUX 1 -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 +#elif defined(__DragonFly__) +#define OS_DRAGONFLY 1 ++#elif defined(__FreeBSD__) ++#define OS_FREEBSD 1 ++#elif defined(__NetBSD__) ++#define OS_NETBSD 1 #elif defined(__OpenBSD__) #define OS_OPENBSD 1 #elif defined(_WIN32) - #define OS_WIN 1 -+#elif defined(__FreeBSD__) -+#define OS_FREEBSD 1 - #else +@@ -27,9 +33,16 @@ #error Please add support for your platform in build/build_config.h #endif ++// For access to standard BSD features, use OS_BSD instead of a ++// more specific macro. ++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ ++ || defined(OS_NETBSD) || defined(OS_OPENBSD) ++#define OS_BSD 1 ++#endif ++ // For access to standard POSIX features, use OS_POSIX instead of a more // specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD) @@ -1155,7 +1112,7 @@ #endif -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) -+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) ++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390)) // There size_t is a synonym for |unsigned long| ... template <> struct ParamTraits { @@ -1164,7 +1121,7 @@ #endif // defined(OS_MACOSX) -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) -+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) ++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) // int64 is |long int| on 64-bit systems, uint64 is |unsigned long| template <> struct ParamTraits { @@ -1186,7 +1143,7 @@ }; typedef HandleAndSequenceNum Id; -#elif defined(OS_MACOSX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) ++#elif defined(OS_MACOSX) || defined(OS_BSD) typedef base::SharedMemoryHandle Handle; // On Mac, the inode number of the backing file is used as an id. typedef base::SharedMemoryId Id; @@ -1264,7 +1221,7 @@ +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_ARCH))) +OS_LIBS += $(call EXPAND_LIBNAME,kvm) -+#EXTRA_DSO_LDOPTS += -Wl,--ignore-unresolved-symbol,environ ++# keep `environ' unresolved, see bug 14426 for binutils +EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols +endif + From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 9 06:41:08 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6987106566B for ; Thu, 9 Aug 2012 06:41: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 B14CE8FC0C for ; Thu, 9 Aug 2012 06:41: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 q796f65D004355 for ; Thu, 9 Aug 2012 06:41:06 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q796f1Nn096647 for freebsd-gecko@freebsd.org; Thu, 9 Aug 2012 06:41:01 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 9 Aug 2012 06:41:01 GMT Message-Id: <201208090641.q796f1Nn096647@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r917 - in branches/experimental: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files www/seamonkey www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Aug 2012 06:41:08 -0000 Author: jbeich Date: Thu Aug 9 06:41:01 2012 New Revision: 917 Log: update Added: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-gc-Memory.cpp branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-Makefile.in branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-platform-linux.cc branches/experimental/www/firefox-nightly/files/patch-js-src-js-confdefs.h.in - copied, changed from r916, branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in branches/experimental/www/firefox/files/patch-gfx-skia-Makefile.in branches/experimental/www/firefox/files/patch-js-src-gc-Memory.cpp branches/experimental/www/firefox/files/patch-tools-profiler-Makefile.in branches/experimental/www/firefox/files/patch-tools-profiler-platform-linux.cc branches/experimental/www/seamonkey/files/patch-mozilla-js-src-gc-Memory.cpp branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-Makefile.in branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-platform-linux.cc Deleted: branches/experimental/www/firefox-nightly/files/patch-gfx-ycbcr-Makefile.in branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird/distinfo branches/experimental/mail/thunderbird/files/patch-alsapulse branches/experimental/mail/thunderbird/files/patch-bug753046 branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in branches/experimental/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp branches/experimental/www/firefox-nightly/Makefile.hgrev branches/experimental/www/firefox-nightly/distinfo branches/experimental/www/firefox-nightly/files/patch-alsapulse branches/experimental/www/firefox/Makefile branches/experimental/www/firefox/distinfo branches/experimental/www/firefox/files/patch-alsapulse branches/experimental/www/firefox/files/patch-bug753046 branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp branches/experimental/www/seamonkey/Makefile branches/experimental/www/seamonkey/distinfo branches/experimental/www/seamonkey/files/patch-alsapulse branches/experimental/www/seamonkey/files/patch-bug753046 branches/experimental/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:41:01 2012 (r917) @@ -725,6 +725,7 @@ LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins MOZ_OPTIONS+= --enable-alsa +MOZ_OPTIONS+= --disable-floating-point # bug780531 .endif .if ${PORT_OPTIONS:MPULSEAUDIO} Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/mail/thunderbird/Makefile Thu Aug 9 06:41:01 2012 (r917) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 14.0 +DISTVERSION= 15.0b2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -18,10 +18,12 @@ BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip USE_AUTOTOOLS= autoconf213:env +USE_PYTHON_BUILD=yes USE_GECKO= gecko CONFLICTS= thunderbird-10.* USE_MOZILLA= # empty @@ -56,7 +58,7 @@ .include "${.CURDIR}/../../www/firefox/Makefile.options" .include -WRKSRC= ${WRKDIR}/comm-release +WRKSRC= ${WRKDIR}/comm-beta MOZSRC:= ${WRKSRC}/mozilla .if ${ARCH} == amd64 Modified: branches/experimental/mail/thunderbird/distinfo ============================================================================== --- branches/experimental/mail/thunderbird/distinfo Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/mail/thunderbird/distinfo Thu Aug 9 06:41:01 2012 (r917) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-14.0.source.tar.bz2) = 29225e82c1dce9d44d1b81cf0441749ef8fc4168291cc75bcbcfe9b930f10c3a -SIZE (thunderbird-14.0.source.tar.bz2) = 105235591 +SHA256 (thunderbird-15.0b2.source.tar.bz2) = 70f795a7cb0e2304773aae5ba64ea58b1e59c6d9021fa7a3785a42b59fa4e707 +SIZE (thunderbird-15.0b2.source.tar.bz2) = 106002871 Modified: branches/experimental/mail/thunderbird/files/patch-alsapulse ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-alsapulse Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/mail/thunderbird/files/patch-alsapulse Thu Aug 9 06:41:01 2012 (r917) @@ -1,46 +1,46 @@ ---- mozilla/config/autoconf.mk.in~ +diff --git mozilla/config/autoconf.mk.in mozilla/config/autoconf.mk.in +index 44c0b06..748511b 100644 +--- mozilla/config/autoconf.mk.in +++ mozilla/config/autoconf.mk.in -@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF +@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ +MOZ_ALSA = @MOZ_ALSA@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ -+ + +MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@ +MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ +MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ - ++ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ ---- mozilla/configure.in~ + GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ +diff --git mozilla/configure.in mozilla/configure.in +index 5980b76..11f5f77 100644 +--- mozilla/configure.in +++ mozilla/configure.in -@@ -5758,17 +5775,47 @@ dnl ==================================== +@@ -5600,13 +5600,45 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(alsa, -+[ --enable-alsa Enable Alsa support], ++[ --enable-alsa Enable Alsa support (default on Linux)], +MOZ_ALSA=1, +MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) + dnl If using sydneyaudio with Linux, ensure that the alsa library is available --if test -n "$MOZ_SYDNEYAUDIO"; then -+if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then - case "$target_os" in - linux*) -+ MOZ_ALSA=1 -+ ;; -+ esac +-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then ++ MOZ_ALSA=1 +fi + +if test -n "$MOZ_ALSA"; then - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , [echo "$MOZ_ALSA_PKG_ERRORS" AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) -- ;; -- esac fi +AC_SUBST(MOZ_ALSA) @@ -55,6 +55,7 @@ +MOZ_PULSEAUDIO=) + +if test -n "$MOZ_PULSEAUDIO"; then ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , + [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" + AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) @@ -65,9 +66,58 @@ +AC_SUBST(MOZ_PULSEAUDIO) + dnl ======================================================== - dnl Permissions System + dnl = Enable GStreamer dnl ======================================================== ---- mozilla/media/libsydneyaudio/src/Makefile.in~ +diff --git mozilla/media/libcubeb/src/Makefile.in mozilla/media/libcubeb/src/Makefile.in +index 5ab4dd8..c8df26f 100644 +--- mozilla/media/libcubeb/src/Makefile.in ++++ mozilla/media/libcubeb/src/Makefile.in +@@ -24,10 +24,6 @@ endif + + ifeq ($(OS_TARGET),Android) + # No Android implementation of libcubeb yet. +-else ifeq ($(OS_TARGET),Linux) +-CSRCS = \ +- cubeb_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_TARGET),Darwin) +@@ -42,4 +38,16 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ cubeb_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ cubeb_pulse.c \ ++ $(NULL) ++endif ++ + include $(topsrcdir)/config/rules.mk +diff --git mozilla/media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c +index 599aea2..41fd5af 100644 +--- mozilla/media/libcubeb/src/cubeb_alsa.c ++++ mozilla/media/libcubeb/src/cubeb_alsa.c +@@ -6,7 +6,10 @@ + */ + #undef NDEBUG + #define _BSD_SOURCE ++#if !defined(__DragonFly__) && !defined(__FreeBSD__) \ ++ && !defined(__NetBSD__) && !defined(__OpenBSD__) + #define _POSIX_SOURCE ++#endif + #include + #include + #include +diff --git mozilla/media/libsydneyaudio/src/Makefile.in mozilla/media/libsydneyaudio/src/Makefile.in +index 8dda8ce..b19641d 100644 +--- mozilla/media/libsydneyaudio/src/Makefile.in +++ mozilla/media/libsydneyaudio/src/Makefile.in @@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) CSRCS = \ @@ -99,20 +149,23 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += winmm.lib endif ---- mozilla/toolkit/library/Makefile.in~ +diff --git mozilla/toolkit/library/Makefile.in mozilla/toolkit/library/Makefile.in +index 43384e9..e46a6e3 100644 +--- mozilla/toolkit/library/Makefile.in +++ mozilla/toolkit/library/Makefile.in -@@ -375,10 +375,12 @@ endif +@@ -379,10 +379,13 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) -ifdef MOZ_SYDNEYAUDIO -ifeq ($(OS_ARCH),Linux) ++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) +ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) endif -+ +ifdef MOZ_PULSEAUDIO +EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) ++endif endif ifdef HAVE_CLOCK_MONOTONIC Modified: branches/experimental/mail/thunderbird/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/mail/thunderbird/files/patch-bug753046 Thu Aug 9 06:41:01 2012 (r917) @@ -469,7 +469,7 @@ --- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,23 @@ +@@ -9,16 +9,30 @@ #if defined(OS_MACOSX) #include @@ -477,9 +477,10 @@ +#include #elif defined(OS_LINUX) #include - #include -+#elif defined(OS_DRAGONFLY) -+#include +-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) + #include +-#elif !defined(__NetBSD__) +-#include +#elif defined(OS_FREEBSD) +#include +#if __FreeBSD_version > 802500 @@ -489,15 +490,24 @@ +extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") +#endif -+#include + #endif ++ ++#if !defined(OS_MACOSX) + #include #endif ++#if defined(OS_BSD) && !defined(OS_NETBSD) ++#include ++#endif ++ #if defined(OS_MACOSX) -@@ -38,9 +45,20 @@ + namespace base { + void InitThreading(); +@@ -38,9 +45,20 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); --#elif defined (__OpenBSD__) +-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#elif defined(OS_NETBSD) + return _lwp_self(); +#elif defined(OS_DRAGONFLY) @@ -517,6 +527,18 @@ #elif defined(OS_LINUX) return syscall(__NR_gettid); #endif +@@ -102,9 +102,9 @@ void PlatformThread::SetName(const char* name) { + // Note that glibc also has a 'pthread_setname_np' api, but it may not be + // available everywhere and it's only benefit over using prctl directly is + // that it can set the name of threads other than the current thread. +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) ++#if defined(OS_BSD) && !defined(OS_NETBSD) + pthread_set_name_np(pthread_self(), name); +-#elif defined(__NetBSD__) ++#elif defined(OS_NETBSD) + pthread_setname_np(pthread_self(), "%s", name); + #else + prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); diff --git mozilla/ipc/chromium/src/base/ref_counted.h mozilla/ipc/chromium/src/base/ref_counted.h index 013bd66..18e2794 100644 --- mozilla/ipc/chromium/src/base/ref_counted.h Added: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-gc-Memory.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-gc-Memory.cpp Thu Aug 9 06:41:01 2012 (r917) @@ -0,0 +1,13 @@ +--- mozilla/js/src/gc/Memory.cpp~ ++++ mozilla/js/src/gc/Memory.cpp +@@ -292,9 +292,9 @@ GetPageFaultCount() + #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN) + + #include +-#include + #include + #include ++#include + + void + InitMemorySubsystem() Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in Thu Aug 9 06:41:01 2012 (r917) @@ -1,10 +1,11 @@ --- mozilla/layout/generic/Makefile.in~ +++ mozilla/layout/generic/Makefile.in -@@ -154,9 +154,10 @@ LOCAL_INCLUDES += \ +@@ -123,10 +123,11 @@ LOCAL_INCLUDES += \ -I$(srcdir)/../../dom/base \ -I$(srcdir)/../../dom/plugins/base \ -I$(srcdir)/../svg/base/src \ - $(MOZ_CAIRO_CFLAGS) \ + $(MOZ_PIXMAN_CFLAGS) \ $(NULL) +CXXFLAGS += $(MOZ_CAIRO_CFLAGS) Added: branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-Makefile.in Thu Aug 9 06:41:01 2012 (r917) @@ -0,0 +1,11 @@ +--- mozilla/tools/profiler/Makefile.in~ ++++ mozilla/tools/profiler/Makefile.in +@@ -78,7 +78,7 @@ EXTRA_JS_MODULES = \ + Profiler.jsm \ + $(NULL) + +-ifneq (,$(filter Android Linux,$(OS_TARGET))) ++ifneq (,$(filter Android Linux FreeBSD,$(OS_TARGET))) + CPPSRCS += \ + shared-libraries-linux.cc \ + platform-linux.cc \ Added: branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-platform-linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-tools-profiler-platform-linux.cc Thu Aug 9 06:41:01 2012 (r917) @@ -0,0 +1,43 @@ +--- mozilla/tools/profiler/platform-linux.cc~ ++++ mozilla/tools/profiler/platform-linux.cc +@@ -133,7 +133,7 @@ static void ProfilerSignalHandler(int si + sActiveSampler->Tick(sample); + } + +-#ifndef XP_MACOSX ++#if !defined(XP_MACOSX) && !defined(__FreeBSD__) + void tgkill(pid_t tgid, pid_t tid, int signalno) { + syscall(SYS_tgkill, tgid, tid, signalno); + } +@@ -145,11 +145,11 @@ class Sampler::PlatformData : public Mal + : sampler_(sampler), + signal_handler_installed_(false), + vm_tgid_(getpid()), +-#ifndef XP_MACOSX ++#if !defined(XP_MACOSX) && !defined(__FreeBSD__) + vm_tid_(gettid()), + #endif + signal_sender_launched_(false) +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__FreeBSD__) + , signal_receiver_(pthread_self()) + #endif + { +@@ -140,7 +140,7 @@ class Sampler::PlatformData : public Mal + sampler_->HandleSaveRequest(); + + if (!sampler_->IsPaused()) { +-#ifdef XP_MACOSX ++#ifdef XP_MACOSX || defined(__FreeBSD__) + pthread_kill(signal_receiver_, SIGPROF); + #else + // Glibc doesn't provide a wrapper for tgkill(2). +@@ -192,7 +192,7 @@ class Sampler::PlatformData : public Mal + pid_t vm_tid_; + bool signal_sender_launched_; + pthread_t signal_sender_thread_; +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__FreeBSD__) + pthread_t signal_receiver_; + #endif + }; Modified: branches/experimental/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:41:01 2012 (r917) @@ -1,6 +1,6 @@ --- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -89,6 +89,11 @@ +@@ -57,6 +57,11 @@ nsresult nsThreadManager::Init() { @@ -9,6 +9,6 @@ + if (!gTLSThreadID) + gTLSThreadID = mozilla::threads::Generic; +#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; + mThreadsByPRThread.Init(); + if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) Modified: branches/experimental/www/firefox-nightly/Makefile.hgrev ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile.hgrev Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/firefox-nightly/Makefile.hgrev Thu Aug 9 06:41:01 2012 (r917) @@ -1 +1 @@ -HGREV= 100823:29bff59d3bbe +HGREV= 101824:4e3fb1f9f72a Modified: branches/experimental/www/firefox-nightly/distinfo ============================================================================== --- branches/experimental/www/firefox-nightly/distinfo Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/firefox-nightly/distinfo Thu Aug 9 06:41:01 2012 (r917) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/29bff59d3bbe.tar.bz2) = 7df2790a9fb29025ac7a402105d84d462405ce9b13f8c8ecb131c7ebd9f08cd8 -SIZE (firefox-nightly/29bff59d3bbe.tar.bz2) = 87797021 +SHA256 (firefox-nightly/4e3fb1f9f72a.tar.bz2) = 0eaf99781af4ec5994fb8458c39c7db0299f17c581bff2391846babb134dc902 +SIZE (firefox-nightly/4e3fb1f9f72a.tar.bz2) = 88008681 Modified: branches/experimental/www/firefox-nightly/files/patch-alsapulse ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-alsapulse Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/firefox-nightly/files/patch-alsapulse Thu Aug 9 06:41:01 2012 (r917) @@ -1,32 +1,13 @@ -diff --git config/autoconf.mk.in config/autoconf.mk.in -index 44c0b06..748511b 100644 ---- config/autoconf.mk.in -+++ config/autoconf.mk.in -@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ - MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ - MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ - -+MOZ_ALSA = @MOZ_ALSA@ - MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ - MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ - -+MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@ -+MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ -+MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ -+ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ - GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ diff --git configure.in configure.in index 5980b76..11f5f77 100644 --- configure.in +++ configure.in -@@ -5600,13 +5600,45 @@ dnl ======================================================== +@@ -5600,13 +5600,25 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(alsa, -+[ --enable-alsa Enable Alsa support], ++[ --enable-alsa Enable Alsa support (default on Linux)], +MOZ_ALSA=1, +MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) + @@ -37,36 +18,16 @@ +fi + +if test -n "$MOZ_ALSA"; then ++ AC_DEFINE(MOZ_CUBEB) PKG_CHECK_MODULES(MOZ_ALSA, alsa, , [echo "$MOZ_ALSA_PKG_ERRORS" AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) -+ AC_DEFINE(MOZ_CUBEB) fi +AC_SUBST(MOZ_ALSA) + -+dnl ======================================================== -+dnl = Enable PulseAudio -+dnl ======================================================== -+ -+MOZ_ARG_ENABLE_BOOL(pulseaudio, -+[ --enable-pulseaudio Enable PulseAudio support], -+MOZ_PULSEAUDIO=1, -+MOZ_PULSEAUDIO=) -+ -+if test -n "$MOZ_PULSEAUDIO"; then -+ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , -+ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" -+ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) -+ AC_DEFINE(MOZ_CUBEB) -+fi -+ -+AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) -+AC_SUBST(MOZ_PULSEAUDIO_LIBS) -+AC_SUBST(MOZ_PULSEAUDIO) -+ dnl ======================================================== - dnl = Enable GStreamer + dnl = Enable PulseAudio dnl ======================================================== diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in index 5ab4dd8..c8df26f 100644 @@ -83,7 +44,7 @@ endif ifeq ($(OS_TARGET),Darwin) -@@ -42,4 +38,16 @@ CSRCS = \ +@@ -42,6 +38,12 @@ CSRCS = \ $(NULL) endif @@ -93,22 +54,19 @@ + $(NULL) +endif + -+ifdef MOZ_PULSEAUDIO -+CSRCS = \ -+ cubeb_pulse.c \ -+ $(NULL) -+endif -+ - include $(topsrcdir)/config/rules.mk + ifdef MOZ_PULSEAUDIO + CSRCS = \ + cubeb_pulse.c \ diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c index 599aea2..41fd5af 100644 --- media/libcubeb/src/cubeb_alsa.c +++ media/libcubeb/src/cubeb_alsa.c -@@ -6,7 +6,9 @@ +@@ -6,7 +6,10 @@ */ #undef NDEBUG #define _BSD_SOURCE -+#ifndef __FreeBSD__ ++#if !defined(__DragonFly__) && !defined(__FreeBSD__) \ ++ && !defined(__NetBSD__) && !defined(__OpenBSD__) #define _POSIX_SOURCE +#endif #include @@ -152,18 +110,20 @@ index 43384e9..e46a6e3 100644 --- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -375,10 +375,12 @@ endif +@@ -370,14 +370,11 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) -ifdef MOZ_SYDNEYAUDIO -ifeq ($(OS_ARCH),Linux) ++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) +ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) endif -+ -+ifdef MOZ_PULSEAUDIO -+EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) +-endif +- + ifdef MOZ_PULSEAUDIO +-ifdef MOZ_CUBEB + EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif endif - - ifdef HAVE_CLOCK_MONOTONIC Deleted: branches/experimental/www/firefox-nightly/files/patch-gfx-ycbcr-Makefile.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-gfx-ycbcr-Makefile.in Thu Aug 9 06:41:01 2012 (r916) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- gfx/ycbcr/Makefile.in~ -+++ gfx/ycbcr/Makefile.in -@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) - else -+ifeq ($(OS_ARCH),FreeBSD) -+CPPSRCS += yuv_row_posix.cpp \ -+ $(NULL) -+else - ifeq ($(OS_ARCH),SunOS) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) -@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \ - $(NULL) - endif # Darwin - endif # SunOS -+endif # FreeBSD - endif # linux - endif # windows - \ No newline at end of file Deleted: branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in Thu Aug 9 06:41:01 2012 (r916) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 -+++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n - * C++ implementations should define these macros only when __STDC_LIMIT_MACROS - * is defined before is included. */ - #define __STDC_LIMIT_MACROS -+#define __STDC_CONSTANT_MACROS - - #endif /* _JS_CONFDEFS_H_ */ - Copied and modified: branches/experimental/www/firefox-nightly/files/patch-js-src-js-confdefs.h.in (from r916, branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in) ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-js-src-configure.in Thu Aug 9 06:40:45 2012 (r916, copy source) +++ branches/experimental/www/firefox-nightly/files/patch-js-src-js-confdefs.h.in Thu Aug 9 06:41:01 2012 (r917) @@ -1,6 +1,6 @@ ---- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 -+++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 -@@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n +--- js/src/js-confdefs.h.in~ ++++ js/src/js-confdefs.h.in +@@ -12,6 +12,7 @@ * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before is included. */ #define __STDC_LIMIT_MACROS Deleted: branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Thu Aug 9 06:41:01 2012 (r916) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); Deleted: branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h Thu Aug 9 06:41:01 2012 (r916) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800 -+++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800 -@@ -45,7 +45,7 @@ - - class xptiInterfaceEntry; - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; -@@ -62,7 +62,7 @@ - #undef STUB_ENTRY - #undef SENTINEL_ENTRY - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); Deleted: branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Thu Aug 9 06:41:01 2012 (r916) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 -@@ -70,7 +70,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -341,7 +356,7 @@ - # - # Linux/PPC - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) -+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp - ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +365,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -350,7 +350,7 @@ - # - # OpenBSD/SPARC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc64) -+ifneq (,$(filter OpenBSDsparc64 FreeBSDsparc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp - ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s - endif Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/firefox/Makefile Thu Aug 9 06:41:01 2012 (r917) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 14.0.1 +DISTVERSION= 15.0b3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -19,10 +19,12 @@ BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip USE_AUTOTOOLS= autoconf213:env +USE_PYTHON_BUILD=yes USE_GECKO= gecko CONFLICTS= firefox-10.* MOZ_PKGCONFIG_FILES= # empty @@ -52,7 +54,7 @@ .include "${.CURDIR}/../../www/firefox/Makefile.options" .include -WRKSRC:= ${WRKDIR}/mozilla-release +WRKSRC:= ${WRKDIR}/mozilla-beta .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} Modified: branches/experimental/www/firefox/distinfo ============================================================================== --- branches/experimental/www/firefox/distinfo Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/firefox/distinfo Thu Aug 9 06:41:01 2012 (r917) @@ -1,2 +1,2 @@ -SHA256 (firefox-14.0.1.source.tar.bz2) = c21988f0207b678376c3d96f647aadf6d694e836f0b5c933ec15d93b75ea89aa -SIZE (firefox-14.0.1.source.tar.bz2) = 82478218 +SHA256 (firefox-15.0b3.source.tar.bz2) = 5e85181e1af15c99da37f473c5c5bb1cb2658845c1c71b1a77014008af2f76d3 +SIZE (firefox-15.0b3.source.tar.bz2) = 83580198 Modified: branches/experimental/www/firefox/files/patch-alsapulse ============================================================================== --- branches/experimental/www/firefox/files/patch-alsapulse Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/firefox/files/patch-alsapulse Thu Aug 9 06:41:01 2012 (r917) @@ -1,46 +1,46 @@ ---- config/autoconf.mk.in~ +diff --git config/autoconf.mk.in config/autoconf.mk.in +index 44c0b06..748511b 100644 +--- config/autoconf.mk.in +++ config/autoconf.mk.in -@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF +@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ +MOZ_ALSA = @MOZ_ALSA@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ -+ + +MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@ +MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ +MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ - ++ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ ---- configure.in~ + GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ +diff --git configure.in configure.in +index 5980b76..11f5f77 100644 +--- configure.in +++ configure.in -@@ -5758,17 +5775,47 @@ dnl ==================================== +@@ -5600,13 +5600,45 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(alsa, -+[ --enable-alsa Enable Alsa support], ++[ --enable-alsa Enable Alsa support (default on Linux)], +MOZ_ALSA=1, +MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) + dnl If using sydneyaudio with Linux, ensure that the alsa library is available --if test -n "$MOZ_SYDNEYAUDIO"; then -+if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then - case "$target_os" in - linux*) -+ MOZ_ALSA=1 -+ ;; -+ esac +-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then ++ MOZ_ALSA=1 +fi + +if test -n "$MOZ_ALSA"; then - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , [echo "$MOZ_ALSA_PKG_ERRORS" AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) -- ;; -- esac fi +AC_SUBST(MOZ_ALSA) @@ -55,6 +55,7 @@ +MOZ_PULSEAUDIO=) + +if test -n "$MOZ_PULSEAUDIO"; then ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , + [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" + AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) @@ -65,9 +66,58 @@ +AC_SUBST(MOZ_PULSEAUDIO) + dnl ======================================================== - dnl Permissions System + dnl = Enable GStreamer dnl ======================================================== ---- media/libsydneyaudio/src/Makefile.in~ +diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in +index 5ab4dd8..c8df26f 100644 +--- media/libcubeb/src/Makefile.in ++++ media/libcubeb/src/Makefile.in +@@ -24,10 +24,6 @@ endif + + ifeq ($(OS_TARGET),Android) + # No Android implementation of libcubeb yet. +-else ifeq ($(OS_TARGET),Linux) +-CSRCS = \ +- cubeb_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_TARGET),Darwin) +@@ -42,4 +38,16 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ cubeb_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ cubeb_pulse.c \ ++ $(NULL) ++endif ++ + include $(topsrcdir)/config/rules.mk +diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c +index 599aea2..41fd5af 100644 +--- media/libcubeb/src/cubeb_alsa.c ++++ media/libcubeb/src/cubeb_alsa.c +@@ -6,7 +6,10 @@ + */ + #undef NDEBUG + #define _BSD_SOURCE ++#if !defined(__DragonFly__) && !defined(__FreeBSD__) \ ++ && !defined(__NetBSD__) && !defined(__OpenBSD__) + #define _POSIX_SOURCE ++#endif + #include + #include + #include +diff --git media/libsydneyaudio/src/Makefile.in media/libsydneyaudio/src/Makefile.in +index 8dda8ce..b19641d 100644 +--- media/libsydneyaudio/src/Makefile.in +++ media/libsydneyaudio/src/Makefile.in @@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) CSRCS = \ @@ -99,20 +149,23 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += winmm.lib endif ---- toolkit/library/Makefile.in~ +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 43384e9..e46a6e3 100644 +--- toolkit/library/Makefile.in +++ toolkit/library/Makefile.in -@@ -375,10 +375,12 @@ endif +@@ -379,10 +379,13 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) -ifdef MOZ_SYDNEYAUDIO -ifeq ($(OS_ARCH),Linux) ++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) +ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) endif -+ +ifdef MOZ_PULSEAUDIO +EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) ++endif endif ifdef HAVE_CLOCK_MONOTONIC Modified: branches/experimental/www/firefox/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/firefox/files/patch-bug753046 Thu Aug 9 06:41:01 2012 (r917) @@ -469,7 +469,7 @@ --- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,23 @@ +@@ -9,16 +9,30 @@ #if defined(OS_MACOSX) #include @@ -477,9 +477,10 @@ +#include #elif defined(OS_LINUX) #include - #include -+#elif defined(OS_DRAGONFLY) -+#include +-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) + #include +-#elif !defined(__NetBSD__) +-#include +#elif defined(OS_FREEBSD) +#include +#if __FreeBSD_version > 802500 @@ -489,15 +490,24 @@ +extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") +#endif -+#include + #endif ++ ++#if !defined(OS_MACOSX) + #include #endif ++#if defined(OS_BSD) && !defined(OS_NETBSD) ++#include ++#endif ++ #if defined(OS_MACOSX) -@@ -38,9 +45,20 @@ + namespace base { + void InitThreading(); +@@ -38,9 +45,20 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); --#elif defined (__OpenBSD__) +-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#elif defined(OS_NETBSD) + return _lwp_self(); +#elif defined(OS_DRAGONFLY) @@ -517,6 +527,18 @@ #elif defined(OS_LINUX) return syscall(__NR_gettid); #endif +@@ -102,9 +102,9 @@ void PlatformThread::SetName(const char* name) { + // Note that glibc also has a 'pthread_setname_np' api, but it may not be + // available everywhere and it's only benefit over using prctl directly is + // that it can set the name of threads other than the current thread. +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) ++#if defined(OS_BSD) && !defined(OS_NETBSD) + pthread_set_name_np(pthread_self(), name); +-#elif defined(__NetBSD__) ++#elif defined(OS_NETBSD) + pthread_setname_np(pthread_self(), "%s", name); + #else + prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); diff --git ipc/chromium/src/base/ref_counted.h ipc/chromium/src/base/ref_counted.h index 013bd66..18e2794 100644 --- ipc/chromium/src/base/ref_counted.h Added: branches/experimental/www/firefox/files/patch-gfx-skia-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-gfx-skia-Makefile.in Thu Aug 9 06:41:01 2012 (r917) @@ -0,0 +1,11 @@ +--- gfx/skia/Makefile.in~ ++++ gfx/skia/Makefile.in +@@ -339,7 +339,7 @@ CPPSRCS += \ + SkMMapStream.cpp \ + SkOSFile.cpp \ + $(NULL) +-ifeq (Linux,$(OS_TARGET)) ++ifneq (,$(MOZ_X11)) + CPPSRCS += \ + SkFontHost_linux.cpp \ + SkFontHost_tables.cpp \ Added: branches/experimental/www/firefox/files/patch-js-src-gc-Memory.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-js-src-gc-Memory.cpp Thu Aug 9 06:41:01 2012 (r917) @@ -0,0 +1,13 @@ +--- js/src/gc/Memory.cpp~ ++++ js/src/gc/Memory.cpp +@@ -292,9 +292,9 @@ GetPageFaultCount() + #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN) + + #include +-#include + #include + #include ++#include + + void + InitMemorySubsystem() Modified: branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in ============================================================================== --- branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in Thu Aug 9 06:41:01 2012 (r917) @@ -1,10 +1,11 @@ --- layout/generic/Makefile.in~ +++ layout/generic/Makefile.in -@@ -154,9 +154,10 @@ LOCAL_INCLUDES += \ +@@ -123,10 +123,11 @@ LOCAL_INCLUDES += \ -I$(srcdir)/../../dom/base \ -I$(srcdir)/../../dom/plugins/base \ -I$(srcdir)/../svg/base/src \ - $(MOZ_CAIRO_CFLAGS) \ + $(MOZ_PIXMAN_CFLAGS) \ $(NULL) +CXXFLAGS += $(MOZ_CAIRO_CFLAGS) Added: branches/experimental/www/firefox/files/patch-tools-profiler-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-tools-profiler-Makefile.in Thu Aug 9 06:41:01 2012 (r917) @@ -0,0 +1,11 @@ +--- tools/profiler/Makefile.in~ ++++ tools/profiler/Makefile.in +@@ -78,7 +78,7 @@ EXTRA_JS_MODULES = \ + Profiler.jsm \ + $(NULL) + +-ifneq (,$(filter Android Linux,$(OS_TARGET))) ++ifneq (,$(filter Android Linux FreeBSD,$(OS_TARGET))) + CPPSRCS += \ + shared-libraries-linux.cc \ + platform-linux.cc \ Added: branches/experimental/www/firefox/files/patch-tools-profiler-platform-linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-tools-profiler-platform-linux.cc Thu Aug 9 06:41:01 2012 (r917) @@ -0,0 +1,43 @@ +--- tools/profiler/platform-linux.cc~ ++++ tools/profiler/platform-linux.cc +@@ -133,7 +133,7 @@ static void ProfilerSignalHandler(int si + sActiveSampler->Tick(sample); + } + +-#ifndef XP_MACOSX ++#if !defined(XP_MACOSX) && !defined(__FreeBSD__) + void tgkill(pid_t tgid, pid_t tid, int signalno) { + syscall(SYS_tgkill, tgid, tid, signalno); + } +@@ -145,11 +145,11 @@ class Sampler::PlatformData : public Mal + : sampler_(sampler), + signal_handler_installed_(false), + vm_tgid_(getpid()), +-#ifndef XP_MACOSX ++#if !defined(XP_MACOSX) && !defined(__FreeBSD__) + vm_tid_(gettid()), + #endif + signal_sender_launched_(false) +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__FreeBSD__) + , signal_receiver_(pthread_self()) + #endif + { +@@ -140,7 +140,7 @@ class Sampler::PlatformData : public Mal + sampler_->HandleSaveRequest(); + + if (!sampler_->IsPaused()) { +-#ifdef XP_MACOSX ++#ifdef XP_MACOSX || defined(__FreeBSD__) + pthread_kill(signal_receiver_, SIGPROF); + #else + // Glibc doesn't provide a wrapper for tgkill(2). +@@ -192,7 +192,7 @@ class Sampler::PlatformData : public Mal + pid_t vm_tid_; + bool signal_sender_launched_; + pthread_t signal_sender_thread_; +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__FreeBSD__) + pthread_t signal_receiver_; + #endif + }; Modified: branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp ============================================================================== --- branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:41:01 2012 (r917) @@ -1,6 +1,6 @@ --- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -89,6 +89,11 @@ +@@ -57,6 +57,11 @@ nsresult nsThreadManager::Init() { @@ -9,6 +9,6 @@ + if (!gTLSThreadID) + gTLSThreadID = mozilla::threads::Generic; +#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; + mThreadsByPRThread.Init(); + if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/seamonkey/Makefile Thu Aug 9 06:41:01 2012 (r917) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.11 +DISTVERSION= 2.12b3 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -18,9 +18,11 @@ BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip USE_AUTOTOOLS= autoconf213:env +USE_PYTHON_BUILD=yes USE_BZIP2= yes USE_GMAKE= yes USE_GECKO= gecko @@ -55,7 +57,7 @@ .include "${.CURDIR}/../../www/firefox/Makefile.options" .include -WRKSRC= ${WRKDIR}/comm-release +WRKSRC= ${WRKDIR}/comm-beta MOZSRC:= ${WRKSRC}/mozilla .if ${ARCH} == amd64 Modified: branches/experimental/www/seamonkey/distinfo ============================================================================== --- branches/experimental/www/seamonkey/distinfo Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/seamonkey/distinfo Thu Aug 9 06:41:01 2012 (r917) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.11.source.tar.bz2) = 6771ee2abb068825748e6ebcaae4e789e4c64db9b220afaf42dc13934b52c4d9 -SIZE (seamonkey-2.11.source.tar.bz2) = 105846143 +SHA256 (seamonkey-2.12b3.source.tar.bz2) = 58365256f059edafd555bf74f05adc020062eb5dd037f7892f0d73951bf244f6 +SIZE (seamonkey-2.12b3.source.tar.bz2) = 106662657 Modified: branches/experimental/www/seamonkey/files/patch-alsapulse ============================================================================== --- branches/experimental/www/seamonkey/files/patch-alsapulse Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/seamonkey/files/patch-alsapulse Thu Aug 9 06:41:01 2012 (r917) @@ -1,46 +1,46 @@ ---- mozilla/config/autoconf.mk.in~ +diff --git mozilla/config/autoconf.mk.in mozilla/config/autoconf.mk.in +index 44c0b06..748511b 100644 +--- mozilla/config/autoconf.mk.in +++ mozilla/config/autoconf.mk.in -@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF +@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ +MOZ_ALSA = @MOZ_ALSA@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ -+ + +MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@ +MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ +MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ - ++ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ ---- mozilla/configure.in~ + GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ +diff --git mozilla/configure.in mozilla/configure.in +index 5980b76..11f5f77 100644 +--- mozilla/configure.in +++ mozilla/configure.in -@@ -5758,17 +5775,47 @@ dnl ==================================== +@@ -5600,13 +5600,45 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(alsa, -+[ --enable-alsa Enable Alsa support], ++[ --enable-alsa Enable Alsa support (default on Linux)], +MOZ_ALSA=1, +MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) + dnl If using sydneyaudio with Linux, ensure that the alsa library is available --if test -n "$MOZ_SYDNEYAUDIO"; then -+if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then - case "$target_os" in - linux*) -+ MOZ_ALSA=1 -+ ;; -+ esac +-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then ++ MOZ_ALSA=1 +fi + +if test -n "$MOZ_ALSA"; then - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , [echo "$MOZ_ALSA_PKG_ERRORS" AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) -- ;; -- esac fi +AC_SUBST(MOZ_ALSA) @@ -55,6 +55,7 @@ +MOZ_PULSEAUDIO=) + +if test -n "$MOZ_PULSEAUDIO"; then ++ AC_DEFINE(MOZ_CUBEB) + PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , + [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" + AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) @@ -65,9 +66,58 @@ +AC_SUBST(MOZ_PULSEAUDIO) + dnl ======================================================== - dnl Permissions System + dnl = Enable GStreamer dnl ======================================================== ---- mozilla/media/libsydneyaudio/src/Makefile.in~ +diff --git mozilla/media/libcubeb/src/Makefile.in mozilla/media/libcubeb/src/Makefile.in +index 5ab4dd8..c8df26f 100644 +--- mozilla/media/libcubeb/src/Makefile.in ++++ mozilla/media/libcubeb/src/Makefile.in +@@ -24,10 +24,6 @@ endif + + ifeq ($(OS_TARGET),Android) + # No Android implementation of libcubeb yet. +-else ifeq ($(OS_TARGET),Linux) +-CSRCS = \ +- cubeb_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_TARGET),Darwin) +@@ -42,4 +38,16 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ cubeb_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ cubeb_pulse.c \ ++ $(NULL) ++endif ++ + include $(topsrcdir)/config/rules.mk +diff --git mozilla/media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c +index 599aea2..41fd5af 100644 +--- mozilla/media/libcubeb/src/cubeb_alsa.c ++++ mozilla/media/libcubeb/src/cubeb_alsa.c +@@ -6,7 +6,10 @@ + */ + #undef NDEBUG + #define _BSD_SOURCE ++#if !defined(__DragonFly__) && !defined(__FreeBSD__) \ ++ && !defined(__NetBSD__) && !defined(__OpenBSD__) + #define _POSIX_SOURCE ++#endif + #include + #include + #include +diff --git mozilla/media/libsydneyaudio/src/Makefile.in mozilla/media/libsydneyaudio/src/Makefile.in +index 8dda8ce..b19641d 100644 +--- mozilla/media/libsydneyaudio/src/Makefile.in +++ mozilla/media/libsydneyaudio/src/Makefile.in @@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) CSRCS = \ @@ -99,20 +149,23 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += winmm.lib endif ---- mozilla/toolkit/library/Makefile.in~ +diff --git mozilla/toolkit/library/Makefile.in mozilla/toolkit/library/Makefile.in +index 43384e9..e46a6e3 100644 +--- mozilla/toolkit/library/Makefile.in +++ mozilla/toolkit/library/Makefile.in -@@ -375,10 +375,12 @@ endif +@@ -379,10 +379,13 @@ endif EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) -ifdef MOZ_SYDNEYAUDIO -ifeq ($(OS_ARCH),Linux) ++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO)) +ifdef MOZ_ALSA EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) endif -+ +ifdef MOZ_PULSEAUDIO +EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) ++endif endif ifdef HAVE_CLOCK_MONOTONIC Modified: branches/experimental/www/seamonkey/files/patch-bug753046 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bug753046 Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/seamonkey/files/patch-bug753046 Thu Aug 9 06:41:01 2012 (r917) @@ -469,7 +469,7 @@ --- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,23 @@ +@@ -9,16 +9,30 @@ #if defined(OS_MACOSX) #include @@ -477,9 +477,10 @@ +#include #elif defined(OS_LINUX) #include - #include -+#elif defined(OS_DRAGONFLY) -+#include +-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) + #include +-#elif !defined(__NetBSD__) +-#include +#elif defined(OS_FREEBSD) +#include +#if __FreeBSD_version > 802500 @@ -489,15 +490,24 @@ +extern "C" int thr_self(long *); +_Pragma("GCC visibility pop") +#endif -+#include + #endif ++ ++#if !defined(OS_MACOSX) + #include #endif ++#if defined(OS_BSD) && !defined(OS_NETBSD) ++#include ++#endif ++ #if defined(OS_MACOSX) -@@ -38,9 +45,20 @@ + namespace base { + void InitThreading(); +@@ -38,9 +45,20 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_MACOSX) return mach_thread_self(); --#elif defined (__OpenBSD__) +-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#elif defined(OS_NETBSD) + return _lwp_self(); +#elif defined(OS_DRAGONFLY) @@ -517,6 +527,18 @@ #elif defined(OS_LINUX) return syscall(__NR_gettid); #endif +@@ -102,9 +102,9 @@ void PlatformThread::SetName(const char* name) { + // Note that glibc also has a 'pthread_setname_np' api, but it may not be + // available everywhere and it's only benefit over using prctl directly is + // that it can set the name of threads other than the current thread. +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) ++#if defined(OS_BSD) && !defined(OS_NETBSD) + pthread_set_name_np(pthread_self(), name); +-#elif defined(__NetBSD__) ++#elif defined(OS_NETBSD) + pthread_setname_np(pthread_self(), "%s", name); + #else + prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); diff --git mozilla/ipc/chromium/src/base/ref_counted.h mozilla/ipc/chromium/src/base/ref_counted.h index 013bd66..18e2794 100644 --- mozilla/ipc/chromium/src/base/ref_counted.h Added: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-gc-Memory.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-gc-Memory.cpp Thu Aug 9 06:41:01 2012 (r917) @@ -0,0 +1,13 @@ +--- mozilla/js/src/gc/Memory.cpp~ ++++ mozilla/js/src/gc/Memory.cpp +@@ -292,9 +292,9 @@ GetPageFaultCount() + #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN) + + #include +-#include + #include + #include ++#include + + void + InitMemorySubsystem() Added: branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-Makefile.in Thu Aug 9 06:41:01 2012 (r917) @@ -0,0 +1,11 @@ +--- mozilla/tools/profiler/Makefile.in~ ++++ mozilla/tools/profiler/Makefile.in +@@ -78,7 +78,7 @@ EXTRA_JS_MODULES = \ + Profiler.jsm \ + $(NULL) + +-ifneq (,$(filter Android Linux,$(OS_TARGET))) ++ifneq (,$(filter Android Linux FreeBSD,$(OS_TARGET))) + CPPSRCS += \ + shared-libraries-linux.cc \ + platform-linux.cc \ Added: branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-platform-linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-tools-profiler-platform-linux.cc Thu Aug 9 06:41:01 2012 (r917) @@ -0,0 +1,43 @@ +--- mozilla/tools/profiler/platform-linux.cc~ ++++ mozilla/tools/profiler/platform-linux.cc +@@ -133,7 +133,7 @@ static void ProfilerSignalHandler(int si + sActiveSampler->Tick(sample); + } + +-#ifndef XP_MACOSX ++#if !defined(XP_MACOSX) && !defined(__FreeBSD__) + void tgkill(pid_t tgid, pid_t tid, int signalno) { + syscall(SYS_tgkill, tgid, tid, signalno); + } +@@ -145,11 +145,11 @@ class Sampler::PlatformData : public Mal + : sampler_(sampler), + signal_handler_installed_(false), + vm_tgid_(getpid()), +-#ifndef XP_MACOSX ++#if !defined(XP_MACOSX) && !defined(__FreeBSD__) + vm_tid_(gettid()), + #endif + signal_sender_launched_(false) +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__FreeBSD__) + , signal_receiver_(pthread_self()) + #endif + { +@@ -140,7 +140,7 @@ class Sampler::PlatformData : public Mal + sampler_->HandleSaveRequest(); + + if (!sampler_->IsPaused()) { +-#ifdef XP_MACOSX ++#ifdef XP_MACOSX || defined(__FreeBSD__) + pthread_kill(signal_receiver_, SIGPROF); + #else + // Glibc doesn't provide a wrapper for tgkill(2). +@@ -192,7 +192,7 @@ class Sampler::PlatformData : public Mal + pid_t vm_tid_; + bool signal_sender_launched_; + pthread_t signal_sender_thread_; +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__FreeBSD__) + pthread_t signal_receiver_; + #endif + }; Modified: branches/experimental/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:40:45 2012 (r916) +++ branches/experimental/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Thu Aug 9 06:41:01 2012 (r917) @@ -1,6 +1,6 @@ --- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -89,6 +89,11 @@ +@@ -57,6 +57,11 @@ nsresult nsThreadManager::Init() { @@ -9,6 +9,6 @@ + if (!gTLSThreadID) + gTLSThreadID = mozilla::threads::Generic; +#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; + mThreadsByPRThread.Init(); + if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 9 06:41:16 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 289EA106566C for ; Thu, 9 Aug 2012 06:41:16 +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 A760B8FC08 for ; Thu, 9 Aug 2012 06:41:15 +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 q796fEpY006432 for ; Thu, 9 Aug 2012 06:41:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q796f9ab005705 for freebsd-gecko@freebsd.org; Thu, 9 Aug 2012 06:41:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 9 Aug 2012 06:41:09 GMT Message-Id: <201208090641.q796f9ab005705@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r918 - in branches/experimental: mail/thunderbird www/firefox www/seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Aug 2012 06:41:16 -0000 Author: jbeich Date: Thu Aug 9 06:41:09 2012 New Revision: 918 Log: objdir build is no longer needed Affects: mail/enigmail Modified: branches/experimental/mail/thunderbird/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Thu Aug 9 06:41:01 2012 (r917) +++ branches/experimental/mail/thunderbird/Makefile Thu Aug 9 06:41:09 2012 (r918) @@ -34,7 +34,6 @@ QT_NONSTANDARD= yes ALL_TARGET= default GNU_CONFIGURE= yes -OBJDIR_BUILD= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Thu Aug 9 06:41:01 2012 (r917) +++ branches/experimental/www/firefox/Makefile Thu Aug 9 06:41:09 2012 (r918) @@ -37,7 +37,6 @@ QT_NONSTANDARD= yes ALL_TARGET= default GNU_CONFIGURE= yes -OBJDIR_BUILD= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Thu Aug 9 06:41:01 2012 (r917) +++ branches/experimental/www/seamonkey/Makefile Thu Aug 9 06:41:09 2012 (r918) @@ -31,7 +31,6 @@ QT_NONSTANDARD= yes WANT_PERL= yes GNU_CONFIGURE= yes -OBJDIR_BUILD= yes ALL_TARGET= default USE_GL= gl MAKE_JOBS_SAFE= yes From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 9 06:51:21 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7A10106566C for ; Thu, 9 Aug 2012 06:51:21 +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 4B8DF8FC15 for ; Thu, 9 Aug 2012 06:51:20 +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 q796pJN5041419 for ; Thu, 9 Aug 2012 06:51:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q796pEtp040593 for freebsd-gecko@freebsd.org; Thu, 9 Aug 2012 06:51:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 9 Aug 2012 06:51:14 GMT Message-Id: <201208090651.q796pEtp040593@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r919 - in branches/experimental: mail/thunderbird/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Aug 2012 06:51:21 -0000 Author: jbeich Date: Thu Aug 9 06:51:14 2012 New Revision: 919 Log: missed file (in r917) Added: branches/experimental/mail/thunderbird/files/patch-gfx-skia-Makefile.in branches/experimental/www/seamonkey/files/patch-gfx-skia-Makefile.in Added: branches/experimental/mail/thunderbird/files/patch-gfx-skia-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-gfx-skia-Makefile.in Thu Aug 9 06:51:14 2012 (r919) @@ -0,0 +1,11 @@ +--- mozilla/gfx/skia/Makefile.in~ ++++ mozilla/gfx/skia/Makefile.in +@@ -339,7 +339,7 @@ CPPSRCS += \ + SkMMapStream.cpp \ + SkOSFile.cpp \ + $(NULL) +-ifeq (Linux,$(OS_TARGET)) ++ifneq (,$(MOZ_X11)) + CPPSRCS += \ + SkFontHost_linux.cpp \ + SkFontHost_tables.cpp \ Added: branches/experimental/www/seamonkey/files/patch-gfx-skia-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-gfx-skia-Makefile.in Thu Aug 9 06:51:14 2012 (r919) @@ -0,0 +1,11 @@ +--- mozilla/gfx/skia/Makefile.in~ ++++ mozilla/gfx/skia/Makefile.in +@@ -339,7 +339,7 @@ CPPSRCS += \ + SkMMapStream.cpp \ + SkOSFile.cpp \ + $(NULL) +-ifeq (Linux,$(OS_TARGET)) ++ifneq (,$(MOZ_X11)) + CPPSRCS += \ + SkFontHost_linux.cpp \ + SkFontHost_tables.cpp \ From owner-freebsd-gecko@FreeBSD.ORG Fri Aug 10 06:45:12 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21274106564A for ; Fri, 10 Aug 2012 06:45: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 5FB948FC08 for ; Fri, 10 Aug 2012 06:45:11 +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 q7A6j4d5027092 for ; Fri, 10 Aug 2012 06:45:04 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7A6ivl8025804 for freebsd-gecko@freebsd.org; Fri, 10 Aug 2012 06:44:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 10 Aug 2012 06:44:57 GMT Message-Id: <201208100644.q7A6ivl8025804@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r920 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 10 Aug 2012 06:45:12 -0000 Author: jbeich Date: Fri Aug 10 06:44:57 2012 New Revision: 920 Log: don't add dlfcn.h undconditionally after bug#593911 Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Thu Aug 9 06:51:14 2012 (r919) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Fri Aug 10 06:44:57 2012 (r920) @@ -1,13 +1,5 @@ --- 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 -@@ -41,6 +41,7 @@ - /* API for getting a stack trace of the C/C++ stack on the current thread */ - - #include "nsStackWalk.h" -+#include - - #if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code - @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb #elif defined(HAVE__UNWIND_BACKTRACE) Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Thu Aug 9 06:51:14 2012 (r919) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Fri Aug 10 06:44:57 2012 (r920) @@ -1,13 +1,5 @@ --- 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 -@@ -41,6 +41,7 @@ - /* API for getting a stack trace of the C/C++ stack on the current thread */ - - #include "nsStackWalk.h" -+#include - - #if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code - @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb #elif defined(HAVE__UNWIND_BACKTRACE) Modified: branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp Thu Aug 9 06:51:14 2012 (r919) +++ branches/experimental/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp Fri Aug 10 06:44:57 2012 (r920) @@ -1,14 +1,5 @@ --- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 02:03:41.000000000 +0100 +++ xpcom/base/nsStackWalk.cpp 2010-12-15 11:28:20.000000000 +0100 -@@ -1137,7 +1137,7 @@ - #define __USE_GNU - #endif - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__) - #include - #endif - @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb #elif defined(HAVE__UNWIND_BACKTRACE) Modified: branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp Thu Aug 9 06:51:14 2012 (r919) +++ branches/experimental/www/firefox-nightly/files/patch-xpcom_base_nsStackWalk.cpp Fri Aug 10 06:44:57 2012 (r920) @@ -1,14 +1,5 @@ --- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 02:03:41.000000000 +0100 +++ xpcom/base/nsStackWalk.cpp 2010-12-15 11:28:20.000000000 +0100 -@@ -1137,7 +1137,7 @@ - #define __USE_GNU - #endif - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__) - #include - #endif - @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb #elif defined(HAVE__UNWIND_BACKTRACE) Modified: branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp ============================================================================== --- branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp Thu Aug 9 06:51:14 2012 (r919) +++ branches/experimental/www/firefox/files/patch-xpcom_base_nsStackWalk.cpp Fri Aug 10 06:44:57 2012 (r920) @@ -1,14 +1,5 @@ --- 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 -@@ -57,7 +57,7 @@ - }; - static CriticalAddress gCriticalAddress; - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__) - #include - #endif - @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb #elif defined(HAVE__UNWIND_BACKTRACE) Modified: branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp ============================================================================== --- branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp Thu Aug 9 06:51:14 2012 (r919) +++ branches/experimental/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp Fri Aug 10 06:44:57 2012 (r920) @@ -1,14 +1,5 @@ --- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 02:03:41.000000000 +0100 +++ xpcom/base/nsStackWalk.cpp 2010-12-15 11:28:20.000000000 +0100 -@@ -1137,7 +1137,7 @@ - #define __USE_GNU - #endif - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__) - #include - #endif - @@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb #elif defined(HAVE__UNWIND_BACKTRACE) From owner-freebsd-gecko@FreeBSD.ORG Fri Aug 10 06:45:14 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BB28A106566B for ; Fri, 10 Aug 2012 06:45:14 +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 578D28FC0A for ; Fri, 10 Aug 2012 06:45:14 +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 q7A6jDWF032204 for ; Fri, 10 Aug 2012 06:45:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7A6j85o031153 for freebsd-gecko@freebsd.org; Fri, 10 Aug 2012 06:45:08 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 10 Aug 2012 06:45:08 GMT Message-Id: <201208100645.q7A6j85o031153@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r921 - in branches/experimental: mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 10 Aug 2012 06:45:14 -0000 Author: jbeich Date: Fri Aug 10 06:45:08 2012 New Revision: 921 Log: shorter fix for cubeb_alsa.c (from issue#6) Modified: branches/experimental/mail/thunderbird/files/patch-alsapulse branches/experimental/www/firefox-nightly/files/patch-alsapulse branches/experimental/www/firefox/files/patch-alsapulse branches/experimental/www/seamonkey/files/patch-alsapulse Modified: branches/experimental/mail/thunderbird/files/patch-alsapulse ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-alsapulse Fri Aug 10 06:44:57 2012 (r920) +++ branches/experimental/mail/thunderbird/files/patch-alsapulse Fri Aug 10 06:45:08 2012 (r921) @@ -104,14 +104,11 @@ index 599aea2..41fd5af 100644 --- mozilla/media/libcubeb/src/cubeb_alsa.c +++ mozilla/media/libcubeb/src/cubeb_alsa.c -@@ -6,7 +6,10 @@ - */ +@@ -6,6 +6,7 @@ #undef NDEBUG #define _BSD_SOURCE -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) \ -+ && !defined(__NetBSD__) && !defined(__OpenBSD__) #define _POSIX_SOURCE -+#endif ++#define _XOPEN_SOURCE 500 #include #include #include Modified: branches/experimental/www/firefox-nightly/files/patch-alsapulse ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-alsapulse Fri Aug 10 06:44:57 2012 (r920) +++ branches/experimental/www/firefox-nightly/files/patch-alsapulse Fri Aug 10 06:45:08 2012 (r921) @@ -61,14 +61,11 @@ index 599aea2..41fd5af 100644 --- media/libcubeb/src/cubeb_alsa.c +++ media/libcubeb/src/cubeb_alsa.c -@@ -6,7 +6,10 @@ - */ +@@ -6,6 +6,7 @@ #undef NDEBUG #define _BSD_SOURCE -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) \ -+ && !defined(__NetBSD__) && !defined(__OpenBSD__) #define _POSIX_SOURCE -+#endif ++#define _XOPEN_SOURCE 500 #include #include #include Modified: branches/experimental/www/firefox/files/patch-alsapulse ============================================================================== --- branches/experimental/www/firefox/files/patch-alsapulse Fri Aug 10 06:44:57 2012 (r920) +++ branches/experimental/www/firefox/files/patch-alsapulse Fri Aug 10 06:45:08 2012 (r921) @@ -104,14 +104,11 @@ index 599aea2..41fd5af 100644 --- media/libcubeb/src/cubeb_alsa.c +++ media/libcubeb/src/cubeb_alsa.c -@@ -6,7 +6,10 @@ - */ +@@ -6,6 +6,7 @@ #undef NDEBUG #define _BSD_SOURCE -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) \ -+ && !defined(__NetBSD__) && !defined(__OpenBSD__) #define _POSIX_SOURCE -+#endif ++#define _XOPEN_SOURCE 500 #include #include #include Modified: branches/experimental/www/seamonkey/files/patch-alsapulse ============================================================================== --- branches/experimental/www/seamonkey/files/patch-alsapulse Fri Aug 10 06:44:57 2012 (r920) +++ branches/experimental/www/seamonkey/files/patch-alsapulse Fri Aug 10 06:45:08 2012 (r921) @@ -104,14 +104,11 @@ index 599aea2..41fd5af 100644 --- mozilla/media/libcubeb/src/cubeb_alsa.c +++ mozilla/media/libcubeb/src/cubeb_alsa.c -@@ -6,7 +6,10 @@ - */ +@@ -6,6 +6,7 @@ #undef NDEBUG #define _BSD_SOURCE -+#if !defined(__DragonFly__) && !defined(__FreeBSD__) \ -+ && !defined(__NetBSD__) && !defined(__OpenBSD__) #define _POSIX_SOURCE -+#endif ++#define _XOPEN_SOURCE 500 #include #include #include From owner-freebsd-gecko@FreeBSD.ORG Sat Aug 11 04:50:56 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 223B3106564A for ; Sat, 11 Aug 2012 04:50:56 +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 9B7638FC08 for ; Sat, 11 Aug 2012 04:50:55 +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 q7B4osK0043490 for ; Sat, 11 Aug 2012 04:50:54 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7B4ompp042961 for freebsd-gecko@freebsd.org; Sat, 11 Aug 2012 04:50:48 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 11 Aug 2012 04:50:48 GMT Message-Id: <201208110450.q7B4ompp042961@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r922 - branches/experimental/www/firefox-nightly/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 11 Aug 2012 04:50:56 -0000 Author: jbeich Date: Sat Aug 11 04:50:48 2012 New Revision: 922 Log: (test) don't disable floating-point exceptions anymore There's either a FreeBSD bug or they need to be disabled on every platform (or every BSD) so that upstream prevents bitrot. Deleted: branches/experimental/www/firefox-nightly/files/patch-js_src_jsnum.cpp Modified: branches/experimental/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Modified: branches/experimental/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Fri Aug 10 06:45:08 2012 (r921) +++ branches/experimental/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Sat Aug 11 04:50:48 2012 (r922) @@ -1,11 +1,20 @@ ---- content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200 -+++ content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200 -@@ -54,7 +54,7 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ +--- content/base/public/nsContentUtils.h~ ++++ content/base/public/nsContentUtils.h +@@ -18,17 +18,6 @@ #include + #endif + +-//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. +-#ifdef __FreeBSD__ +-#include -#ifdef __alpha__ -+#if !defined(__amd64__) && !defined(__i386__) - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #else - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +-#else +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; +-#endif +-static fp_except_t oldmask = fpsetmask(~allmask); +-#endif +- + #include "nsAString.h" + #include "nsIStatefulFrame.h" + #include "nsNodeInfoManager.h" Deleted: branches/experimental/www/firefox-nightly/files/patch-js_src_jsnum.cpp ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-js_src_jsnum.cpp Sat Aug 11 04:50:48 2012 (r921) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,31 +0,0 @@ ---- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500 -+++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500 -@@ -49,6 +49,9 @@ - // Avoid warnings about ASSERT being defined by the assembler as well. - #undef ASSERT - -+#if defined(__FreeBSD__) -+#include -+#endif - #ifdef XP_OS2 - #define _PC_53 PC_53 - #define _MCW_EM MCW_EM -@@ -691,8 +694,18 @@ - - #else - -+#if defined(__FreeBSD__) -+#if __BSD_VISIBLE == 0 -+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined -+#endif -+#include -+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT)) -+#else -+ - #define FIX_FPU() ((void)0) - -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ -+ - #endif - - JSBool From owner-freebsd-gecko@FreeBSD.ORG Sat Aug 11 04:51:04 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC22F106564A for ; Sat, 11 Aug 2012 04:51:04 +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 759718FC0A for ; Sat, 11 Aug 2012 04:51:04 +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 q7B4p3HR045004 for ; Sat, 11 Aug 2012 04:51:03 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7B4owv4044660 for freebsd-gecko@freebsd.org; Sat, 11 Aug 2012 04:50:58 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 11 Aug 2012 04:50:58 GMT Message-Id: <201208110450.q7B4owv4044660@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r923 - branches/experimental/security/nss/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 11 Aug 2012 04:51:05 -0000 Author: jbeich Date: Sat Aug 11 04:50:58 2012 New Revision: 923 Log: don't override -O/-g levels from CFLAGS/DEBUG_FLAGS Added: branches/experimental/security/nss/files/patch-..::coreconf::UNIX.mk Added: branches/experimental/security/nss/files/patch-..::coreconf::UNIX.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/security/nss/files/patch-..::coreconf::UNIX.mk Sat Aug 11 04:50:58 2012 (r923) @@ -0,0 +1,13 @@ +--- ../coreconf/UNIX.mk~ ++++ ../coreconf/UNIX.mk +@@ -42,10 +42,8 @@ AR = ar cr $@ + LDOPTS += -L$(SOURCE_LIB_DIR) + + ifdef BUILD_OPT +- OPTIMIZER += -O + DEFINES += -UDEBUG -DNDEBUG + else +- OPTIMIZER += -g + USERNAME := $(shell whoami) + USERNAME := $(subst -,_,$(USERNAME)) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME)