From owner-freebsd-gecko@FreeBSD.ORG Sun Sep 2 14:30:59 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 94241106566C; Sun, 2 Sep 2012 14:30:59 +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 67A3B8FC12; Sun, 2 Sep 2012 14:30:59 +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 q82EUxxM044190; Sun, 2 Sep 2012 14:30:59 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q82EUx5a044179; Sun, 2 Sep 2012 14:30:59 GMT (envelope-from edwin) Date: Sun, 2 Sep 2012 14:30:59 GMT Message-Id: <201209021430.q82EUx5a044179@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/171255: Fix www/firefox on FreeBSD 7.4/amd64 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: Sun, 02 Sep 2012 14:30:59 -0000 Synopsis: Fix www/firefox on FreeBSD 7.4/amd64 Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Sun Sep 2 14:30:58 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=171255 From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 11:01:50 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 CE04E1065674 for ; Mon, 3 Sep 2012 11:01:50 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirj.bris.ac.uk (dirj.bris.ac.uk [137.222.10.78]) by mx1.freebsd.org (Postfix) with ESMTP id 88B218FC0A for ; Mon, 3 Sep 2012 11:01:50 +0000 (UTC) Received: from ncsc.bris.ac.uk ([137.222.10.41]) by dirj.bris.ac.uk with esmtp (Exim 4.72) (envelope-from ) id 1T8ULH-0005bJ-7t for freebsd-gecko@freebsd.org; Mon, 03 Sep 2012 11:57:19 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncsc.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1T8ULG-0000C2-Rb for freebsd-gecko@freebsd.org; Mon, 03 Sep 2012 11:57:18 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5) with ESMTP id q83AvIQo072478 for ; Mon, 3 Sep 2012 11:57:18 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5/Submit) id q83AvIcG072477 for freebsd-gecko@freebsd.org; Mon, 3 Sep 2012 11:57:18 +0100 (BST) (envelope-from mexas) Date: Mon, 3 Sep 2012 11:57:18 +0100 (BST) From: Anton Shterenlikht Message-Id: <201209031057.q83AvIcG072477@mech-cluster241.men.bris.ac.uk> To: freebsd-gecko@freebsd.org Subject: something wrong with http://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: mexas@bristol.ac.uk List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Sep 2012 11:01:50 -0000 # svn info Path: . Working Copy Root Path: /usr/ports/experimental URL: http://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental Repository Root: http://trillian.chruetertee.ch/svn/freebsd-gecko Repository UUID: 6ab5617d-af29-de11-a9e3-001676731981 Revision: 966 Node Kind: directory Schedule: normal Last Changed Author: jbeich Last Changed Rev: 966 Last Changed Date: 2012-08-30 05:06:25 +0100 (Thu, 30 Aug 2012) # svn up Updating '.': svn: E160005: Target path '/branches/experimental' does not exist # http://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental returns 404. Or have I missed some changes to the infrastructure? Thanks Anton From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 11:10:37 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 B67B71065675 for ; Mon, 3 Sep 2012 11:10:37 +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 A0BE08FC1D for ; Mon, 3 Sep 2012 11:10:37 +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 q83BAbGa058569 for ; Mon, 3 Sep 2012 11:10:37 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q83BAZsm058248 for gecko@FreeBSD.org; Mon, 3 Sep 2012 11:10:35 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 3 Sep 2012 11:10:35 GMT Message-Id: <201209031110.q83BAZsm058248@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, 03 Sep 2012 11:10:37 -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/171255 gecko Fix www/firefox on FreeBSD 7.4/amd64 o ports/171219 gecko www/firefox-i18n russian language pack don't translate o ports/170402 gecko www/linux-firefox: crash with flashplugin o ports/170310 gecko mail/thunderbird: coredump/crash when used with OpenLD o ports/169729 gecko www/firefox-esr "make package" produces package with z o ports/169366 gecko www/xpi-* ports need re-install after each Firefox upd o ports/169241 gecko www/firefox Right mouse buttom click freeze screen o ports/168091 gecko Mk/bsd.gecko.mk error: USE_FIREFOX doesn't work correc o ports/167397 gecko mail/thunderbird-i18n Version 12.0 and freebsd 9.0: ca 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/164239 gecko [PATCH] mail/thunderbird: crash with nss_ldap o ports/164013 gecko www/firefox: Firefox-9 Icons & xpi-addons from ports o ports/162939 gecko www/firefox crashes with Zotero add-on o ports/162075 gecko www/firefox >= 7.0.1_2 bug with respect to pentadactyl o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local o ports/156335 gecko www/firefox: Repeatable firefox-4.0_1,1 crash f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 19 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 11:11:11 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 EFACF1065713 for ; Mon, 3 Sep 2012 11:11:10 +0000 (UTC) (envelope-from flo@smeets.im) Received: from mail.solomo.de (mail.solomo.de [IPv6:2a01:238:42c7:9a00::2]) by mx1.freebsd.org (Postfix) with ESMTP id 7DD698FC16 for ; Mon, 3 Sep 2012 11:11:10 +0000 (UTC) Received: from mail.solomo.de (localhost [127.0.0.1]) by mail.solomo.de (Postfix) with ESMTP id 69DAEC381A; Mon, 3 Sep 2012 13:11:09 +0200 (CEST) X-Virus-Scanned: amavisd-new at solomo.de Received: from mail.solomo.de ([127.0.0.1]) by mail.solomo.de (mail.solomo.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 0D1gxNh5LUOh; Mon, 3 Sep 2012 13:11:09 +0200 (CEST) Received: from bender.solomo.local (bsdruler.solomo.de [213.172.127.26]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.solomo.de (Postfix) with ESMTPSA id D5449C3823; Mon, 3 Sep 2012 13:11:08 +0200 (CEST) Message-ID: <5044904C.4000201@smeets.im> Date: Mon, 03 Sep 2012 13:11:08 +0200 From: Florian Smeets User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:15.0) Gecko/20120823 Thunderbird/15.0 MIME-Version: 1.0 To: mexas@bristol.ac.uk References: <201209031057.q83AvIcG072477@mech-cluster241.men.bris.ac.uk> In-Reply-To: <201209031057.q83AvIcG072477@mech-cluster241.men.bris.ac.uk> X-Enigmail-Version: 1.4.3 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-gecko@freebsd.org Subject: Re: something wrong with http://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental 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, 03 Sep 2012 11:11:11 -0000 On 09/03/2012 12:57, Anton Shterenlikht wrote: > > # svn up > Updating '.': > svn: E160005: Target path '/branches/experimental' does not exist > # > > http://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental > returns 404. > > Or have I missed some changes to the infrastructure? > The experimental branch has been removed, as we only used one branch anyway. Everybody who wants the newest gecko goodness should be using the following URL now. https://trillian.chruetertee.ch/svn/freebsd-gecko/trunk Either use svn switch or do a new checkout. Florian From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 11:59: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 DE5BF1065674 for ; Mon, 3 Sep 2012 11:59: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 61C1B8FC17 for ; Mon, 3 Sep 2012 11:59:13 +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 q83Bx6Kv072046 for ; Mon, 3 Sep 2012 11:59: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 q83Bx1TJ071442 for freebsd-gecko@freebsd.org; Mon, 3 Sep 2012 11:59:01 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 3 Sep 2012 11:59:01 GMT Message-Id: <201209031159.q83Bx1TJ071442@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] r972 - in trunk: 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: Mon, 03 Sep 2012 11:59:15 -0000 Author: jbeich Date: Mon Sep 3 11:59:01 2012 New Revision: 972 Log: add -mssse3 workaround for /stable/7, regressed since r221317 PR: ports/171255 Added: trunk/mail/thunderbird/files/patch-bug786995 trunk/www/firefox-nightly/files/patch-bug786995 trunk/www/firefox/files/patch-bug786995 trunk/www/seamonkey/files/patch-bug786995 Added: trunk/mail/thunderbird/files/patch-bug786995 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug786995 Mon Sep 3 11:59:01 2012 (r972) @@ -0,0 +1,36 @@ +# Bug 786995 - configure should check for SSSE3 support in the whole toolchain + +--- mozilla/configure.in.orig 2012-09-02 00:37:29.000000000 +0200 ++++ mozilla/configure.in 2012-09-02 00:38:50.000000000 +0200 +@@ -1710,15 +1710,15 @@ + _MOZ_RTTI_FLAGS_OFF=-fno-rtti + + # Check for -mssse3 on $CC +- AC_MSG_CHECKING([for -mssse3 option to $CC]) +- HAVE_COMPILER_FLAG_MSSSE3= ++ AC_MSG_CHECKING([if toolchain supports -mssse3 option]) ++ HAVE_TOOLCHAIN_SUPPORT_MSSSE3= + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -mssse3" +- AC_TRY_COMPILE(,,AC_MSG_RESULT([yes]) +- [HAVE_COMPILER_FLAG_MSSSE3=1], ++ AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) ++ [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1], + AC_MSG_RESULT([no])) + CFLAGS=$_SAVE_CFLAGS +- AC_SUBST(HAVE_COMPILER_FLAG_MSSSE3) ++ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) + + # Turn on GNU-specific warnings: + # -Wall - turn on a lot of warnings +--- mozilla/gfx/skia/Makefile.in.orig 2012-09-02 00:39:00.000000000 +0200 ++++ mozilla/gfx/skia/Makefile.in 2012-09-02 00:39:21.000000000 +0200 +@@ -365,7 +365,7 @@ + SkUtils_opts_SSE2.cpp \ + opts_check_SSE2.cpp \ + $(NULL) +-ifdef HAVE_COMPILER_FLAG_MSSSE3 ++ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3 + DEFINES += -DSK_BUILD_SSSE3 + CPPSRCS += SkBitmapProcState_opts_SSSE3.cpp + endif Added: trunk/www/firefox-nightly/files/patch-bug786995 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug786995 Mon Sep 3 11:59:01 2012 (r972) @@ -0,0 +1,36 @@ +# Bug 786995 - configure should check for SSSE3 support in the whole toolchain + +--- configure.in.orig 2012-09-02 00:37:29.000000000 +0200 ++++ configure.in 2012-09-02 00:38:50.000000000 +0200 +@@ -1710,15 +1710,15 @@ + _MOZ_RTTI_FLAGS_OFF=-fno-rtti + + # Check for -mssse3 on $CC +- AC_MSG_CHECKING([for -mssse3 option to $CC]) +- HAVE_COMPILER_FLAG_MSSSE3= ++ AC_MSG_CHECKING([if toolchain supports -mssse3 option]) ++ HAVE_TOOLCHAIN_SUPPORT_MSSSE3= + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -mssse3" +- AC_TRY_COMPILE(,,AC_MSG_RESULT([yes]) +- [HAVE_COMPILER_FLAG_MSSSE3=1], ++ AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) ++ [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1], + AC_MSG_RESULT([no])) + CFLAGS=$_SAVE_CFLAGS +- AC_SUBST(HAVE_COMPILER_FLAG_MSSSE3) ++ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) + + # Turn on GNU-specific warnings: + # -Wall - turn on a lot of warnings +--- gfx/skia/Makefile.in.orig 2012-09-02 00:39:00.000000000 +0200 ++++ gfx/skia/Makefile.in 2012-09-02 00:39:21.000000000 +0200 +@@ -365,7 +365,7 @@ + SkUtils_opts_SSE2.cpp \ + opts_check_SSE2.cpp \ + $(NULL) +-ifdef HAVE_COMPILER_FLAG_MSSSE3 ++ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3 + DEFINES += -DSK_BUILD_SSSE3 + CPPSRCS += SkBitmapProcState_opts_SSSE3.cpp + endif Added: trunk/www/firefox/files/patch-bug786995 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug786995 Mon Sep 3 11:59:01 2012 (r972) @@ -0,0 +1,36 @@ +# Bug 786995 - configure should check for SSSE3 support in the whole toolchain + +--- configure.in.orig 2012-09-02 00:37:29.000000000 +0200 ++++ configure.in 2012-09-02 00:38:50.000000000 +0200 +@@ -1710,15 +1710,15 @@ + _MOZ_RTTI_FLAGS_OFF=-fno-rtti + + # Check for -mssse3 on $CC +- AC_MSG_CHECKING([for -mssse3 option to $CC]) +- HAVE_COMPILER_FLAG_MSSSE3= ++ AC_MSG_CHECKING([if toolchain supports -mssse3 option]) ++ HAVE_TOOLCHAIN_SUPPORT_MSSSE3= + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -mssse3" +- AC_TRY_COMPILE(,,AC_MSG_RESULT([yes]) +- [HAVE_COMPILER_FLAG_MSSSE3=1], ++ AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) ++ [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1], + AC_MSG_RESULT([no])) + CFLAGS=$_SAVE_CFLAGS +- AC_SUBST(HAVE_COMPILER_FLAG_MSSSE3) ++ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) + + # Turn on GNU-specific warnings: + # -Wall - turn on a lot of warnings +--- gfx/skia/Makefile.in.orig 2012-09-02 00:39:00.000000000 +0200 ++++ gfx/skia/Makefile.in 2012-09-02 00:39:21.000000000 +0200 +@@ -365,7 +365,7 @@ + SkUtils_opts_SSE2.cpp \ + opts_check_SSE2.cpp \ + $(NULL) +-ifdef HAVE_COMPILER_FLAG_MSSSE3 ++ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3 + DEFINES += -DSK_BUILD_SSSE3 + CPPSRCS += SkBitmapProcState_opts_SSSE3.cpp + endif Added: trunk/www/seamonkey/files/patch-bug786995 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug786995 Mon Sep 3 11:59:01 2012 (r972) @@ -0,0 +1,36 @@ +# Bug 786995 - configure should check for SSSE3 support in the whole toolchain + +--- mozilla/configure.in.orig 2012-09-02 00:37:29.000000000 +0200 ++++ mozilla/configure.in 2012-09-02 00:38:50.000000000 +0200 +@@ -1710,15 +1710,15 @@ + _MOZ_RTTI_FLAGS_OFF=-fno-rtti + + # Check for -mssse3 on $CC +- AC_MSG_CHECKING([for -mssse3 option to $CC]) +- HAVE_COMPILER_FLAG_MSSSE3= ++ AC_MSG_CHECKING([if toolchain supports -mssse3 option]) ++ HAVE_TOOLCHAIN_SUPPORT_MSSSE3= + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -mssse3" +- AC_TRY_COMPILE(,,AC_MSG_RESULT([yes]) +- [HAVE_COMPILER_FLAG_MSSSE3=1], ++ AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) ++ [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1], + AC_MSG_RESULT([no])) + CFLAGS=$_SAVE_CFLAGS +- AC_SUBST(HAVE_COMPILER_FLAG_MSSSE3) ++ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) + + # Turn on GNU-specific warnings: + # -Wall - turn on a lot of warnings +--- mozilla/gfx/skia/Makefile.in.orig 2012-09-02 00:39:00.000000000 +0200 ++++ mozilla/gfx/skia/Makefile.in 2012-09-02 00:39:21.000000000 +0200 +@@ -365,7 +365,7 @@ + SkUtils_opts_SSE2.cpp \ + opts_check_SSE2.cpp \ + $(NULL) +-ifdef HAVE_COMPILER_FLAG_MSSSE3 ++ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3 + DEFINES += -DSK_BUILD_SSSE3 + CPPSRCS += SkBitmapProcState_opts_SSSE3.cpp + endif From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 11:59:18 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 0125B106566B for ; Mon, 3 Sep 2012 11:59:18 +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 920848FC18 for ; Mon, 3 Sep 2012 11:59:17 +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 q83BxG4R073958 for ; Mon, 3 Sep 2012 11:59:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q83BxBsU072943 for freebsd-gecko@freebsd.org; Mon, 3 Sep 2012 11:59:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 3 Sep 2012 11:59:11 GMT Message-Id: <201209031159.q83BxBsU072943@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] r973 - in trunk: 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: Mon, 03 Sep 2012 11:59:18 -0000 Author: jbeich Date: Mon Sep 3 11:59:11 2012 New Revision: 973 Log: ia64 and sparc64 use 8k pagesize by default Added: trunk/mail/thunderbird/files/patch-bug787904 trunk/www/firefox-nightly/files/patch-bug787904 trunk/www/firefox/files/patch-bug787904 trunk/www/seamonkey/files/patch-bug787904 Added: trunk/mail/thunderbird/files/patch-bug787904 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug787904 Mon Sep 3 11:59:11 2012 (r973) @@ -0,0 +1,12 @@ +--- mozilla/js/src/gc/Heap.h ++++ mozilla/js/src/gc/Heap.h +@@ -108,7 +108,8 @@ struct Cell + * Bug 692267: Move page size definition to gc/Memory.h and include it + * directly once jsgc.h is no longer an installed header. + */ +-#if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) ++#if (defined(SOLARIS) || defined(__FreeBSD__)) && \ ++ (defined(__sparc) || defined(__sparcv9) || defined(__ia64)) + const size_t PageShift = 13; + #else + const size_t PageShift = 12; Added: trunk/www/firefox-nightly/files/patch-bug787904 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug787904 Mon Sep 3 11:59:11 2012 (r973) @@ -0,0 +1,12 @@ +--- js/src/gc/Heap.h ++++ js/src/gc/Heap.h +@@ -108,7 +108,8 @@ struct Cell + * Bug 692267: Move page size definition to gc/Memory.h and include it + * directly once jsgc.h is no longer an installed header. + */ +-#if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) ++#if (defined(SOLARIS) || defined(__FreeBSD__)) && \ ++ (defined(__sparc) || defined(__sparcv9) || defined(__ia64)) + const size_t PageShift = 13; + #else + const size_t PageShift = 12; Added: trunk/www/firefox/files/patch-bug787904 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug787904 Mon Sep 3 11:59:11 2012 (r973) @@ -0,0 +1,12 @@ +--- js/src/gc/Heap.h ++++ js/src/gc/Heap.h +@@ -108,7 +108,8 @@ struct Cell + * Bug 692267: Move page size definition to gc/Memory.h and include it + * directly once jsgc.h is no longer an installed header. + */ +-#if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) ++#if (defined(SOLARIS) || defined(__FreeBSD__)) && \ ++ (defined(__sparc) || defined(__sparcv9) || defined(__ia64)) + const size_t PageShift = 13; + #else + const size_t PageShift = 12; Added: trunk/www/seamonkey/files/patch-bug787904 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug787904 Mon Sep 3 11:59:11 2012 (r973) @@ -0,0 +1,12 @@ +--- mozilla/js/src/gc/Heap.h ++++ mozilla/js/src/gc/Heap.h +@@ -108,7 +108,8 @@ struct Cell + * Bug 692267: Move page size definition to gc/Memory.h and include it + * directly once jsgc.h is no longer an installed header. + */ +-#if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) ++#if (defined(SOLARIS) || defined(__FreeBSD__)) && \ ++ (defined(__sparc) || defined(__sparcv9) || defined(__ia64)) + const size_t PageShift = 13; + #else + const size_t PageShift = 12; From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 11:59:25 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 9A5BC106564A for ; Mon, 3 Sep 2012 11:59:25 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 0FE758FC0A for ; Mon, 3 Sep 2012 11:59:24 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q83BxOvE075392 for ; Mon, 3 Sep 2012 11:59:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q83BxJxk074597 for freebsd-gecko@freebsd.org; Mon, 3 Sep 2012 11:59:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 3 Sep 2012 11:59:19 GMT Message-Id: <201209031159.q83BxJxk074597@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] r974 - in trunk/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: Mon, 03 Sep 2012 11:59:25 -0000 Author: jbeich Date: Mon Sep 3 11:59:18 2012 New Revision: 974 Log: update Nightly Deleted: trunk/www/firefox-nightly/files/patch-ipc-chromium-src-base-process_util_bsd.cc Modified: trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Mon Sep 3 11:59:11 2012 (r973) +++ trunk/www/firefox-nightly/Makefile.hgrev Mon Sep 3 11:59:18 2012 (r974) @@ -1 +1 @@ -HGREV= 103794:706174d31a02 +HGREV= 104133:059f341beaad Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Mon Sep 3 11:59:11 2012 (r973) +++ trunk/www/firefox-nightly/distinfo Mon Sep 3 11:59:18 2012 (r974) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/706174d31a02.tar.bz2) = d215cd40896cc94787dba02c9441335cb6f8f41e126b805386c6ae315713606f -SIZE (firefox-nightly/706174d31a02.tar.bz2) = 89195789 +SHA256 (firefox-nightly/059f341beaad.tar.bz2) = a0233e7693a00de0e69a55dc087afd9f78fdd78b7a0ae222674cc52337599ed2 +SIZE (firefox-nightly/059f341beaad.tar.bz2) = 88494697 Deleted: trunk/www/firefox-nightly/files/patch-ipc-chromium-src-base-process_util_bsd.cc ============================================================================== --- trunk/www/firefox-nightly/files/patch-ipc-chromium-src-base-process_util_bsd.cc Mon Sep 3 11:59:18 2012 (r973) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,29 +0,0 @@ ---- ipc/chromium/src/base/process_util_bsd.cc~ -+++ ipc/chromium/src/base/process_util_bsd.cc -@@ -95,7 +95,7 @@ bool LaunchApp(const std::vector& argv, - bool wait, ProcessHandle* process_handle, - ProcessArchitecture arch) { - return LaunchApp(argv, fds_to_remap, env_vars_to_set, -- SAME_PRIVILEGES_AS_PARENT, -+ PRIVILEGES_INHERIT, - wait, process_handle); - } - -@@ -220,7 +220,7 @@ bool LaunchApp(const std::vector& argv, - bool wait, ProcessHandle* process_handle, - ProcessArchitecture arch) { - return LaunchApp(argv, fds_to_remap, env_vars_to_set, -- SAME_PRIVILEGES_AS_PARENT, -+ PRIVILEGES_INHERIT, - wait, process_handle); - } - -@@ -256,7 +256,7 @@ bool LaunchApp(const std::vector& argv, - argv_cstr[i] = const_cast(argv[i].c_str()); - argv_cstr[argv.size()] = NULL; - -- if (privs == UNPRIVILEGED) { -+ if (privs == PRIVILEGES_UNPRIVILEGED) { - if (setgid(CHILD_UNPRIVILEGED_GID) != 0) { - DLOG(ERROR) << "FAILED TO setgid() CHILD PROCESS, path: " << argv_cstr[0]; - _exit(127); From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 12:19:18 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 7912E106564A for ; Mon, 3 Sep 2012 12:19:18 +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 085BD8FC15 for ; Mon, 3 Sep 2012 12:19:17 +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 q83CJGm9067408 for ; Mon, 3 Sep 2012 12:19:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q83CJBJN066959 for freebsd-gecko@freebsd.org; Mon, 3 Sep 2012 12:19:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 3 Sep 2012 12:19:11 GMT Message-Id: <201209031219.q83CJBJN066959@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] r975 - trunk/devel/nspr/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: Mon, 03 Sep 2012 12:19:18 -0000 Author: jbeich Date: Mon Sep 3 12:19:11 2012 New Revision: 975 Log: unbreak --enable-nspr-threads Modified: trunk/devel/nspr/files/patch-bug301986 trunk/devel/nspr/files/patch-bug782109 Modified: trunk/devel/nspr/files/patch-bug301986 ============================================================================== --- trunk/devel/nspr/files/patch-bug301986 Mon Sep 3 11:59:18 2012 (r974) +++ trunk/devel/nspr/files/patch-bug301986 Mon Sep 3 12:19:11 2012 (r975) @@ -33,3 +33,14 @@ + return thred->id; /* and I don't know what they will do with it */ #endif } +--- ../pr/src/threads/prcthr.c~ ++++ ../pr/src/threads/prcthr.c +@@ -127,7 +127,7 @@ PR_IMPLEMENT(PRStatus) PR_Sleep(PRInterv + return rv; + } + +-PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thread) ++PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thread) + { + return thread->id; + } Modified: trunk/devel/nspr/files/patch-bug782109 ============================================================================== --- trunk/devel/nspr/files/patch-bug782109 Mon Sep 3 11:59:18 2012 (r974) +++ trunk/devel/nspr/files/patch-bug782109 Mon Sep 3 12:19:11 2012 (r975) @@ -29,3 +29,14 @@ /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) #define _PR_HAVE_GETPROTO_R +--- ../pr/src/misc/prnetdb.c~ ++++ ../pr/src/misc/prnetdb.c +@@ -1149,7 +1149,7 @@ PR_IMPLEMENT(PRStatus) PR_GetHostByAddr( + * any usable implementation. + */ + +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(FREEBSD) + /* Android's Bionic libc system includes prototypes for these in netdb.h, + * but doesn't actually include implementations. It uses the 5-arg form, + * so these functions end up not matching the prototype. So just rename From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 13:23:30 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 DBE1A1065670 for ; Mon, 3 Sep 2012 13:23:30 +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 6B5628FC08 for ; Mon, 3 Sep 2012 13:23:30 +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 q83DNSWX094508 for ; Mon, 3 Sep 2012 13:23:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q83DNNej093906 for freebsd-gecko@freebsd.org; Mon, 3 Sep 2012 13:23:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 3 Sep 2012 13:23:23 GMT Message-Id: <201209031323.q83DNNej093906@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] r976 - trunk/devel/nspr/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: Mon, 03 Sep 2012 13:23:31 -0000 Author: jbeich Date: Mon Sep 3 13:23:23 2012 New Revision: 976 Log: backout, non-pthread builds are too broken Modified: trunk/devel/nspr/files/patch-bug301986 trunk/devel/nspr/files/patch-bug782109 Modified: trunk/devel/nspr/files/patch-bug301986 ============================================================================== --- trunk/devel/nspr/files/patch-bug301986 Mon Sep 3 12:19:11 2012 (r975) +++ trunk/devel/nspr/files/patch-bug301986 Mon Sep 3 13:23:23 2012 (r976) @@ -33,14 +33,3 @@ + return thred->id; /* and I don't know what they will do with it */ #endif } ---- ../pr/src/threads/prcthr.c~ -+++ ../pr/src/threads/prcthr.c -@@ -127,7 +127,7 @@ PR_IMPLEMENT(PRStatus) PR_Sleep(PRInterv - return rv; - } - --PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thread) -+PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thread) - { - return thread->id; - } Modified: trunk/devel/nspr/files/patch-bug782109 ============================================================================== --- trunk/devel/nspr/files/patch-bug782109 Mon Sep 3 12:19:11 2012 (r975) +++ trunk/devel/nspr/files/patch-bug782109 Mon Sep 3 13:23:23 2012 (r976) @@ -29,14 +29,3 @@ /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */ #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS)) #define _PR_HAVE_GETPROTO_R ---- ../pr/src/misc/prnetdb.c~ -+++ ../pr/src/misc/prnetdb.c -@@ -1149,7 +1149,7 @@ PR_IMPLEMENT(PRStatus) PR_GetHostByAddr( - * any usable implementation. - */ - --#if defined(ANDROID) -+#if defined(ANDROID) || defined(FREEBSD) - /* Android's Bionic libc system includes prototypes for these in netdb.h, - * but doesn't actually include implementations. It uses the 5-arg form, - * so these functions end up not matching the prototype. So just rename From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 17:33:38 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 C79FE106566C for ; Mon, 3 Sep 2012 17:33:38 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id 559208FC17 for ; Mon, 3 Sep 2012 17:33:38 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q83LXNX7057225 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 3 Sep 2012 17:33:35 -0400 (EDT) (envelope-from andy@neu.net) Date: Mon, 3 Sep 2012 17:33:23 -0400 (EDT) From: AN To: freebsd-gecko@freebsd.org In-Reply-To: <201209031159.q83BxJxk074597@trillian.chruetertee.ch> Message-ID: References: <201209031159.q83BxJxk074597@trillian.chruetertee.ch> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Virus-Scanned: clamav-milter 0.97.5 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=1.8 required=4.5 tests=RP_MATCHES_RCVD,URIBL_BLACK autolearn=no version=3.3.2 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Subject: Re: [SVN-Commit] r974 - in trunk/www/firefox-nightly: . files 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, 03 Sep 2012 17:33:38 -0000 On Mon, 3 Sep 2012, svn-freebsd-gecko@chruetertee.ch wrote: > Author: jbeich > Date: Mon Sep 3 11:59:18 2012 > New Revision: 974 > > Log: > update Nightly FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #17 r239738: Mon Aug 27 13:42:47 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 # ls -l files/ total 128 -rw-r--r-- 1 root wheel 456 Sep 3 13:02 extra-bug780531 -rw-r--r-- 1 root wheel 6902 Sep 3 13:02 firefox.desktop.in -rw-r--r-- 1 root wheel 199 Nov 30 2010 mozconfig-generic.in -rw-r--r-- 1 root wheel 3077 Sep 3 13:02 patch-alsapulse -rw-r--r-- 1 root wheel 427 Sep 3 13:02 patch-browser-app-nsBrowserApp.cpp -rw-r--r-- 1 root wheel 751 Sep 3 13:02 patch-bug685258 -rw-r--r-- 1 root wheel 2132 Sep 3 13:02 patch-bug722975 -rw-r--r-- 1 root wheel 485 Sep 3 13:02 patch-bug778078 -rw-r--r-- 1 root wheel 318 Sep 3 13:02 patch-bug783463 -rw-r--r-- 1 root wheel 1341 Sep 3 13:02 patch-bug786995 -rw-r--r-- 1 root wheel 473 Sep 3 13:02 patch-bug787904 -rw-r--r-- 1 root wheel 797 Sep 3 13:02 patch-build-pgo-profileserver.py -rw-r--r-- 1 root wheel 585 Sep 3 13:02 patch-config-baseconfig.mk -rw-r--r-- 1 root wheel 980 Sep 3 13:02 patch-configure.in -rw-r--r-- 1 root wheel 615 Sep 3 13:02 patch-content__base__public__nsContentUtils.h -rw-r--r-- 1 root wheel 601 Sep 3 13:02 patch-gfx-harfbuzz-src-hb-ot-layout.cc -rw-r--r-- 1 root wheel 453 Sep 3 13:02 patch-gfx-qcms-qcmstypes.h -rw-r--r-- 1 root wheel 759 Sep 3 13:02 patch-ipc-chromium-Makefile.in -rw-r--r-- 1 root wheel 357 Sep 3 13:02 patch-ipc-chromium-src-base-message_pump_libevent.cc -rw-r--r-- 1 root wheel 407 Sep 3 13:02 patch-ipc-chromium-src-base-platform_thread_posix.cc -rw-r--r-- 1 root wheel 300 Sep 3 13:02 patch-js-src-js-confdefs.h.in -rw-r--r-- 1 root wheel 577 Sep 3 13:02 patch-js-src-methodjit-MethodJIT.cpp -rw-r--r-- 1 root wheel 479 Sep 3 13:02 patch-media-libsydneyaudio-src-sydney_audio_oss.c -rw-r--r-- 1 root wheel 374 Sep 3 13:02 patch-memory-build-mozjemalloc_compat.c -rw-r--r-- 1 root wheel 351 Sep 3 13:02 patch-memory-jemalloc-Makefile.in -rw-r--r-- 1 root wheel 387 Sep 3 13:02 patch-memory-mozjemalloc-jemalloc.h -rw-r--r-- 1 root wheel 322 Sep 3 13:02 patch-security_manager_ssl_src_nsNSSComponent.cpp -rw-r--r-- 1 root wheel 397 Sep 3 13:02 patch-toolkit_library_Makefile.in -rw-r--r-- 1 root wheel 675 Sep 3 13:02 patch-toolkit_mozapps_installer_packager_mk -rw-r--r-- 1 root wheel 265 Sep 3 13:02 patch-toolkit_xre_Makefile.in -rw-r--r-- 1 root wheel 524 Sep 3 13:02 patch-xpcom__threads__nsThreadManager.cpp Is the file mozconfig-generic.in still required? Has anyone built rev 104155 successfully? I get the following failure: /home/root/ff_nightly/work/mozilla-central-b0544769406c/js/src/jstypedarray.cpp: In static member function 'static JSBool js::DataViewObject::getter(JSContext*, unsigned int, JS::Value*) [with JS::Value (* ValueGetter)(js::DataViewObject&) = js::DataViewObject::byteLengthValue; JSBool = int; JSContext = JSContext]': /home/root/ff_nightly/work/mozilla-central-b0544769406c/js/src/jstypedarray.cpp:3395:1: error: control reaches end of non-void function [-Werror=return-type] /home/root/ff_nightly/work/mozilla-central-b0544769406c/js/src/jstypedarray.cpp: In static member function 'static JSBool js::DataViewObject::getter(JSContext*, unsigned int, JS::Value*) [with JS::Value (* ValueGetter)(js::DataViewObject&) = js::DataViewObject::byteOffsetValue; JSBool = int; JSContext = JSContext]': /home/root/ff_nightly/work/mozilla-central-b0544769406c/js/src/jstypedarray.cpp:3395:1: error: control reaches end of non-void function [-Werror=return-type] cc1plus: some warnings being treated as errors gmake[3]: *** [jstypedarray.o] Error 1 gmake[3]: *** Waiting for unfinished jobs.... gmake[3]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-b0544769406c/js/src' gmake[2]: *** [libs_tier_js] Error 2 gmake[2]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-b0544769406c' gmake[1]: *** [tier_js] Error 2 gmake[1]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-b0544769406c' gmake: *** [default] Error 2 *** [do-build] Error code 1 Stop in /home/root/ff_nightly. *** [/home/root/ff_nightly/work/.build_done.firefox._usr_local] Error code 1 Full log http://sebsauvage.net/paste/?9442cc2b4ca70ffa#VGH1APOSPffJmoAsFshWPtMaGPrZL6mX1OVZ5OWrFqU= Any help is appreciated, thanks in advance. From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 21:20:12 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 83AA81065673 for ; Mon, 3 Sep 2012 21:20:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 64A518FC08 for ; Mon, 3 Sep 2012 21:20: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 q83LKCe5021225 for ; Mon, 3 Sep 2012 21:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q83LKCXM021209; Mon, 3 Sep 2012 21:20:12 GMT (envelope-from gnats) Date: Mon, 3 Sep 2012 21:20:12 GMT Message-Id: <201209032120.q83LKCXM021209@freefall.freebsd.org> To: gecko@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: ports/171255: commit references a PR X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Sep 2012 21:20:12 -0000 The following reply was made to PR ports/171255; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/171255: commit references a PR Date: Mon, 3 Sep 2012 21:16:11 +0000 (UTC) Author: flo Date: Mon Sep 3 21:16:00 2012 New Revision: 303621 URL: http://svn.freebsd.org/changeset/ports/303621 Log: - fix build of www/firefox, www/seamonkey and mail/thunderbird on stable/7 after r219639 which MFC'd SSSE3 instruction set to gcc but not to gas. Configure picks up SSSE3 support in gcc but linking fails with {standard input}:283: Error: no such instruction: `pmaddubsw %xmm2,%xmm3' {standard input}:400: Error: no such instruction: `pmaddubsw %xmm0,%xmm1' {standard input}:544: Error: no such instruction: `pmaddubsw %xmm0,%xmm1' PR: ports/171255 Submitted by: naddy, Jan Beich Added: head/mail/thunderbird/files/patch-bug786995 (contents, props changed) head/www/firefox/files/patch-bug786995 (contents, props changed) head/www/seamonkey/files/patch-bug786995 (contents, props changed) Added: head/mail/thunderbird/files/patch-bug786995 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug786995 Mon Sep 3 21:16:00 2012 (r303621) @@ -0,0 +1,36 @@ +# Bug 786995 - configure should check for SSSE3 support in the whole toolchain + +--- mozilla/configure.in.orig 2012-09-02 00:37:29.000000000 +0200 ++++ mozilla/configure.in 2012-09-02 00:38:50.000000000 +0200 +@@ -1710,15 +1710,15 @@ + _MOZ_RTTI_FLAGS_OFF=-fno-rtti + + # Check for -mssse3 on $CC +- AC_MSG_CHECKING([for -mssse3 option to $CC]) +- HAVE_COMPILER_FLAG_MSSSE3= ++ AC_MSG_CHECKING([if toolchain supports -mssse3 option]) ++ HAVE_TOOLCHAIN_SUPPORT_MSSSE3= + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -mssse3" +- AC_TRY_COMPILE(,,AC_MSG_RESULT([yes]) +- [HAVE_COMPILER_FLAG_MSSSE3=1], ++ AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) ++ [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1], + AC_MSG_RESULT([no])) + CFLAGS=$_SAVE_CFLAGS +- AC_SUBST(HAVE_COMPILER_FLAG_MSSSE3) ++ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) + + # Turn on GNU-specific warnings: + # -Wall - turn on a lot of warnings +--- mozilla/gfx/skia/Makefile.in.orig 2012-09-02 00:39:00.000000000 +0200 ++++ mozilla/gfx/skia/Makefile.in 2012-09-02 00:39:21.000000000 +0200 +@@ -365,7 +365,7 @@ + SkUtils_opts_SSE2.cpp \ + opts_check_SSE2.cpp \ + $(NULL) +-ifdef HAVE_COMPILER_FLAG_MSSSE3 ++ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3 + DEFINES += -DSK_BUILD_SSSE3 + CPPSRCS += SkBitmapProcState_opts_SSSE3.cpp + endif Added: head/www/firefox/files/patch-bug786995 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug786995 Mon Sep 3 21:16:00 2012 (r303621) @@ -0,0 +1,36 @@ +# Bug 786995 - configure should check for SSSE3 support in the whole toolchain + +--- configure.in.orig 2012-09-02 00:37:29.000000000 +0200 ++++ configure.in 2012-09-02 00:38:50.000000000 +0200 +@@ -1710,15 +1710,15 @@ + _MOZ_RTTI_FLAGS_OFF=-fno-rtti + + # Check for -mssse3 on $CC +- AC_MSG_CHECKING([for -mssse3 option to $CC]) +- HAVE_COMPILER_FLAG_MSSSE3= ++ AC_MSG_CHECKING([if toolchain supports -mssse3 option]) ++ HAVE_TOOLCHAIN_SUPPORT_MSSSE3= + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -mssse3" +- AC_TRY_COMPILE(,,AC_MSG_RESULT([yes]) +- [HAVE_COMPILER_FLAG_MSSSE3=1], ++ AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) ++ [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1], + AC_MSG_RESULT([no])) + CFLAGS=$_SAVE_CFLAGS +- AC_SUBST(HAVE_COMPILER_FLAG_MSSSE3) ++ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) + + # Turn on GNU-specific warnings: + # -Wall - turn on a lot of warnings +--- gfx/skia/Makefile.in.orig 2012-09-02 00:39:00.000000000 +0200 ++++ gfx/skia/Makefile.in 2012-09-02 00:39:21.000000000 +0200 +@@ -365,7 +365,7 @@ + SkUtils_opts_SSE2.cpp \ + opts_check_SSE2.cpp \ + $(NULL) +-ifdef HAVE_COMPILER_FLAG_MSSSE3 ++ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3 + DEFINES += -DSK_BUILD_SSSE3 + CPPSRCS += SkBitmapProcState_opts_SSSE3.cpp + endif Added: head/www/seamonkey/files/patch-bug786995 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/patch-bug786995 Mon Sep 3 21:16:00 2012 (r303621) @@ -0,0 +1,36 @@ +# Bug 786995 - configure should check for SSSE3 support in the whole toolchain + +--- mozilla/configure.in.orig 2012-09-02 00:37:29.000000000 +0200 ++++ mozilla/configure.in 2012-09-02 00:38:50.000000000 +0200 +@@ -1710,15 +1710,15 @@ + _MOZ_RTTI_FLAGS_OFF=-fno-rtti + + # Check for -mssse3 on $CC +- AC_MSG_CHECKING([for -mssse3 option to $CC]) +- HAVE_COMPILER_FLAG_MSSSE3= ++ AC_MSG_CHECKING([if toolchain supports -mssse3 option]) ++ HAVE_TOOLCHAIN_SUPPORT_MSSSE3= + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -mssse3" +- AC_TRY_COMPILE(,,AC_MSG_RESULT([yes]) +- [HAVE_COMPILER_FLAG_MSSSE3=1], ++ AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) ++ [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1], + AC_MSG_RESULT([no])) + CFLAGS=$_SAVE_CFLAGS +- AC_SUBST(HAVE_COMPILER_FLAG_MSSSE3) ++ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) + + # Turn on GNU-specific warnings: + # -Wall - turn on a lot of warnings +--- mozilla/gfx/skia/Makefile.in.orig 2012-09-02 00:39:00.000000000 +0200 ++++ mozilla/gfx/skia/Makefile.in 2012-09-02 00:39:21.000000000 +0200 +@@ -365,7 +365,7 @@ + SkUtils_opts_SSE2.cpp \ + opts_check_SSE2.cpp \ + $(NULL) +-ifdef HAVE_COMPILER_FLAG_MSSSE3 ++ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3 + DEFINES += -DSK_BUILD_SSSE3 + CPPSRCS += SkBitmapProcState_opts_SSSE3.cpp + endif _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 22:34:47 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 1770D1065673; Mon, 3 Sep 2012 22:34:47 +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 E0D638FC12; Mon, 3 Sep 2012 22:34:46 +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 q83MYkeq050198; Mon, 3 Sep 2012 22:34:46 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q83MYknk050188; Mon, 3 Sep 2012 22:34:46 GMT (envelope-from flo) Date: Mon, 3 Sep 2012 22:34:46 GMT Message-Id: <201209032234.q83MYknk050188@freefall.freebsd.org> To: naddy@freebsd.org, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Cc: Subject: Re: ports/171255: Fix www/firefox on FreeBSD 7.4/amd64 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, 03 Sep 2012 22:34:47 -0000 Synopsis: Fix www/firefox on FreeBSD 7.4/amd64 State-Changed-From-To: open->patched State-Changed-By: flo State-Changed-When: Mon Sep 3 22:34:02 UTC 2012 State-Changed-Why: Patched. Awaiting further discussion of possible MFCs to stable/7. http://www.freebsd.org/cgi/query-pr.cgi?pr=171255 From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 23:18:55 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 5328B1065674 for ; Mon, 3 Sep 2012 23:18:55 +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 D71578FC15 for ; Mon, 3 Sep 2012 23:18:54 +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 q83NIrdF072585 for ; Mon, 3 Sep 2012 23:18:53 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q83NIlb5072217 for freebsd-gecko@freebsd.org; Mon, 3 Sep 2012 23:18:47 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 3 Sep 2012 23:18:47 GMT Message-Id: <201209032318.q83NIlb5072217@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] r977 - trunk/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: Mon, 03 Sep 2012 23:18:55 -0000 Author: jbeich Date: Mon Sep 3 23:18:47 2012 New Revision: 977 Log: unbreak powerpc64 after r907 Reported by: andreast Modified: trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Modified: trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk ============================================================================== --- trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Mon Sep 3 13:23:23 2012 (r976) +++ trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Mon Sep 3 23:18:47 2012 (r977) @@ -13,14 +13,15 @@ RANLIB = ranlib CPU_ARCH = $(OS_TEST) -@@ -52,6 +52,12 @@ endif +@@ -52,6 +52,13 @@ endif ifeq ($(CPU_ARCH),amd64) CPU_ARCH = x86_64 endif +ifneq (,$(filter powerpc%, $(CPU_ARCH))) +CPU_ARCH = ppc +endif -+ifneq (,$(filter %64, $(CPU_ARCH))) ++ ++ifneq (,$(filter %64, $(OS_TEST))) +USE_64 = 1 +endif From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 3 23:19:01 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 E977B106567C for ; Mon, 3 Sep 2012 23:19:01 +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 73ED78FC0A for ; Mon, 3 Sep 2012 23:19:01 +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 q83NJ0Ig075201 for ; Mon, 3 Sep 2012 23:19:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q83NIttL074881 for freebsd-gecko@freebsd.org; Mon, 3 Sep 2012 23:18:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 3 Sep 2012 23:18:55 GMT Message-Id: <201209032318.q83NIttL074881@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] r978 - trunk/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: Mon, 03 Sep 2012 23:19:02 -0000 Author: jbeich Date: Mon Sep 3 23:18:55 2012 New Revision: 978 Log: resurrect gcc42 support, removed since bug 784029 Reported by: AN Added: trunk/www/firefox-nightly/files/patch-bug783505 Added: trunk/www/firefox-nightly/files/patch-bug783505 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug783505 Mon Sep 3 23:18:55 2012 (r978) @@ -0,0 +1,30 @@ +commit b5f97ee +Author: Rafael Ávila de Espíndola +Date: Mon Aug 20 10:28:08 2012 -0400 + + Bug 783505 - OS X gcc builds failing. r=jorendorff. + This patch adds a workaround for + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608 +--- + js/src/jstypedarray.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git js/src/jstypedarray.cpp js/src/jstypedarray.cpp +index 1eaeea0..1957086 100644 +--- js/src/jstypedarray.cpp ++++ js/src/jstypedarray.cpp +@@ -1423,8 +1423,14 @@ class TypedArrayTemplate + Getter(JSContext *cx, unsigned argc, Value *vp) + { + CallArgs args = CallArgsFromVp(argc, vp); ++ // FIXME: Hack to keep us building with gcc 4.2. Remove this once we ++ // drop support for gcc 4.2. See bug 783505 for the details. ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2 ++ return CallNonGenericMethod(cx, IsThisClass, GetterImpl, args); ++#else + return CallNonGenericMethod >(cx, args); ++#endif + } + + // Define an accessor for a read-only property that invokes a native getter From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 00:50: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 AB3AA106566C for ; Tue, 4 Sep 2012 00:50:32 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id 5E6528FC1B for ; Tue, 4 Sep 2012 00:50:32 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q844oAsC058116 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 4 Sep 2012 00:50:29 -0400 (EDT) (envelope-from andy@neu.net) Date: Tue, 4 Sep 2012 00:50:10 -0400 (EDT) From: AN To: freebsd-gecko@freebsd.org In-Reply-To: <201209032318.q83NIttL074881@trillian.chruetertee.ch> Message-ID: References: <201209032318.q83NIttL074881@trillian.chruetertee.ch> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Virus-Scanned: clamav-milter 0.97.5 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=4.5 tests=RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Cc: jbeich@tormail.org Subject: Re: [SVN-Commit] r978 - trunk/www/firefox-nightly/files 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: Tue, 04 Sep 2012 00:50:32 -0000 On Mon, 3 Sep 2012, svn-freebsd-gecko@chruetertee.ch wrote: > Author: jbeich > Date: Mon Sep 3 23:18:55 2012 > New Revision: 978 > > Log: > resurrect gcc42 support, removed since bug 784029 > > Reported by: AN > > Added: > trunk/www/firefox-nightly/files/patch-bug783505 > > Added: trunk/www/firefox-nightly/files/patch-bug783505 Hi Jan: I have firefox-nightly-17.0.103014,1 that was built on 17.0a1 (2012-08-23) running now. I have not been able to build FF since then. Before that I had been successfully building FF with gcc4.8+ (USE_GCC=4.8+ in makefile) that was working well and stopped on or about 8/23. What compiler should I be using? I have the following installed: FreeBSD clang version 3.2 (trunk 162107) 20120817 Target: x86_64-unknown-freebsd10.0 cc -v Using built-in specs. Target: amd64-undermydesk-freebsd Configured with: FreeBSD/amd64 system compiler Thread model: posix gcc version 4.2.1 20070831 patched [FreeBSD] gcc version 4.6.4 20120831 (prerelease) (FreeBSD Ports Collection) gcc version 4.7.2 20120825 (prerelease) (FreeBSD Ports Collection) gcc version 4.8.0 20120826 (experimental) (FreeBSD Ports Collection) What is the proper makefile setting for the compiler? Is it possible to make gcc48 work again easily? From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 02:38: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 CA55C106564A for ; Tue, 4 Sep 2012 02:38:04 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id 86F368FC0A for ; Tue, 4 Sep 2012 02:38:04 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q846c4aG058672 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 4 Sep 2012 02:38:05 -0400 (EDT) (envelope-from andy@neu.net) Date: Tue, 4 Sep 2012 02:38:04 -0400 (EDT) From: AN To: Jan Beich In-Reply-To: <1T8i4z-000GHS-2i@internal.tormail.org> Message-ID: References: <201209032318.q83NIttL074881@trillian.chruetertee.ch> <1T8i4z-000GHS-2i@internal.tormail.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Virus-Scanned: clamav-milter 0.97.5 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=4.5 tests=RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Cc: freebsd-gecko@freebsd.org Subject: Re: [SVN-Commit] r978 - trunk/www/firefox-nightly/files 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: Tue, 04 Sep 2012 02:38:05 -0000 On Tue, 4 Sep 2012, Jan Beich wrote: > AN writes: > >> On Mon, 3 Sep 2012, svn-freebsd-gecko@chruetertee.ch wrote: >> >>> Author: jbeich >>> Date: Mon Sep 3 23:18:55 2012 >>> New Revision: 978 >>> >>> Log: >>> resurrect gcc42 support, removed since bug 784029 >>> >>> Reported by: AN > > Oops, I've caught the above error when trying to build on redports and > then confused with the one you reported. > >> js/src/jstypedarray.cpp:3395:1: error: control reaches end of non-void function [-Werror=return-type] > > Try gcc47 or the attached workaround (put it under files/ dir). > Ok, using gcc4.7 nightly builds successfully again :) ===> Registering installation for firefox-nightly-18.0.104165,1 On gcc4.8 with the attached workaround I still get: /home/root/ff_nightly/work/mozilla-central-a86b00fa6bc6/js/src/vm/ScopeObject-inl.h:51:5: note: in expansion of macro 'JS_STATIC_ASSERT' JS_STATIC_ASSERT(CallObject::RESERVED_SLOTS == BlockObject::RESERVED_SLOTS); ^ /home/root/ff_nightly/work/mozilla-central-a86b00fa6bc6/js/src/vm/String-inl.h: In member function 'JSAtom* js::StaticStrings::lookup(const jschar*, size_t)': ./../../dist/include/mozilla/Assertions.h:111:43: warning: typedef 'moz_static_assert124' locally defined but not used [-Wunused-local-typedefs] typedef int MOZ_STATIC_ASSERT_GLUE(moz_static_assert, __COUNTER__)[(cond) ? 1 : -1] ^ ./../../dist/include/mozilla/Assertions.h:79:50: note: in definition of macro 'MOZ_STATIC_ASSERT_GLUE1' # define MOZ_STATIC_ASSERT_GLUE1(x, y) x##y ^ ./../../dist/include/mozilla/Assertions.h:111:20: note: in expansion of macro 'MOZ_STATIC_ASSERT_GLUE' typedef int MOZ_STATIC_ASSERT_GLUE(moz_static_assert, __COUNTER__)[(cond) ? 1 : -1] ^ ./../../dist/include/js/Utility.h:68:42: note: in expansion of macro 'MOZ_STATIC_ASSERT' #define JS_STATIC_ASSERT(cond) MOZ_STATIC_ASSERT(cond, "JS_STATIC_ASSERT") ^ /home/root/ff_nightly/work/mozilla-central-a86b00fa6bc6/js/src/vm/String-inl.h:390:9: note: in expansion of macro 'JS_STATIC_ASSERT' JS_STATIC_ASSERT(INT_STATIC_LIMIT <= 999); ^ gmake[3]: *** [jstypedarray.o] Error 1 gmake[3]: *** Waiting for unfinished jobs.... gmake[3]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-a86b00fa6bc6/js/src' gmake[2]: *** [libs_tier_js] Error 2 gmake[2]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-a86b00fa6bc6' gmake[1]: *** [tier_js] Error 2 gmake[1]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-a86b00fa6bc6' gmake: *** [default] Error 2 *** [do-build] Error code 1 Stop in /home/root/ff_nightly. *** [/home/root/ff_nightly/work/.build_done.firefox._usr_local] Error code 1 I beleive upstream has swithced to clang. Should I use clang to compile nightly? What do you put into the makefile, now I have USE_GCC= 4.8+? I have clang installed as: # clang -v FreeBSD clang version 3.2 (trunk 162107) 20120817 Target: x86_64-unknown-freebsd10.0 Thread model: posix I am using the base compiler to build world and most ports. # cc -v Using built-in specs. Target: amd64-undermydesk-freebsd Configured with: FreeBSD/amd64 system compiler Thread model: posix gcc version 4.2.1 20070831 patched [FreeBSD] From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 04:48:51 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 D3217106564A for ; Tue, 4 Sep 2012 04:48:51 +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 0AB0C8FC0A for ; Tue, 4 Sep 2012 04:48:50 +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 q844mnTS023039 for ; Tue, 4 Sep 2012 04:48:49 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q844mh0S008427 for freebsd-gecko@freebsd.org; Tue, 4 Sep 2012 04:48:43 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 4 Sep 2012 04:48:43 GMT Message-Id: <201209040448.q844mh0S008427@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] r979 - in trunk: 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: Tue, 04 Sep 2012 04:48:51 -0000 Author: jbeich Date: Tue Sep 4 04:48:43 2012 New Revision: 979 Log: rename a few more patches Added: trunk/mail/thunderbird-esr/files/patch-bug351181 - copied, changed from r978, trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp trunk/mail/thunderbird-esr/files/patch-bug543241 - copied, changed from r978, trunk/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp trunk/mail/thunderbird-esr/files/patch-bug653551 trunk/mail/thunderbird-esr/files/patch-bug728968 trunk/mail/thunderbird-esr/files/patch-bug788039 trunk/mail/thunderbird/files/patch-bug351181 - copied, changed from r978, trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp trunk/mail/thunderbird/files/patch-bug543241 - copied, changed from r978, trunk/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp trunk/mail/thunderbird/files/patch-bug732340 - copied, changed from r978, trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc trunk/mail/thunderbird/files/patch-bug788039 trunk/mail/thunderbird3/files/patch-bug351181 - copied, changed from r978, trunk/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp trunk/mail/thunderbird3/files/patch-bug653551 trunk/www/firefox-esr/files/patch-bug351181 - copied, changed from r978, trunk/www/firefox-esr/files/patch-js_src_jsnum.cpp trunk/www/firefox-esr/files/patch-bug543241 - copied, changed from r978, trunk/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp trunk/www/firefox-esr/files/patch-bug653551 trunk/www/firefox-esr/files/patch-bug728968 trunk/www/firefox-esr/files/patch-bug788039 trunk/www/firefox-nightly/files/patch-bug543241 - copied, changed from r978, trunk/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp trunk/www/firefox-nightly/files/patch-bug732340 - copied, changed from r978, trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc trunk/www/firefox-nightly/files/patch-bug788039 trunk/www/firefox/files/patch-bug351181 - copied, changed from r978, trunk/www/firefox/files/patch-js_src_jsnum.cpp trunk/www/firefox/files/patch-bug543241 - copied, changed from r978, trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp trunk/www/firefox/files/patch-bug732340 - copied, changed from r978, trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc trunk/www/firefox/files/patch-bug788039 trunk/www/firefox36/files/patch-bug351181 - copied, changed from r978, trunk/www/firefox36/files/patch-js_src_jsnum.cpp trunk/www/firefox36/files/patch-bug653551 trunk/www/libxul/files/patch-bug351181 - copied, changed from r978, trunk/www/libxul/files/patch-js_src_jsnum.cpp trunk/www/libxul/files/patch-bug543241 - copied, changed from r978, trunk/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp trunk/www/libxul/files/patch-bug653551 trunk/www/libxul/files/patch-bug728968 trunk/www/libxul/files/patch-bug788039 trunk/www/libxul19/files/patch-bug351181 - copied, changed from r978, trunk/www/libxul19/files/patch-js_src_jsnum.cpp trunk/www/libxul19/files/patch-bug653551 trunk/www/seamonkey/files/patch-bug351181 - copied, changed from r978, trunk/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp trunk/www/seamonkey/files/patch-bug543241 - copied, changed from r978, trunk/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp trunk/www/seamonkey/files/patch-bug732340 - copied, changed from r978, trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc trunk/www/seamonkey/files/patch-bug788039 Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla-configure.in trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp trunk/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp trunk/mail/thunderbird/files/patch-mozilla-configure.in trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp trunk/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp trunk/mail/thunderbird3/files/patch-mozilla-js-src-configure.in trunk/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp trunk/www/firefox-esr/files/patch-configure.in trunk/www/firefox-esr/files/patch-js_src_jsnum.cpp trunk/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp trunk/www/firefox-nightly/files/patch-configure.in trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc trunk/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp trunk/www/firefox/files/patch-configure.in trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc trunk/www/firefox/files/patch-js_src_jsnum.cpp trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp trunk/www/firefox36/files/patch-js-src-configure.in trunk/www/firefox36/files/patch-js_src_jsnum.cpp trunk/www/libxul/files/patch-configure.in trunk/www/libxul/files/patch-js_src_jsnum.cpp trunk/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp trunk/www/libxul19/files/patch-js-src-configure.in trunk/www/libxul19/files/patch-js_src_jsnum.cpp trunk/www/seamonkey/files/patch-mozilla-configure.in trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc trunk/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp trunk/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Modified: trunk/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in trunk/www/firefox-esr/files/patch-js-src-configure.in trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in trunk/www/firefox/files/patch-ipc-chromium-Makefile.in trunk/www/libxul/files/patch-ipc-chromium-Makefile.in trunk/www/libxul/files/patch-js-src-configure.in trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Copied and modified: trunk/mail/thunderbird-esr/files/patch-bug351181 (from r978, trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp) ============================================================================== Copied and modified: trunk/mail/thunderbird-esr/files/patch-bug543241 (from r978, trunk/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp) ============================================================================== Added: trunk/mail/thunderbird-esr/files/patch-bug653551 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird-esr/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,29 @@ +commit 47ea30f +Author: Landry Breuil +Date: Thu Feb 2 15:31:56 2012 +0900 + + Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha +--- + js/src/configure.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git mozilla/js/src/configure.in mozilla/js/src/configure.in +index 84390cf..d663c46 100644 +--- mozilla/js/src/configure.in ++++ mozilla/js/src/configure.in +@@ -2806,13 +2806,15 @@ arm*-*) + AC_DEFINE(JS_NUNBOX32) + ;; + sparc*-*) ++ if test ! "$HAVE_64BIT_OS" ; then + NANOJIT_ARCH=Sparc + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 + ENABLE_METHODJIT_TYPED_ARRAY=1 + AC_DEFINE(JS_CPU_SPARC) + AC_DEFINE(JS_NUNBOX32) ++ fi + ;; + mips*-*) + ENABLE_METHODJIT=1 Added: trunk/mail/thunderbird-esr/files/patch-bug728968 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird-esr/files/patch-bug728968 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,50 @@ +commit 4075972 +Author: Mike Hommey +Date: Thu Feb 23 11:00:46 2012 +0100 + + Bug 728968 - Detect clock_gettime when it's not in -lrt. r=khuey +--- + configure.in | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +diff --git mozilla/configure.in mozilla/configure.in +index 3ba7e2f..3d0614c 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -3728,20 +3728,23 @@ AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat6 + AC_CHECK_FUNCS(flockfile getpagesize) + AC_CHECK_FUNCS(localtime_r strtok_r) + +-dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt +-_SAVE_LDFLAGS=$LDFLAGS +-LDFLAGS="$LDFLAGS -lrt" +-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, +- ac_cv_have_clock_monotonic, +- [AC_TRY_LINK([#include ], +- [ struct timespec ts; +- clock_gettime(CLOCK_MONOTONIC, &ts); ], +- ac_cv_have_clock_monotonic=yes, +- ac_cv_have_clock_monotonic=no)]) +-LDFLAGS=$_SAVE_LDFLAGS +-if test "$ac_cv_have_clock_monotonic" = "yes"; then ++dnl check for clock_gettime(), the CLOCK_MONOTONIC clock ++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), ++ ac_cv_clock_monotonic, ++ [for libs in "" -lrt; do ++ _SAVE_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $libs" ++ AC_TRY_LINK([#include ], ++ [ struct timespec ts; ++ clock_gettime(CLOCK_MONOTONIC, &ts); ], ++ ac_cv_clock_monotonic=$libs ++ break, ++ ac_cv_clock_monotonic=no) ++ LDFLAGS="$_SAVE_LDFLAGS" ++ done]) ++if test "$ac_cv_clock_monotonic" != "no"; then + HAVE_CLOCK_MONOTONIC=1 +- REALTIME_LIBS=-lrt ++ REALTIME_LIBS=$ac_cv_clock_monotonic + AC_DEFINE(HAVE_CLOCK_MONOTONIC) + AC_SUBST(HAVE_CLOCK_MONOTONIC) + AC_SUBST(REALTIME_LIBS) Added: trunk/mail/thunderbird-esr/files/patch-bug788039 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird-esr/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,53 @@ +# Bug 788039 - Also use pkg-config when searching for libevent. + +--- mozilla/config/autoconf.mk.in~ ++++ mozilla/config/autoconf.mk.in +@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA + + MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@ + MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@ +-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@ ++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@ + + MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@ + MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@ +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -3854,7 +3854,7 @@ fi + dnl system libevent Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-libevent, +-[ --with-system-libevent=[PFX] ++[ --with-system-libevent[=PFX] + Use system libevent [installed at prefix PFX]], + LIBEVENT_DIR=$withval) + +@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -3876,16 +3877,16 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], +- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) +-fi ++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) ++fi]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + + AC_SUBST(MOZ_NATIVE_LIBEVENT) +-AC_SUBST(MOZ_LIBEVENT_INCLUDES) ++AC_SUBST(MOZ_LIBEVENT_CFLAGS) + AC_SUBST(MOZ_LIBEVENT_LIBS) + + dnl ======================================================== Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla-configure.in ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-mozilla-configure.in Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ ---- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 -+++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 -@@ -3803,19 +3803,21 @@ - AC_CHECK_FUNCS(localtime_r strtok_r) - - dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt --_SAVE_LDFLAGS=$LDFLAGS --LDFLAGS="$LDFLAGS -lrt" --AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, -+_SAVE_LIBS=$LIBS -+AC_SEARCH_LIBS(clock_gettime, rt) -+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), - ac_cv_have_clock_monotonic, - [AC_TRY_LINK([#include ], - [ struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); ], - ac_cv_have_clock_monotonic=yes, - ac_cv_have_clock_monotonic=no)]) --LDFLAGS=$_SAVE_LDFLAGS -+LIBS=$_SAVE_LIBS - if test "$ac_cv_have_clock_monotonic" = "yes"; then - HAVE_CLOCK_MONOTONIC=1 -- REALTIME_LIBS=-lrt -+ if test "$ac_cv_search_clock_gettime" != "none required"; then -+ REALTIME_LIBS=$ac_cv_search_clock_gettime -+ fi - AC_DEFINE(HAVE_CLOCK_MONOTONIC) - AC_SUBST(HAVE_CLOCK_MONOTONIC) - AC_SUBST(REALTIME_LIBS) -@@ -4230,6 +4233,9 @@ - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= - else -+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ [MOZ_NATIVE_LIBEVENT=1 -+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi -@@ -4242,10 +4248,11 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) - fi -+]) - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS Modified: trunk/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978) +++ trunk/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979) @@ -22,7 +22,7 @@ -# message_pump_libevent.cc includes third_party/libevent/event.h, -# which we put in $(DIST), see export rule below -LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES)) ++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) endif # } vpath %.cc \ Modified: trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in Mon Sep 3 23:18:55 2012 (r978) +++ trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in Tue Sep 4 04:48:43 2012 (r979) @@ -1,21 +1,5 @@ --- mozilla/js/src/configure.in.orig 2012-01-29 15:44:24.000000000 +0100 +++ mozilla/js/src/configure.in 2012-01-30 23:37:46.541060008 +0100 -@@ -2732,6 +2742,7 @@ - AC_DEFINE(JS_NUNBOX32) - ;; - sparc*-*) -+ if test ! "$HAVE_64BIT_OS" ; then - NANOJIT_ARCH=Sparc - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 -@@ -2739,6 +2750,7 @@ - ENABLE_METHODJIT_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) - AC_DEFINE(JS_NUNBOX32) -+ fi - ;; - esac - @@ -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. */ Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ ---- mozilla/js/src/jsnum.cpp.orig Sun Nov 5 18:37:07 2006 -+++ mozilla/js/src/jsnum.cpp Sun Nov 5 18:42:31 2006 -@@ -45,6 +45,9 @@ - #if defined(XP_WIN) || defined(XP_OS2) - #include - #endif -+#if defined(__FreeBSD__) -+#include -+#endif - #include - #include - #include -@@ -532,7 +535,15 @@ static jsdouble NaN; - - #else - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000 -+#include -+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT)) -+ -+#else -+ - #define FIX_FPU() ((void)0) -+ -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ - - #endif - Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ./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 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; - Copied and modified: trunk/mail/thunderbird/files/patch-bug351181 (from r978, trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp) ============================================================================== Copied and modified: trunk/mail/thunderbird/files/patch-bug543241 (from r978, trunk/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp) ============================================================================== Copied and modified: trunk/mail/thunderbird/files/patch-bug732340 (from r978, trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc) ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc Mon Sep 3 23:18:55 2012 (r978, copy source) +++ trunk/mail/thunderbird/files/patch-bug732340 Tue Sep 4 04:48:43 2012 (r979) @@ -1,11 +1,14 @@ --- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 +++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -540,4 +540,8 @@ +@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t GPOS::position_finish (buffer); } ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf::search(unsigned int const &) const; ++#endif + Added: trunk/mail/thunderbird/files/patch-bug788039 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,53 @@ +# Bug 788039 - Also use pkg-config when searching for libevent. + +--- mozilla/config/autoconf.mk.in~ ++++ mozilla/config/autoconf.mk.in +@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA + + MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@ + MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@ +-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@ ++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@ + + MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@ + MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@ +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -3854,7 +3854,7 @@ fi + dnl system libevent Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-libevent, +-[ --with-system-libevent=[PFX] ++[ --with-system-libevent[=PFX] + Use system libevent [installed at prefix PFX]], + LIBEVENT_DIR=$withval) + +@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -3876,16 +3877,16 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], +- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) +-fi ++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) ++fi]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + + AC_SUBST(MOZ_NATIVE_LIBEVENT) +-AC_SUBST(MOZ_LIBEVENT_INCLUDES) ++AC_SUBST(MOZ_LIBEVENT_CFLAGS) + AC_SUBST(MOZ_LIBEVENT_LIBS) + + dnl ======================================================== Deleted: trunk/mail/thunderbird/files/patch-mozilla-configure.in ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-configure.in Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- mozilla/configure.in.orig 2012-05-23 20:56:34.000000000 +0200 -+++ mozilla/configure.in 2012-05-27 18:18:25.000000000 +0200 -@@ -4230,6 +4233,9 @@ - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= - else -+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ [MOZ_NATIVE_LIBEVENT=1 -+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi -@@ -4242,10 +4248,11 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) - fi -+]) - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS Deleted: trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -540,4 +540,8 @@ - GPOS::position_finish (buffer); - } - -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf::search(unsigned int const &) const; - Modified: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978) +++ trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979) @@ -22,7 +22,7 @@ -# message_pump_libevent.cc includes third_party/libevent/event.h, -# which we put in $(DIST), see export rule below -LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES)) ++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) endif # } vpath %.cc \ Deleted: trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,31 +0,0 @@ ---- mozilla/js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500 -+++ mozilla/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 Deleted: trunk/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ./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 -@@ -57,6 +57,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - mThreadsByPRThread.Init(); - - if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) Copied and modified: trunk/mail/thunderbird3/files/patch-bug351181 (from r978, trunk/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp) ============================================================================== Added: trunk/mail/thunderbird3/files/patch-bug653551 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird3/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,24 @@ +commit 47ea30f +Author: Landry Breuil +Date: Thu Feb 2 15:31:56 2012 +0900 + + Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha +--- + js/src/configure.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git mozilla/js/src/configure.in mozilla/js/src/configure.in +index 84390cf..d663c46 100644 +--- mozilla/js/src/configure.in ++++ mozilla/js/src/configure.in +@@ -2471,8 +2471,10 @@ arm*-*) + NANOJIT_ARCH=ARM + ;; + sparc*-*) ++ if test ! "$HAVE_64BIT_OS" ; then + ENABLE_JIT=1 + NANOJIT_ARCH=Sparc ++ fi + ;; + esac + Deleted: trunk/mail/thunderbird3/files/patch-mozilla-js-src-configure.in ============================================================================== --- trunk/mail/thunderbird3/files/patch-mozilla-js-src-configure.in Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200 -+++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200 -@@ -2466,10 +2466,6 @@ - ENABLE_JIT=1 - NANOJIT_ARCH=ARM - ;; --sparc*-*) -- ENABLE_JIT=1 -- NANOJIT_ARCH=Sparc -- ;; - esac - - MOZ_ARG_DISABLE_BOOL(jit, Deleted: trunk/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp ============================================================================== --- trunk/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ ---- mozilla/js/src/jsnum.cpp.orig Sun Nov 5 18:37:07 2006 -+++ mozilla/js/src/jsnum.cpp Sun Nov 5 18:42:31 2006 -@@ -45,6 +45,9 @@ - #if defined(XP_WIN) || defined(XP_OS2) - #include - #endif -+#if defined(__FreeBSD__) -+#include -+#endif - #include - #include - #include -@@ -532,7 +535,15 @@ static jsdouble NaN; - - #else - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000 -+#include -+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT)) -+ -+#else -+ - #define FIX_FPU() ((void)0) -+ -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ - - #endif - Copied and modified: trunk/www/firefox-esr/files/patch-bug351181 (from r978, trunk/www/firefox-esr/files/patch-js_src_jsnum.cpp) ============================================================================== Copied and modified: trunk/www/firefox-esr/files/patch-bug543241 (from r978, trunk/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp) ============================================================================== Added: trunk/www/firefox-esr/files/patch-bug653551 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,29 @@ +commit 47ea30f +Author: Landry Breuil +Date: Thu Feb 2 15:31:56 2012 +0900 + + Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha +--- + js/src/configure.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git js/src/configure.in js/src/configure.in +index 84390cf..d663c46 100644 +--- js/src/configure.in ++++ js/src/configure.in +@@ -2806,13 +2806,15 @@ arm*-*) + AC_DEFINE(JS_NUNBOX32) + ;; + sparc*-*) ++ if test ! "$HAVE_64BIT_OS" ; then + NANOJIT_ARCH=Sparc + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 + ENABLE_METHODJIT_TYPED_ARRAY=1 + AC_DEFINE(JS_CPU_SPARC) + AC_DEFINE(JS_NUNBOX32) ++ fi + ;; + mips*-*) + ENABLE_METHODJIT=1 Added: trunk/www/firefox-esr/files/patch-bug728968 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug728968 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,50 @@ +commit 4075972 +Author: Mike Hommey +Date: Thu Feb 23 11:00:46 2012 +0100 + + Bug 728968 - Detect clock_gettime when it's not in -lrt. r=khuey +--- + configure.in | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +diff --git configure.in configure.in +index 3ba7e2f..3d0614c 100644 +--- configure.in ++++ configure.in +@@ -3728,20 +3728,23 @@ AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat6 + AC_CHECK_FUNCS(flockfile getpagesize) + AC_CHECK_FUNCS(localtime_r strtok_r) + +-dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt +-_SAVE_LDFLAGS=$LDFLAGS +-LDFLAGS="$LDFLAGS -lrt" +-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, +- ac_cv_have_clock_monotonic, +- [AC_TRY_LINK([#include ], +- [ struct timespec ts; +- clock_gettime(CLOCK_MONOTONIC, &ts); ], +- ac_cv_have_clock_monotonic=yes, +- ac_cv_have_clock_monotonic=no)]) +-LDFLAGS=$_SAVE_LDFLAGS +-if test "$ac_cv_have_clock_monotonic" = "yes"; then ++dnl check for clock_gettime(), the CLOCK_MONOTONIC clock ++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), ++ ac_cv_clock_monotonic, ++ [for libs in "" -lrt; do ++ _SAVE_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $libs" ++ AC_TRY_LINK([#include ], ++ [ struct timespec ts; ++ clock_gettime(CLOCK_MONOTONIC, &ts); ], ++ ac_cv_clock_monotonic=$libs ++ break, ++ ac_cv_clock_monotonic=no) ++ LDFLAGS="$_SAVE_LDFLAGS" ++ done]) ++if test "$ac_cv_clock_monotonic" != "no"; then + HAVE_CLOCK_MONOTONIC=1 +- REALTIME_LIBS=-lrt ++ REALTIME_LIBS=$ac_cv_clock_monotonic + AC_DEFINE(HAVE_CLOCK_MONOTONIC) + AC_SUBST(HAVE_CLOCK_MONOTONIC) + AC_SUBST(REALTIME_LIBS) Added: trunk/www/firefox-esr/files/patch-bug788039 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,53 @@ +# Bug 788039 - Also use pkg-config when searching for libevent. + +--- config/autoconf.mk.in~ ++++ config/autoconf.mk.in +@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA + + MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@ + MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@ +-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@ ++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@ + + MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@ + MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@ +--- configure.in~ ++++ configure.in +@@ -3854,7 +3854,7 @@ fi + dnl system libevent Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-libevent, +-[ --with-system-libevent=[PFX] ++[ --with-system-libevent[=PFX] + Use system libevent [installed at prefix PFX]], + LIBEVENT_DIR=$withval) + +@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -3876,16 +3877,16 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], +- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) +-fi ++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) ++fi]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + + AC_SUBST(MOZ_NATIVE_LIBEVENT) +-AC_SUBST(MOZ_LIBEVENT_INCLUDES) ++AC_SUBST(MOZ_LIBEVENT_CFLAGS) + AC_SUBST(MOZ_LIBEVENT_LIBS) + + dnl ======================================================== Deleted: trunk/www/firefox-esr/files/patch-configure.in ============================================================================== --- trunk/www/firefox-esr/files/patch-configure.in Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ ---- configure.in.orig 2010-11-04 21:05:18.000000000 +0100 -+++ configure.in 2010-11-09 12:59:28.000000000 +0100 -@@ -3803,19 +3803,21 @@ - AC_CHECK_FUNCS(localtime_r strtok_r) - - dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt --_SAVE_LDFLAGS=$LDFLAGS --LDFLAGS="$LDFLAGS -lrt" --AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, -+_SAVE_LIBS=$LIBS -+AC_SEARCH_LIBS(clock_gettime, rt) -+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), - ac_cv_have_clock_monotonic, - [AC_TRY_LINK([#include ], - [ struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); ], - ac_cv_have_clock_monotonic=yes, - ac_cv_have_clock_monotonic=no)]) --LDFLAGS=$_SAVE_LDFLAGS -+LIBS=$_SAVE_LIBS - if test "$ac_cv_have_clock_monotonic" = "yes"; then - HAVE_CLOCK_MONOTONIC=1 -- REALTIME_LIBS=-lrt -+ if test "$ac_cv_search_clock_gettime" != "none required"; then -+ REALTIME_LIBS=$ac_cv_search_clock_gettime -+ fi - AC_DEFINE(HAVE_CLOCK_MONOTONIC) - AC_SUBST(HAVE_CLOCK_MONOTONIC) - AC_SUBST(REALTIME_LIBS) -@@ -4230,6 +4233,9 @@ - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= - else -+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ [MOZ_NATIVE_LIBEVENT=1 -+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi -@@ -4242,10 +4248,11 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) - fi -+]) - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS Modified: trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978) +++ trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979) @@ -22,7 +22,7 @@ -# message_pump_libevent.cc includes third_party/libevent/event.h, -# which we put in $(DIST), see export rule below -LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES)) ++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) endif # } vpath %.cc \ Modified: trunk/www/firefox-esr/files/patch-js-src-configure.in ============================================================================== --- trunk/www/firefox-esr/files/patch-js-src-configure.in Mon Sep 3 23:18:55 2012 (r978) +++ trunk/www/firefox-esr/files/patch-js-src-configure.in Tue Sep 4 04:48:43 2012 (r979) @@ -1,21 +1,5 @@ --- js/src/configure.in.orig 2012-01-29 11:24:33.000000000 +0100 +++ js/src/configure.in 2012-01-30 23:30:02.051087215 +0100 -@@ -2732,6 +2742,7 @@ - AC_DEFINE(JS_NUNBOX32) - ;; - sparc*-*) -+ if test ! "$HAVE_64BIT_OS" ; then - NANOJIT_ARCH=Sparc - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 -@@ -2739,6 +2750,7 @@ - ENABLE_METHODJIT_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) - AC_DEFINE(JS_NUNBOX32) -+ fi - ;; - esac - @@ -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. */ Deleted: trunk/www/firefox-esr/files/patch-js_src_jsnum.cpp ============================================================================== --- trunk/www/firefox-esr/files/patch-js_src_jsnum.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /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 -@@ -43,6 +43,9 @@ - /* - * JS number type and wrapper class. - */ -+#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 Deleted: trunk/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp ============================================================================== --- trunk/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ./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 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; - Copied and modified: trunk/www/firefox-nightly/files/patch-bug543241 (from r978, trunk/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp) ============================================================================== Copied and modified: trunk/www/firefox-nightly/files/patch-bug732340 (from r978, trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc) ============================================================================== --- trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc Mon Sep 3 23:18:55 2012 (r978, copy source) +++ trunk/www/firefox-nightly/files/patch-bug732340 Tue Sep 4 04:48:43 2012 (r979) @@ -1,10 +1,13 @@ --- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 +++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -540,4 +540,8 @@ - GPOS::position_finish (buffer); +@@ -484,3 +484,10 @@ hb_ot_layout_position_finish (hb_font_t + { + GPOS::position_finish (font, buffer, zero_width_attached_marks); } - ++ ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf::search(unsigned int const &) const; ++#endif Added: trunk/www/firefox-nightly/files/patch-bug788039 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,42 @@ +# Bug 788039 - Also use pkg-config when searching for libevent. + +--- configure.in ++++ configure.in +@@ -3854,7 +3854,7 @@ fi + dnl system libevent Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-libevent, +-[ --with-system-libevent=[PFX] ++[ --with-system-libevent[=PFX] + Use system libevent [installed at prefix PFX]], + LIBEVENT_DIR=$withval) + +@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -3876,16 +3877,16 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], +- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) +-fi ++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) ++fi]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + + AC_SUBST(MOZ_NATIVE_LIBEVENT) +-AC_SUBST(MOZ_LIBEVENT_INCLUDES) ++AC_SUBST(MOZ_LIBEVENT_CFLAGS) + AC_SUBST(MOZ_LIBEVENT_LIBS) + + dnl ======================================================== Deleted: trunk/www/firefox-nightly/files/patch-configure.in ============================================================================== --- trunk/www/firefox-nightly/files/patch-configure.in Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- configure.in.orig 2010-11-04 21:05:18.000000000 +0100 -+++ configure.in 2010-11-09 12:59:28.000000000 +0100 -@@ -4230,6 +4233,9 @@ - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= - else -+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ [MOZ_NATIVE_LIBEVENT=1 -+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi -@@ -4242,10 +4248,11 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) - fi -+]) - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS Deleted: trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc ============================================================================== --- trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -540,4 +540,8 @@ - GPOS::position_finish (buffer); - } - -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf::search(unsigned int const &) const; Modified: trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978) +++ trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979) @@ -22,7 +22,7 @@ -# message_pump_libevent.cc includes third_party/libevent/event.h, -# which we put in $(DIST), see export rule below -LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES)) ++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) endif # } vpath %.cc \ Deleted: trunk/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp ============================================================================== --- trunk/www/firefox-nightly/files/patch-xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ./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 -@@ -57,6 +57,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - mThreadsByPRThread.Init(); - - if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) Copied and modified: trunk/www/firefox/files/patch-bug351181 (from r978, trunk/www/firefox/files/patch-js_src_jsnum.cpp) ============================================================================== Copied and modified: trunk/www/firefox/files/patch-bug543241 (from r978, trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp) ============================================================================== Copied and modified: trunk/www/firefox/files/patch-bug732340 (from r978, trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc) ============================================================================== --- trunk/www/firefox-nightly/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc Mon Sep 3 23:18:55 2012 (r978, copy source) +++ trunk/www/firefox/files/patch-bug732340 Tue Sep 4 04:48:43 2012 (r979) @@ -1,10 +1,13 @@ --- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 +++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -540,4 +540,8 @@ +@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t GPOS::position_finish (buffer); } ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf::search(unsigned int const &) const; ++#endif + Added: trunk/www/firefox/files/patch-bug788039 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,53 @@ +# Bug 788039 - Also use pkg-config when searching for libevent. + +--- config/autoconf.mk.in~ ++++ config/autoconf.mk.in +@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA + + MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@ + MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@ +-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@ ++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@ + + MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@ + MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@ +--- configure.in~ ++++ configure.in +@@ -3854,7 +3854,7 @@ fi + dnl system libevent Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-libevent, +-[ --with-system-libevent=[PFX] ++[ --with-system-libevent[=PFX] + Use system libevent [installed at prefix PFX]], + LIBEVENT_DIR=$withval) + +@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -3876,16 +3877,16 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], +- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) +-fi ++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) ++fi]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + + AC_SUBST(MOZ_NATIVE_LIBEVENT) +-AC_SUBST(MOZ_LIBEVENT_INCLUDES) ++AC_SUBST(MOZ_LIBEVENT_CFLAGS) + AC_SUBST(MOZ_LIBEVENT_LIBS) + + dnl ======================================================== Deleted: trunk/www/firefox/files/patch-configure.in ============================================================================== --- trunk/www/firefox/files/patch-configure.in Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- configure.in.orig 2012-05-23 20:56:34.000000000 +0200 -+++ configure.in 2012-05-27 18:18:25.000000000 +0200 -@@ -4230,6 +4233,9 @@ - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= - else -+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ [MOZ_NATIVE_LIBEVENT=1 -+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi -@@ -4242,10 +4248,11 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) - fi -+]) - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS Deleted: trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc ============================================================================== --- trunk/www/firefox/files/patch-gfx-harfbuzz-src-hb-ot-layout.cc Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -540,4 +540,8 @@ - GPOS::position_finish (buffer); - } - -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf::search(unsigned int const &) const; Modified: trunk/www/firefox/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/firefox/files/patch-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978) +++ trunk/www/firefox/files/patch-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979) @@ -22,7 +22,7 @@ -# message_pump_libevent.cc includes third_party/libevent/event.h, -# which we put in $(DIST), see export rule below -LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES)) ++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) endif # } vpath %.cc \ Deleted: trunk/www/firefox/files/patch-js_src_jsnum.cpp ============================================================================== --- trunk/www/firefox/files/patch-js_src_jsnum.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /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 Deleted: trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp ============================================================================== --- trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ./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 -@@ -57,6 +57,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - mThreadsByPRThread.Init(); - - if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) Copied and modified: trunk/www/firefox36/files/patch-bug351181 (from r978, trunk/www/firefox36/files/patch-js_src_jsnum.cpp) ============================================================================== Added: trunk/www/firefox36/files/patch-bug653551 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox36/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,24 @@ +commit 47ea30f +Author: Landry Breuil +Date: Thu Feb 2 15:31:56 2012 +0900 + + Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha +--- + js/src/configure.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git js/src/configure.in js/src/configure.in +index 84390cf..d663c46 100644 +--- js/src/configure.in ++++ js/src/configure.in +@@ -2471,8 +2471,10 @@ arm*-*) + NANOJIT_ARCH=ARM + ;; + sparc*-*) ++ if test ! "$HAVE_64BIT_OS" ; then + ENABLE_JIT=1 + NANOJIT_ARCH=Sparc ++ fi + ;; + esac + Deleted: trunk/www/firefox36/files/patch-js-src-configure.in ============================================================================== --- trunk/www/firefox36/files/patch-js-src-configure.in Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- js/src/configure.in.orig 2009-09-21 00:26:58.000000000 +0200 -+++ js/src/configure.in 2009-10-08 07:00:27.000000000 +0200 -@@ -2456,10 +2456,6 @@ - ENABLE_JIT=1 - NANOJIT_ARCH=ARM - ;; --sparc*-*) -- ENABLE_JIT=1 -- NANOJIT_ARCH=Sparc -- ;; - esac - - MOZ_ARG_DISABLE_BOOL(jit, Deleted: trunk/www/firefox36/files/patch-js_src_jsnum.cpp ============================================================================== --- trunk/www/firefox36/files/patch-js_src_jsnum.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /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 -@@ -43,6 +43,9 @@ - /* - * JS number type and wrapper class. - */ -+#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__) && __FreeBSD_version >= 601000 -+#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 Copied and modified: trunk/www/libxul/files/patch-bug351181 (from r978, trunk/www/libxul/files/patch-js_src_jsnum.cpp) ============================================================================== Copied and modified: trunk/www/libxul/files/patch-bug543241 (from r978, trunk/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp) ============================================================================== Added: trunk/www/libxul/files/patch-bug653551 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,29 @@ +commit 47ea30f +Author: Landry Breuil +Date: Thu Feb 2 15:31:56 2012 +0900 + + Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha +--- + js/src/configure.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git js/src/configure.in js/src/configure.in +index 84390cf..d663c46 100644 +--- js/src/configure.in ++++ js/src/configure.in +@@ -2806,13 +2806,15 @@ arm*-*) + AC_DEFINE(JS_NUNBOX32) + ;; + sparc*-*) ++ if test ! "$HAVE_64BIT_OS" ; then + NANOJIT_ARCH=Sparc + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 + ENABLE_METHODJIT_TYPED_ARRAY=1 + AC_DEFINE(JS_CPU_SPARC) + AC_DEFINE(JS_NUNBOX32) ++ fi + ;; + mips*-*) + ENABLE_METHODJIT=1 Added: trunk/www/libxul/files/patch-bug728968 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug728968 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,50 @@ +commit 4075972 +Author: Mike Hommey +Date: Thu Feb 23 11:00:46 2012 +0100 + + Bug 728968 - Detect clock_gettime when it's not in -lrt. r=khuey +--- + configure.in | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +diff --git configure.in configure.in +index 3ba7e2f..3d0614c 100644 +--- configure.in ++++ configure.in +@@ -3728,20 +3728,23 @@ AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat6 + AC_CHECK_FUNCS(flockfile getpagesize) + AC_CHECK_FUNCS(localtime_r strtok_r) + +-dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt +-_SAVE_LDFLAGS=$LDFLAGS +-LDFLAGS="$LDFLAGS -lrt" +-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, +- ac_cv_have_clock_monotonic, +- [AC_TRY_LINK([#include ], +- [ struct timespec ts; +- clock_gettime(CLOCK_MONOTONIC, &ts); ], +- ac_cv_have_clock_monotonic=yes, +- ac_cv_have_clock_monotonic=no)]) +-LDFLAGS=$_SAVE_LDFLAGS +-if test "$ac_cv_have_clock_monotonic" = "yes"; then ++dnl check for clock_gettime(), the CLOCK_MONOTONIC clock ++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), ++ ac_cv_clock_monotonic, ++ [for libs in "" -lrt; do ++ _SAVE_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $libs" ++ AC_TRY_LINK([#include ], ++ [ struct timespec ts; ++ clock_gettime(CLOCK_MONOTONIC, &ts); ], ++ ac_cv_clock_monotonic=$libs ++ break, ++ ac_cv_clock_monotonic=no) ++ LDFLAGS="$_SAVE_LDFLAGS" ++ done]) ++if test "$ac_cv_clock_monotonic" != "no"; then + HAVE_CLOCK_MONOTONIC=1 +- REALTIME_LIBS=-lrt ++ REALTIME_LIBS=$ac_cv_clock_monotonic + AC_DEFINE(HAVE_CLOCK_MONOTONIC) + AC_SUBST(HAVE_CLOCK_MONOTONIC) + AC_SUBST(REALTIME_LIBS) Added: trunk/www/libxul/files/patch-bug788039 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,53 @@ +# Bug 788039 - Also use pkg-config when searching for libevent. + +--- config/autoconf.mk.in~ ++++ config/autoconf.mk.in +@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA + + MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@ + MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@ +-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@ ++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@ + + MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@ + MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@ +--- configure.in~ ++++ configure.in +@@ -3854,7 +3854,7 @@ fi + dnl system libevent Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-libevent, +-[ --with-system-libevent=[PFX] ++[ --with-system-libevent[=PFX] + Use system libevent [installed at prefix PFX]], + LIBEVENT_DIR=$withval) + +@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -3876,16 +3877,16 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], +- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) +-fi ++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) ++fi]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + + AC_SUBST(MOZ_NATIVE_LIBEVENT) +-AC_SUBST(MOZ_LIBEVENT_INCLUDES) ++AC_SUBST(MOZ_LIBEVENT_CFLAGS) + AC_SUBST(MOZ_LIBEVENT_LIBS) + + dnl ======================================================== Deleted: trunk/www/libxul/files/patch-configure.in ============================================================================== --- trunk/www/libxul/files/patch-configure.in Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,52 +0,0 @@ ---- configure.in.orig 2010-11-04 21:05:18.000000000 +0100 -+++ configure.in 2010-11-09 12:59:28.000000000 +0100 -@@ -3803,19 +3803,21 @@ - AC_CHECK_FUNCS(localtime_r strtok_r) - - dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt --_SAVE_LDFLAGS=$LDFLAGS --LDFLAGS="$LDFLAGS -lrt" --AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, -+_SAVE_LIBS=$LIBS -+AC_SEARCH_LIBS(clock_gettime, rt) -+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), - ac_cv_have_clock_monotonic, - [AC_TRY_LINK([#include ], - [ struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); ], - ac_cv_have_clock_monotonic=yes, - ac_cv_have_clock_monotonic=no)]) --LDFLAGS=$_SAVE_LDFLAGS -+LIBS=$_SAVE_LIBS - if test "$ac_cv_have_clock_monotonic" = "yes"; then - HAVE_CLOCK_MONOTONIC=1 -- REALTIME_LIBS=-lrt -+ if test "$ac_cv_search_clock_gettime" != "none required"; then -+ REALTIME_LIBS=$ac_cv_search_clock_gettime -+ fi - AC_DEFINE(HAVE_CLOCK_MONOTONIC) - AC_SUBST(HAVE_CLOCK_MONOTONIC) - AC_SUBST(REALTIME_LIBS) -@@ -4230,6 +4233,9 @@ - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= - else -+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ [MOZ_NATIVE_LIBEVENT=1 -+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi -@@ -4242,10 +4248,11 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) - fi -+]) - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS Modified: trunk/www/libxul/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/libxul/files/patch-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978) +++ trunk/www/libxul/files/patch-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979) @@ -22,7 +22,7 @@ -# message_pump_libevent.cc includes third_party/libevent/event.h, -# which we put in $(DIST), see export rule below -LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES)) ++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) endif # } vpath %.cc \ Modified: trunk/www/libxul/files/patch-js-src-configure.in ============================================================================== --- trunk/www/libxul/files/patch-js-src-configure.in Mon Sep 3 23:18:55 2012 (r978) +++ trunk/www/libxul/files/patch-js-src-configure.in Tue Sep 4 04:48:43 2012 (r979) @@ -1,21 +1,5 @@ --- js/src/configure.in.orig 2012-01-29 11:24:33.000000000 +0100 +++ js/src/configure.in 2012-01-30 23:30:02.051087215 +0100 -@@ -2732,6 +2742,7 @@ - AC_DEFINE(JS_NUNBOX32) - ;; - sparc*-*) -+ if test ! "$HAVE_64BIT_OS" ; then - NANOJIT_ARCH=Sparc - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 -@@ -2739,6 +2750,7 @@ - ENABLE_METHODJIT_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) - AC_DEFINE(JS_NUNBOX32) -+ fi - ;; - esac - @@ -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. */ Deleted: trunk/www/libxul/files/patch-js_src_jsnum.cpp ============================================================================== --- trunk/www/libxul/files/patch-js_src_jsnum.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /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 -@@ -43,6 +43,9 @@ - /* - * JS number type and wrapper class. - */ -+#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 Deleted: trunk/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp ============================================================================== --- trunk/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ./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 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; - Copied and modified: trunk/www/libxul19/files/patch-bug351181 (from r978, trunk/www/libxul19/files/patch-js_src_jsnum.cpp) ============================================================================== Added: trunk/www/libxul19/files/patch-bug653551 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul19/files/patch-bug653551 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,24 @@ +commit 47ea30f +Author: Landry Breuil +Date: Thu Feb 2 15:31:56 2012 +0900 + + Bug 653551 - Jaegermonkey Sparc back-end broken on sparc64. r=leon.sha +--- + js/src/configure.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git js/src/configure.in js/src/configure.in +index 84390cf..d663c46 100644 +--- js/src/configure.in ++++ js/src/configure.in +@@ -2471,8 +2471,10 @@ arm*-*) + NANOJIT_ARCH=ARM + ;; + sparc*-*) ++ if test ! "$HAVE_64BIT_OS" ; then + ENABLE_JIT=1 + NANOJIT_ARCH=Sparc ++ fi + ;; + esac + Deleted: trunk/www/libxul19/files/patch-js-src-configure.in ============================================================================== --- trunk/www/libxul19/files/patch-js-src-configure.in Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- js/src/configure.in.orig 2009-09-30 21:50:26.000000000 +0200 -+++ js/src/configure.in 2009-09-30 21:50:44.000000000 +0200 -@@ -2467,10 +2467,6 @@ - ENABLE_JIT=1 - NANOJIT_ARCH=ARM - ;; --sparc*-*) -- ENABLE_JIT=1 -- NANOJIT_ARCH=Sparc -- ;; - esac - - MOZ_ARG_DISABLE_BOOL(jit, Deleted: trunk/www/libxul19/files/patch-js_src_jsnum.cpp ============================================================================== --- trunk/www/libxul19/files/patch-js_src_jsnum.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /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 -@@ -43,6 +43,9 @@ - /* - * JS number type and wrapper class. - */ -+#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__) && __FreeBSD_version >= 601000 -+#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 Copied and modified: trunk/www/seamonkey/files/patch-bug351181 (from r978, trunk/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp) ============================================================================== Copied and modified: trunk/www/seamonkey/files/patch-bug543241 (from r978, trunk/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp) ============================================================================== Copied and modified: trunk/www/seamonkey/files/patch-bug732340 (from r978, trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc) ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc Mon Sep 3 23:18:55 2012 (r978, copy source) +++ trunk/www/seamonkey/files/patch-bug732340 Tue Sep 4 04:48:43 2012 (r979) @@ -1,11 +1,14 @@ --- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 +++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -540,4 +540,8 @@ +@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t GPOS::position_finish (buffer); } ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3 +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf >::search(unsigned int const &) const; +template int SortedArrayOf::search(unsigned int const &) const; ++#endif + Added: trunk/www/seamonkey/files/patch-bug788039 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug788039 Tue Sep 4 04:48:43 2012 (r979) @@ -0,0 +1,53 @@ +# Bug 788039 - Also use pkg-config when searching for libevent. + +--- mozilla/config/autoconf.mk.in~ ++++ mozilla/config/autoconf.mk.in +@@ -227,7 +227,7 @@ MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLA + + MOZ_NATIVE_LIBEVENT = @MOZ_NATIVE_LIBEVENT@ + MOZ_LIBEVENT_LIBS = @MOZ_LIBEVENT_LIBS@ +-MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@ ++MOZ_LIBEVENT_CFLAGS = @MOZ_LIBEVENT_CFLAGS@ + + MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@ + MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@ +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -3854,7 +3854,7 @@ fi + dnl system libevent Support + dnl ======================================================== + MOZ_ARG_WITH_STRING(system-libevent, +-[ --with-system-libevent=[PFX] ++[ --with-system-libevent[=PFX] + Use system libevent [installed at prefix PFX]], + LIBEVENT_DIR=$withval) + +@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -3876,16 +3877,16 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], +- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) +-fi ++ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) ++fi]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + + AC_SUBST(MOZ_NATIVE_LIBEVENT) +-AC_SUBST(MOZ_LIBEVENT_INCLUDES) ++AC_SUBST(MOZ_LIBEVENT_CFLAGS) + AC_SUBST(MOZ_LIBEVENT_LIBS) + + dnl ======================================================== Deleted: trunk/www/seamonkey/files/patch-mozilla-configure.in ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-configure.in Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ ---- mozilla/configure.in.orig 2012-05-23 20:56:34.000000000 +0200 -+++ mozilla/configure.in 2012-05-27 18:18:25.000000000 +0200 -@@ -4230,6 +4233,9 @@ - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= - else -+PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ [MOZ_NATIVE_LIBEVENT=1 -+ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi -@@ -4242,10 +4248,11 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) - fi -+]) - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS Deleted: trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-gfx-harfbuzz-src-hb-ot-layout.cc Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc.orig 2012-06-24 22:14:46.463741874 -0400 -+++ mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2012-06-24 22:15:06.784770042 -0400 -@@ -540,4 +540,8 @@ - GPOS::position_finish (buffer); - } - -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf >::search(unsigned int const &) const; -+template int SortedArrayOf::search(unsigned int const &) const; - Modified: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Mon Sep 3 23:18:55 2012 (r978) +++ trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Tue Sep 4 04:48:43 2012 (r979) @@ -22,7 +22,7 @@ -# message_pump_libevent.cc includes third_party/libevent/event.h, -# which we put in $(DIST), see export rule below -LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES)) ++LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) endif # } vpath %.cc \ Deleted: trunk/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,31 +0,0 @@ ---- mozilla/js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500 -+++ mozilla/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 Deleted: trunk/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Tue Sep 4 04:48:43 2012 (r978) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- ./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 -@@ -57,6 +57,11 @@ - nsresult - nsThreadManager::Init() - { -+#if defined(NS_TLS) && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - mThreadsByPRThread.Init(); - - if (PR_NewThreadPrivateIndex(&mCurThreadIndex, ReleaseObject) == PR_FAILURE) From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 04:48:58 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 86BB6106566B for ; Tue, 4 Sep 2012 04:48:58 +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 0EB188FC0C for ; Tue, 4 Sep 2012 04:48:57 +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 q844mvps024691 for ; Tue, 4 Sep 2012 04:48: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 q844mq9U024133 for freebsd-gecko@freebsd.org; Tue, 4 Sep 2012 04:48:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 4 Sep 2012 04:48:52 GMT Message-Id: <201209040448.q844mq9U024133@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] r980 - trunk/www/libxul 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: Tue, 04 Sep 2012 04:48:58 -0000 Author: jbeich Date: Tue Sep 4 04:48:51 2012 New Revision: 980 Log: chase firefox-esr update Modified: trunk/www/libxul/Makefile trunk/www/libxul/distinfo Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Tue Sep 4 04:48:43 2012 (r979) +++ trunk/www/libxul/Makefile Tue Sep 4 04:48:51 2012 (r980) @@ -6,7 +6,7 @@ # PORTNAME= libxul -DISTVERSION= 10.0.6 +DISTVERSION= 10.0.7 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= firefox/releases/${DISTVERSION}esr/source Modified: trunk/www/libxul/distinfo ============================================================================== --- trunk/www/libxul/distinfo Tue Sep 4 04:48:43 2012 (r979) +++ trunk/www/libxul/distinfo Tue Sep 4 04:48:51 2012 (r980) @@ -1,2 +1,2 @@ -SHA256 (firefox-10.0.6esr.source.tar.bz2) = 03e5766cdc866bfb065fb1d0ecba9bb3530bdbe2041c52cdad5126e38f7184b5 -SIZE (firefox-10.0.6esr.source.tar.bz2) = 75450691 +SHA256 (firefox-10.0.7esr.source.tar.bz2) = 91b0dab3168d75a4f157dabfdf6a95367cd3a8767298d88fb43be251f37f4423 +SIZE (firefox-10.0.7esr.source.tar.bz2) = 75624327 From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 04:49:05 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 869C7106566B for ; Tue, 4 Sep 2012 04:49: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 16FBD8FC12 for ; Tue, 4 Sep 2012 04:49: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 q844n4YN026761 for ; Tue, 4 Sep 2012 04:49: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 q844mxr4026473 for freebsd-gecko@freebsd.org; Tue, 4 Sep 2012 04:48:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 4 Sep 2012 04:48:59 GMT Message-Id: <201209040448.q844mxr4026473@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] r981 - trunk/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: Tue, 04 Sep 2012 04:49:05 -0000 Author: jbeich Date: Tue Sep 4 04:48:58 2012 New Revision: 981 Log: catch up with bug 783953 Modified: trunk/www/firefox-nightly/files/extra-bug780531 Modified: trunk/www/firefox-nightly/files/extra-bug780531 ============================================================================== --- trunk/www/firefox-nightly/files/extra-bug780531 Tue Sep 4 04:48:51 2012 (r980) +++ trunk/www/firefox-nightly/files/extra-bug780531 Tue Sep 4 04:48:58 2012 (r981) @@ -8,14 +8,14 @@ -arm*) +case "$target" in +arm-*-linux*) - MOZ_SAMPLE_TYPE_S16LE=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE) - AC_SUBST(MOZ_SAMPLE_TYPE_S16LE) + MOZ_SAMPLE_TYPE_S16=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_S16) + AC_SUBST(MOZ_SAMPLE_TYPE_S16) ;; +*-freebsd*) -+ MOZ_SAMPLE_TYPE_S16LE=1 -+ AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE) -+ AC_SUBST(MOZ_SAMPLE_TYPE_S16LE) ++ MOZ_SAMPLE_TYPE_S16=1 ++ AC_DEFINE(MOZ_SAMPLE_TYPE_S16) ++ AC_SUBST(MOZ_SAMPLE_TYPE_S16) +;; *) MOZ_SAMPLE_TYPE_FLOAT32=1 From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 07:38:21 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 D496E1065674 for ; Tue, 4 Sep 2012 07:38: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 28EA48FC18 for ; Tue, 4 Sep 2012 07:38: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 q847cJcV023295 for ; Tue, 4 Sep 2012 07:38: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 q847cE0F021987 for freebsd-gecko@freebsd.org; Tue, 4 Sep 2012 07:38:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 4 Sep 2012 07:38:14 GMT Message-Id: <201209040738.q847cE0F021987@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] r982 - in trunk: 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: Tue, 04 Sep 2012 07:38:21 -0000 Author: jbeich Date: Tue Sep 4 07:38:14 2012 New Revision: 982 Log: don't specify prefix for libevent when using pkg-config libevent-2.0: event_LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 event_MOZ_OPTIONS= --with-system-libevent libevent-1.4: event_LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent event_MOZ_OPTIONS= --with-system-libevent=${LOCALBASE} Modified: trunk/Mk/bsd.gecko.mk trunk/mail/thunderbird-esr/files/patch-bug788039 trunk/mail/thunderbird/files/patch-bug788039 trunk/www/firefox-esr/files/patch-bug788039 trunk/www/firefox-nightly/files/patch-bug788039 trunk/www/firefox/files/patch-bug788039 trunk/www/libxul/files/patch-bug788039 trunk/www/seamonkey/files/patch-bug788039 Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Tue Sep 4 04:48:58 2012 (r981) +++ trunk/Mk/bsd.gecko.mk Tue Sep 4 07:38:14 2012 (r982) @@ -560,7 +560,7 @@ dbm_EXTRACT_AFTER_ARGS= --exclude mozilla*/dbm event_LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 -event_MOZ_OPTIONS= --with-system-libevent=${LOCALBASE} +event_MOZ_OPTIONS= --with-system-libevent event_EXTRACT_AFTER_ARGS= --exclude mozilla*/ipc/chromium/src/third_party/libevent ffi_LIB_DEPENDS= ffi:${PORTSDIR}/devel/libffi Modified: trunk/mail/thunderbird-esr/files/patch-bug788039 ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981) +++ trunk/mail/thunderbird-esr/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982) @@ -1,4 +1,4 @@ -# Bug 788039 - Also use pkg-config when searching for libevent. +# Bug 788039 - With no prefix search libevent via pkg-config. --- mozilla/config/autoconf.mk.in~ +++ mozilla/config/autoconf.mk.in @@ -22,14 +22,21 @@ Use system libevent [installed at prefix PFX]], LIBEVENT_DIR=$withval) -@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS +@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS + _SAVE_LIBS=$LIBS if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= ++elif test "$LIBEVENT_DIR" = yes; then ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ MOZ_NATIVE_LIBEVENT=1, ++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found])) else -+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi +- if test "${LIBEVENT_DIR}" = "yes"; then +- LIBEVENT_DIR=/usr +- fi + CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" + LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" + MOZ_CHECK_HEADER(event.h, @@ -3876,16 +3877,16 @@ else AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) AC_CHECK_LIB(event, event_init, @@ -38,9 +45,8 @@ + MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) --fi + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) -+fi]) + fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Modified: trunk/mail/thunderbird/files/patch-bug788039 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981) +++ trunk/mail/thunderbird/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982) @@ -1,4 +1,4 @@ -# Bug 788039 - Also use pkg-config when searching for libevent. +# Bug 788039 - With no prefix search libevent via pkg-config. --- mozilla/config/autoconf.mk.in~ +++ mozilla/config/autoconf.mk.in @@ -22,14 +22,21 @@ Use system libevent [installed at prefix PFX]], LIBEVENT_DIR=$withval) -@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS +@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS + _SAVE_LIBS=$LIBS if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= ++elif test "$LIBEVENT_DIR" = yes; then ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ MOZ_NATIVE_LIBEVENT=1, ++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found])) else -+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi +- if test "${LIBEVENT_DIR}" = "yes"; then +- LIBEVENT_DIR=/usr +- fi + CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" + LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" + MOZ_CHECK_HEADER(event.h, @@ -3876,16 +3877,16 @@ else AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) AC_CHECK_LIB(event, event_init, @@ -38,9 +45,8 @@ + MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) --fi + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) -+fi]) + fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Modified: trunk/www/firefox-esr/files/patch-bug788039 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981) +++ trunk/www/firefox-esr/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982) @@ -1,4 +1,4 @@ -# Bug 788039 - Also use pkg-config when searching for libevent. +# Bug 788039 - With no prefix search libevent via pkg-config. --- config/autoconf.mk.in~ +++ config/autoconf.mk.in @@ -22,14 +22,21 @@ Use system libevent [installed at prefix PFX]], LIBEVENT_DIR=$withval) -@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS +@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS + _SAVE_LIBS=$LIBS if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= ++elif test "$LIBEVENT_DIR" = yes; then ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ MOZ_NATIVE_LIBEVENT=1, ++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found])) else -+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi +- if test "${LIBEVENT_DIR}" = "yes"; then +- LIBEVENT_DIR=/usr +- fi + CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" + LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" + MOZ_CHECK_HEADER(event.h, @@ -3876,16 +3877,16 @@ else AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) AC_CHECK_LIB(event, event_init, @@ -38,9 +45,8 @@ + MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) --fi + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) -+fi]) + fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Modified: trunk/www/firefox-nightly/files/patch-bug788039 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981) +++ trunk/www/firefox-nightly/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982) @@ -1,4 +1,4 @@ -# Bug 788039 - Also use pkg-config when searching for libevent. +# Bug 788039 - With no prefix search libevent via pkg-config. --- configure.in +++ configure.in @@ -11,14 +11,21 @@ Use system libevent [installed at prefix PFX]], LIBEVENT_DIR=$withval) -@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS +@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS + _SAVE_LIBS=$LIBS if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= ++elif test "$LIBEVENT_DIR" = yes; then ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ MOZ_NATIVE_LIBEVENT=1, ++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found])) else -+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi +- if test "${LIBEVENT_DIR}" = "yes"; then +- LIBEVENT_DIR=/usr +- fi + CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" + LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" + MOZ_CHECK_HEADER(event.h, @@ -3876,16 +3877,16 @@ else AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) AC_CHECK_LIB(event, event_init, @@ -27,9 +34,8 @@ + MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) --fi + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) -+fi]) + fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Modified: trunk/www/firefox/files/patch-bug788039 ============================================================================== --- trunk/www/firefox/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981) +++ trunk/www/firefox/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982) @@ -1,4 +1,4 @@ -# Bug 788039 - Also use pkg-config when searching for libevent. +# Bug 788039 - With no prefix search libevent via pkg-config. --- config/autoconf.mk.in~ +++ config/autoconf.mk.in @@ -22,14 +22,21 @@ Use system libevent [installed at prefix PFX]], LIBEVENT_DIR=$withval) -@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS +@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS + _SAVE_LIBS=$LIBS if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= ++elif test "$LIBEVENT_DIR" = yes; then ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ MOZ_NATIVE_LIBEVENT=1, ++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found])) else -+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi +- if test "${LIBEVENT_DIR}" = "yes"; then +- LIBEVENT_DIR=/usr +- fi + CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" + LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" + MOZ_CHECK_HEADER(event.h, @@ -3876,16 +3877,16 @@ else AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) AC_CHECK_LIB(event, event_init, @@ -38,9 +45,8 @@ + MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) --fi + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) -+fi]) + fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Modified: trunk/www/libxul/files/patch-bug788039 ============================================================================== --- trunk/www/libxul/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981) +++ trunk/www/libxul/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982) @@ -1,4 +1,4 @@ -# Bug 788039 - Also use pkg-config when searching for libevent. +# Bug 788039 - With no prefix search libevent via pkg-config. --- config/autoconf.mk.in~ +++ config/autoconf.mk.in @@ -22,14 +22,21 @@ Use system libevent [installed at prefix PFX]], LIBEVENT_DIR=$withval) -@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS +@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS + _SAVE_LIBS=$LIBS if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= ++elif test "$LIBEVENT_DIR" = yes; then ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ MOZ_NATIVE_LIBEVENT=1, ++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found])) else -+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi +- if test "${LIBEVENT_DIR}" = "yes"; then +- LIBEVENT_DIR=/usr +- fi + CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" + LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" + MOZ_CHECK_HEADER(event.h, @@ -3876,16 +3877,16 @@ else AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) AC_CHECK_LIB(event, event_init, @@ -38,9 +45,8 @@ + MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) --fi + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) -+fi]) + fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Modified: trunk/www/seamonkey/files/patch-bug788039 ============================================================================== --- trunk/www/seamonkey/files/patch-bug788039 Tue Sep 4 04:48:58 2012 (r981) +++ trunk/www/seamonkey/files/patch-bug788039 Tue Sep 4 07:38:14 2012 (r982) @@ -1,4 +1,4 @@ -# Bug 788039 - Also use pkg-config when searching for libevent. +# Bug 788039 - With no prefix search libevent via pkg-config. --- mozilla/config/autoconf.mk.in~ +++ mozilla/config/autoconf.mk.in @@ -22,14 +22,21 @@ Use system libevent [installed at prefix PFX]], LIBEVENT_DIR=$withval) -@@ -3864,6 +3864,7 @@ _SAVE_LIBS=$LIBS +@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS + _SAVE_LIBS=$LIBS if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= ++elif test "$LIBEVENT_DIR" = yes; then ++ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ MOZ_NATIVE_LIBEVENT=1, ++ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found])) else -+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, MOZ_NATIVE_LIBEVENT=1, [ - if test "${LIBEVENT_DIR}" = "yes"; then - LIBEVENT_DIR=/usr - fi +- if test "${LIBEVENT_DIR}" = "yes"; then +- LIBEVENT_DIR=/usr +- fi + CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" + LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" + MOZ_CHECK_HEADER(event.h, @@ -3876,16 +3877,16 @@ else AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) AC_CHECK_LIB(event, event_init, @@ -38,9 +45,8 @@ + MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], - [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) --fi + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) -+fi]) + fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 15:33:52 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 DD1DC1065670 for ; Tue, 4 Sep 2012 15:33:51 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirg.bris.ac.uk (dirg.bris.ac.uk [137.222.10.102]) by mx1.freebsd.org (Postfix) with ESMTP id 97E5F8FC0A for ; Tue, 4 Sep 2012 15:33:51 +0000 (UTC) Received: from ncsc.bris.ac.uk ([137.222.10.41]) by dirg.bris.ac.uk with esmtp (Exim 4.72) (envelope-from ) id 1T8v3S-0001Hi-QR; Tue, 04 Sep 2012 16:28:43 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncsc.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1T8v3S-0000TO-8R; Tue, 04 Sep 2012 16:28:42 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5) with ESMTP id q84FSfio005249; Tue, 4 Sep 2012 16:28:41 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5/Submit) id q84FSfOm005248; Tue, 4 Sep 2012 16:28:41 +0100 (BST) (envelope-from mexas) Date: Tue, 4 Sep 2012 16:28:41 +0100 (BST) From: Anton Shterenlikht Message-Id: <201209041528.q84FSfOm005248@mech-cluster241.men.bris.ac.uk> To: jbeich@tormail.org, mexas@bristol.ac.uk In-Reply-To: <1T8dWC-000FCy-Im@internal.tormail.org> Cc: freebsd-gecko@freebsd.org Subject: Re: ia64 www/firefox - segfault on startup X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: mexas@bristol.ac.uk List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2012 15:33:52 -0000 From jbeich@tormail.org Mon Sep 3 23:37:19 2012 > > It segfaults straight away on the firefox congratulations > page (or whatever it is called): > > http://eis.bris.ac.uk/~mexas/ia64-exp-ff15-debug-output [picking a random thread] > Thread 13 (Thread 134d81800 (LWP 101632/firefox)): > #0 0x000000012049dbc0 in __error () from /lib/libthr.so.3 > #1 0x0000000120482d00 in pthread_getschedparam () from /lib/libthr.so.3 > #2 0x0000000000000000 in ?? () > Previous frame identical to this frame (corrupt stack?) Can you build libthr and nspr with debug symbols? Even if it doesn't trigger an assert gdb backtrace would be more verbose. $ cd /usr/src/lib/libthr; make all install DEBUG_FLAGS='-g' done $ cd /usr/ports/devel/nspr; make install WITH_DEBUG= Also try disabling pthread_getschedparam in devel/nspr. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=patch-ia64-disable-pthread_getschedparam --- ../pr/src/pthreads/ptthread.c~ +++ ../pr/src/pthreads/ptthread.c @@ -25,7 +25,7 @@ #include #endif -#ifdef SYMBIAN +#if defined(SYMBIAN) || (defined(FREEBSD) && defined(__ia64)) /* In Open C sched_get_priority_min/max do not work properly, so we undefine * _POSIX_THREAD_PRIORITY_SCHEDULING here. */ --=-=-=-- Ok, about devel/nspr - it fails tests. Here's what I did: # pwd /usr/ports/devel/nspr # cat files/patch-ia64-disable-pthread_getschedparam --- ../pr/src/pthreads/ptthread.c~ +++ ../pr/src/pthreads/ptthread.c @@ -25,7 +25,7 @@ #include #endif -#ifdef SYMBIAN +#if defined(SYMBIAN) || (defined(FREEBSD) && defined(__ia64)) /* In Open C sched_get_priority_min/max do not work properly, so we undefine * _POSIX_THREAD_PRIORITY_SCHEDULING here. */ # Fine so far, right? I build WITH_DEBUG=, the log is: http://seis.bris.ac.uk/~mexas/nspr-build.log By the way, can I check just from the build log that I indeed used WITH_DEBUG= ? Is it the "-UDEBUG -DNDEBUG=1" tokens? I never paid much attention to this port, so I never run the tests before. So I don't know if they always failed on ia64, or it is a new thing. Anyway, the test log: http://seis.bris.ac.uk/~mexas/nspr-test.log There are 2 failures: libfilename FAILED libfilename: PR_GetLibraryFilePathname failed libfilename: FAIL peek FAILED peek: Running the test with local threads peek: PR_Connect failed and then "socket" test appears to hang. YOu can see in the log that I started tests at night, and by the morning, the socket was still there. Here's the ps -axwwdd trace: http://seis.bris.ac.uk/~mexas/nspr-test-hang 93280 6 S+ 0:00.09 | `-- script nspr-test.log make test deinstall reinstall 93281 5 Is+ 0:00.20 | `-- make test deinstall reinstall 94911 5 I+ 0:00.25 | `-- /bin/sh ../../../pr/tests/runtests.sh 95023 5 S+ 0:00.37 | `-- ./socket I reinstalled devel/nspr anyway, and will now try to rebuild freebsd-gecko/www/firefox. I'll report back. Thank you Anton P.S. I wonder why the src and ports folk don't agree on a single debug variable. Right now it's DEBUG_FLAGS='-g' in src and WITH_DEBUG= in ports. Is it for a good reason? From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 20:48:41 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 7EF5B106564A for ; Tue, 4 Sep 2012 20:48: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 0A0C78FC0A for ; Tue, 4 Sep 2012 20:48: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 q84KmXFC038919 for ; Tue, 4 Sep 2012 20:48:33 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q84KmSkj038660 for freebsd-gecko@freebsd.org; Tue, 4 Sep 2012 20:48:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 4 Sep 2012 20:48:28 GMT Message-Id: <201209042048.q84KmSkj038660@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] r983 - in trunk: devel/nspr security/nss 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: Tue, 04 Sep 2012 20:48:41 -0000 Author: jbeich Date: Tue Sep 4 20:48:28 2012 New Revision: 983 Log: use compile time debugging WITH_DEBUG Modified: trunk/devel/nspr/Makefile trunk/security/nss/Makefile Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Tue Sep 4 07:38:14 2012 (r982) +++ trunk/devel/nspr/Makefile Tue Sep 4 20:48:28 2012 (r983) @@ -21,8 +21,7 @@ MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure -CONFIGURE_ARGS= --disable-debug \ - --with-pthreads +CONFIGURE_ARGS= --with-pthreads CONFIGURE_ENV= BSD_PTHREAD_LIBS=${PTHREAD_LIBS} MAKE_ENV= DIST=${WRKSRC}/dist @@ -31,6 +30,10 @@ .include +.if !defined(WITH_DEBUG) +CONFIGURE_ARGS+=--disable-debug +.endif + post-patch: @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Tue Sep 4 07:38:14 2012 (r982) +++ trunk/security/nss/Makefile Tue Sep 4 20:48:28 2012 (r983) @@ -31,7 +31,7 @@ USE_GMAKE= yes USE_PERL5_BUILD=yes MAKE_ENV= BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ - BUILD_OPT=1 NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1 + NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1 ALL_TARGET= nss_build_all CFLAGS+= -I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib @@ -48,6 +48,10 @@ p7verify pk12util rsaperf shlibsign signtool signver \ ssltap strsclnt symkeyutil vfychain vfyserv +.if !defined(WITH_DEBUG) +BUILD_OPT=1 +.endif + check regression-test test: cd ${WRKSRC}/tests; \ ${SETENV} PATH="${BINS}/bin:${PATH}" \ From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 20:49:31 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 E80C21065678 for ; Tue, 4 Sep 2012 20:49:31 +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 71BA78FC1D for ; Tue, 4 Sep 2012 20:49: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 q84KnUaJ044283 for ; Tue, 4 Sep 2012 20:49: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 q84KnPMA043853 for freebsd-gecko@freebsd.org; Tue, 4 Sep 2012 20:49:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 4 Sep 2012 20:49:25 GMT Message-Id: <201209042049.q84KnPMA043853@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] r984 - trunk/security/nss 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: Tue, 04 Sep 2012 20:49:32 -0000 Author: jbeich Date: Tue Sep 4 20:49:25 2012 New Revision: 984 Log: fixup previous commit Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Tue Sep 4 20:48:28 2012 (r983) +++ trunk/security/nss/Makefile Tue Sep 4 20:49:25 2012 (r984) @@ -49,7 +49,7 @@ ssltap strsclnt symkeyutil vfychain vfyserv .if !defined(WITH_DEBUG) -BUILD_OPT=1 +MAKE_ENV+= BUILD_OPT=1 .endif check regression-test test: From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 21:46:53 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 04208106566B for ; Tue, 4 Sep 2012 21:46:53 +0000 (UTC) (envelope-from hm@hm.net.br) Received: from msrv.matik.com.br (msrv.matik.com.br [187.95.0.181]) by mx1.freebsd.org (Postfix) with ESMTP id 3C8028FC08 for ; Tue, 4 Sep 2012 21:46:51 +0000 (UTC) Received: from pop1.hm.net.br (pop1.hm.net.br [189.7.36.92]) (authenticated bits=0) by msrv.matik.com.br (8.14.5/8.14.5) with ESMTP id q84LkeLp073295 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO) for ; Tue, 4 Sep 2012 18:46:40 -0300 (BRT) (envelope-from hm@hm.net.br) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.97.5 at msrv.matik.com.br X-DKIM: OpenDKIM Filter v2.5.2 msrv.matik.com.br q84LkeLp073295 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=hm.net.br; s=racoon; t=1346795200; bh=o0ArQLkp5C/qBYCD/Kv43C+M6AOGW6aymd4EeiaY35M=; h=Date:From:To:Subject; b=PUE4di6e36ag1yXYKA1mAuNLU0E6rtHSkiLfA9N/f3kpH/hBXrbgQOW1MFo02qQLf q9dp8Vyy9NMKAayX95GkZPbNc82gooLXA+pU1jw1AE5PJtVnJb6098k7g9zwrO0z64 V7VQNJL8rAsXpyymkdkabz6gaLsUKKtwlWuXSaT0= Authentication-Results: msrv.matik.com.br; sender-id=pass header.from=hm@hm.net.br; auth=pass (PLAIN); spf=pass smtp.mfrom=hm@hm.net.br Message-ID: <504676AF.3020704@hm.net.br> Date: Tue, 04 Sep 2012 18:46:23 -0300 From: H Organization: HM-Net TI Ltda. User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:15.0) Gecko/20120904 Firefox/15.0 SeaMonkey/2.12 MIME-Version: 1.0 To: gecko@FreeBSD.org X-Enigmail-Version: 1.4.3 OpenPGP: id=9C63083C Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig3A73D7C2AA17B414658E52EB" X-Spam-Status: No, score=-295.8 required=5.0 tests=AWL=0.110,BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,RCVD_IN_BRBL_LASTEXT=1.449,RCVD_IN_PBL=3.335,RCVD_IN_RP_RNBL=1.31,SPF_PASS=-0.001,T_RP_MATCHES_RCVD=-0.01,USER_IN_DKIM_WHITELIST=-100,USER_IN_SPF_WHITELIST=-100,USER_IN_WHITELIST=-100 msrv.matik.com.br 1282; Body=1 Fuz1=1 Fuz2=1 Reported 0 times. [127.0.0.11] [1 mail.matik.com.br.] [127.0.0.6] [187.95.0.182] [127.0.0.2] autolearn=no ASN AS28573 189.7.36.0/22 X-Spam-Checker-Version: SpamAssassin 3.3.2-hm_201202.c (2011-06-06) on msrv.matik.com.br Cc: Subject: problem with seamonkey-2.12 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: Tue, 04 Sep 2012 21:46:53 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig3A73D7C2AA17B414658E52EB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Hi I could compile it with ldap option enable but still, seems to be a problem with large text files, either opened as http in the browser or as txt message in the email component seamonkey freezes, no error in any log, simply freeze up I recompiled now with yesteradys sse3 patch and it got a little bit better, but still it needs 1 minute or more to open a 200k text messages (similar to daily security output), but so far it didn't froze totally, while waiting to open the message or file the application is not operational (as if it were frozen) FreeBSD pop1.hm.net.br 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #3 r238716M: Mon Sep 3 15:21:44 BRT 2012 hmm@pop1.hm.net.br:/usr/obj/dados/src/sys/WIPMINI i386 I tried to reproduce on Fedora16, but it is ok, so problem seems freebsd related Hans --=20 HM +55 11 4249.2222 --------------enig3A73D7C2AA17B414658E52EB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlBGdsAACgkQvKVfg5xjCDx9zgCdEXu3eh3buulBTxAn8QLj0V6R dp0AoIhuG75VAP55pADotu/kRlAdat/6 =D+Ov -----END PGP SIGNATURE----- --------------enig3A73D7C2AA17B414658E52EB-- From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 22:50:29 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 01384106566C for ; Tue, 4 Sep 2012 22:50:29 +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 84E5E8FC0C for ; Tue, 4 Sep 2012 22:50:28 +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 q84MoR2C055016 for ; Tue, 4 Sep 2012 22:50:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q84MoLaQ054840 for freebsd-gecko@freebsd.org; Tue, 4 Sep 2012 22:50:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 4 Sep 2012 22:50:21 GMT Message-Id: <201209042250.q84MoLaQ054840@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] r985 - trunk/security/nss 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: Tue, 04 Sep 2012 22:50:29 -0000 Author: jbeich Date: Tue Sep 4 22:50:21 2012 New Revision: 985 Log: unbreak install WITH_DEBUG Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Tue Sep 4 20:49:25 2012 (r984) +++ trunk/security/nss/Makefile Tue Sep 4 22:50:21 2012 (r985) @@ -41,7 +41,11 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ ${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,} +.if !defined(WITH_DEBUG) BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ +.else +BINS=${DIST}/${OPSYS}${OSREL}_DBG.OBJ +.endif INSTALL_BINS= certcgi certutil checkcert cmsutil crlutil derdump makepqg \ mangle modutil ocspclnt oidcalc p7content p7env p7sign \ @@ -91,15 +95,15 @@ ${MKDIR} ${PREFIX}/include/nss/nss ${PREFIX}/lib/nss ${FIND} ${DIST}/public/nss -type l \ -exec ${INSTALL_DATA} {} ${PREFIX}/include/nss/nss \; - ${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/*.so.1 \ + ${INSTALL_DATA} ${BINS}/lib/*.so.1 \ ${PREFIX}/lib/nss - ${INSTALL_DATA} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib/libcrmf.a \ + ${INSTALL_DATA} ${BINS}/lib/libcrmf.a \ ${PREFIX}/lib/nss .for bin in ${INSTALL_BINS} - ${INSTALL_PROGRAM} ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/bin/${bin} \ + ${INSTALL_PROGRAM} ${BINS}/bin/${bin} \ ${PREFIX}/bin .endfor - cd ${DIST}/FreeBSD${OSREL:C/.$/*/}_OPT.OBJ/lib && \ + cd ${BINS}/lib && \ ${TAR} -cf - *.so | ${TAR} --unlink -C ${PREFIX}/lib/nss -xf - ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/nss.pc ${PREFIX}/libdata/pkgconfig From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 22:50:35 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 BE638106564A for ; Tue, 4 Sep 2012 22:50:35 +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 45DD98FC0A for ; Tue, 4 Sep 2012 22:50:35 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q84MoYL7056513 for ; Tue, 4 Sep 2012 22:50:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q84MoTGl056161 for freebsd-gecko@freebsd.org; Tue, 4 Sep 2012 22:50:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 4 Sep 2012 22:50:29 GMT Message-Id: <201209042250.q84MoTGl056161@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] r986 - trunk/devel/nspr 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: Tue, 04 Sep 2012 22:50:35 -0000 Author: jbeich Date: Tue Sep 4 22:50:29 2012 New Revision: 986 Log: use absolute paths to make gdb(1) happy Modified: trunk/devel/nspr/Makefile Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Tue Sep 4 22:50:21 2012 (r985) +++ trunk/devel/nspr/Makefile Tue Sep 4 22:50:29 2012 (r986) @@ -21,7 +21,8 @@ MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure -CONFIGURE_ARGS= --with-pthreads +CONFIGURE_ARGS= --srcdir=${WRKSRC:H} \ + --with-pthreads CONFIGURE_ENV= BSD_PTHREAD_LIBS=${PTHREAD_LIBS} MAKE_ENV= DIST=${WRKSRC}/dist From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 4 23:19:30 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 886C7106566B for ; Tue, 4 Sep 2012 23:19:30 +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 130408FC08 for ; Tue, 4 Sep 2012 23:19:29 +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 q84NJSXV057436 for ; Tue, 4 Sep 2012 23:19:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q84NJNXe057171 for freebsd-gecko@freebsd.org; Tue, 4 Sep 2012 23:19:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 4 Sep 2012 23:19:23 GMT Message-Id: <201209042319.q84NJNXe057171@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] r987 - trunk/security/nss 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: Tue, 04 Sep 2012 23:19:30 -0000 Author: jbeich Date: Tue Sep 4 23:19:23 2012 New Revision: 987 Log: format to make WITH_DEBUG easier to read Modified: trunk/security/nss/Makefile Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Tue Sep 4 22:50:29 2012 (r986) +++ trunk/security/nss/Makefile Tue Sep 4 23:19:23 2012 (r987) @@ -41,12 +41,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ ${EXTERNALS:C,^,--exclude ${PORTNAME}-${PORTVERSION}/mozilla/,} -.if !defined(WITH_DEBUG) -BINS=${DIST}/${OPSYS}${OSREL}_OPT.OBJ -.else -BINS=${DIST}/${OPSYS}${OSREL}_DBG.OBJ -.endif - INSTALL_BINS= certcgi certutil checkcert cmsutil crlutil derdump makepqg \ mangle modutil ocspclnt oidcalc p7content p7env p7sign \ p7verify pk12util rsaperf shlibsign signtool signver \ @@ -54,6 +48,9 @@ .if !defined(WITH_DEBUG) MAKE_ENV+= BUILD_OPT=1 +BINS= ${DIST}/${OPSYS}${OSREL}_OPT.OBJ +.else +BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ .endif check regression-test test: From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 5 11:47:22 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 6E094106566B for ; Wed, 5 Sep 2012 11:47:22 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirj.bris.ac.uk (dirj.bris.ac.uk [137.222.10.78]) by mx1.freebsd.org (Postfix) with ESMTP id 28BA28FC14 for ; Wed, 5 Sep 2012 11:47:22 +0000 (UTC) Received: from smtp-auth2.bris.ac.uk ([137.222.10.94] helo=ncs.bris.ac.uk) by dirj.bris.ac.uk with esmtp (Exim 4.72) (envelope-from ) id 1T9E4G-0003To-CV; Wed, 05 Sep 2012 12:47:21 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncs.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1T9E4F-0004Uo-RV; Wed, 05 Sep 2012 12:46:47 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5) with ESMTP id q85BklUp088027; Wed, 5 Sep 2012 12:46:47 +0100 (BST) (envelope-from mexas@mech-cluster241.men.bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5/Submit) id q85Bkl4U088026; Wed, 5 Sep 2012 12:46:47 +0100 (BST) (envelope-from mexas) Date: Wed, 5 Sep 2012 12:46:47 +0100 (BST) From: Anton Shterenlikht Message-Id: <201209051146.q85Bkl4U088026@mech-cluster241.men.bris.ac.uk> To: jbeich@tormail.org, mexas@bristol.ac.uk In-Reply-To: <1T92Wo-000PkH-RN@internal.tormail.org> X-Spam-Score: -3.5 X-Spam-Level: --- Cc: freebsd-gecko@freebsd.org Subject: Re: ia64 www/firefox - segfault on startup X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: mexas@bristol.ac.uk List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 11:47:22 -0000 From jbeich@tormail.org Wed Sep 5 02:23:08 2012 >> $ cd /usr/src/lib/libthr; make all install DEBUG_FLAGS='-g' Or use DEBUG_FLAGS='-g -O0' to avoid some variables being optimized away. done > Ok, about devel/nspr - it fails tests. [...] > libfilename FAILED > libfilename: PR_GetLibraryFilePathname failed > libfilename: FAIL > > peek FAILED > peek: Running the test with local threads > peek: PR_Connect failed Did they fail without the patch? Just to confirm, I'm using freebsd-gecko/devel/nspr, right? I'm now on r987. The patch applies correctly, i.e. after "make patch" I get in work/nspr-4.9.2/mozilla/nsprpub/pr/src/pthreads/ptthread.c: 27 28 #if defined(SYMBIAN) || (defined(FREEBSD) && defined(__ia64)) 29 /* In Open C sched_get_priority_min/max do not work properly, so we undefine 30 * _POSIX_THREAD_PRIORITY_SCHEDULING here. 31 */ 32 #undef _POSIX_THREAD_PRIORITY_SCHEDULING 33 #endif 34 > I build WITH_DEBUG=, the log is: > > http://seis.bris.ac.uk/~mexas/nspr-build.log > > By the way, can I check just from the build log > that I indeed used WITH_DEBUG= ? Is it the > "-UDEBUG -DNDEBUG=1" tokens? Oops, it should be something like -DDEBUG -g. Try again after update. I now get something like this: http://seis.bris.ac.uk/~mexas/nspr-build.log cc -o plgetopt.o -c -fvisibility=hidden -pipe -g -ansi -Wall -g -fPIC -UNDEBUG -DDEBUG_root -DDEBUG=1 -DHAVE_VISIBILITY_HIDDEN_ATTRIBUTE=1 -DHAVE_VISIBILITY_PRAGMA=1 -DXP_UNIX=1 -DFREEBSD=1 -DHAVE_BSD_FLOCK=1 -DHAVE_SOCKLEN_T=1 -DHAVE_LCHOWN=1 -DHAVE_STRERROR=1 -DHAVE_DLADDR=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DFORCE_PR_LOG -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM -I../../../dist/include/nspr /usr/ports/freebsd-gecko/devel/nspr/work/nspr-4.9.2/mozilla/nsprpub/lib/libc/src/plgetopt.c Does this look correct? Three tests fail now: http://seis.bris.ac.uk/~mexas/nspr-test.log libfilename FAILED libfilename: PR_GetLibraryFilePathname failed libfilename: FAIL nbconn FAILED nbconn: Assertion failure: (rv == 1) && (pd.out_flags == PR_POLL_READ), at /usr/ports/freebsd-gecko/devel/nspr/work/nspr-4.9.2/mozilla/nsprpub/pr/tests/nbconn.c:368 peek FAILED peek: Running the test with local threads peek: PR_Connect failed and socket test hangs again, with no clear reason. >From top(1): 89361 root 2 20 0 107M 40608K select 1 0:01 0.00% socket >From ps(1): 72392 - I 0:21.46 |-- xterm 72394 3 Is 0:00.09 | `-- tcsh 72397 3 I 0:00.04 | `-- /usr/bin/su - 72398 3 I 0:00.66 | `-- -su (sh) 85484 3 S+ 0:00.07 | `-- script nspr-test.log make test 85485 5 Is+ 0:00.20 | `-- make test 87091 5 I+ 0:00.24 | `-- /bin/sh ../../../pr/tests/runtests.sh 87220 5 S+ 0:00.31 | `-- ./socket How can I debug this further? > I reinstalled devel/nspr anyway, and will now > try to rebuild freebsd-gecko/www/firefox. > I'll report back. It's not needed. WITH_DEBUG affects neither nspr cflags nor headers while firefox links dynamically with system nspr. ok, so I run firefox again, it segfaulted again. Here's the gdb bt: http://eis.bris.ac.uk/~mexas/ff-gdb All I get is: #0 0x00000001204bc3e0 in _umtx_op_err () at /usr/src/lib/libthr/arch/ia64/ia64/_umtx_op_err.S:33 which is 28 __FBSDID("$FreeBSD: head/lib/libthr/arch/ia64/ia64/_umtx_op_err.S 198450 2009-10-24 20 :07:17Z marcel $"); 29 30 #include 31 32 ENTRY(_umtx_op_err, 5) 33 CALLSYS_NOERROR(_umtx_op) 34 br.ret.sptk.few rp 35 END(_umtx_op_err) Shall I ask marcel@ about this one? Finally, I saw you made some changes to freebsd-gecko/security/nss. Shall I build this port too, instead of the standard ports/security/nss? Or is this not relevant? Thanks Anton From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 5 12:10:15 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 491561065679; Wed, 5 Sep 2012 12:10:15 +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 1F2168FC1A; Wed, 5 Sep 2012 12:10:15 +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 q85CAEmH067649; Wed, 5 Sep 2012 12:10:14 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q85CAEOL067631; Wed, 5 Sep 2012 12:10:14 GMT (envelope-from edwin) Date: Wed, 5 Sep 2012 12:10:14 GMT Message-Id: <201209051210.q85CAEOL067631@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang 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, 05 Sep 2012 12:10:15 -0000 Synopsis: [patch] build www/firefox and mail/thunderbird with clang Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Wed Sep 5 12:10:14 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=171343 From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 5 14:00:15 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 F0D2C1065670 for ; Wed, 5 Sep 2012 14:00:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B683A8FC18 for ; Wed, 5 Sep 2012 14:00:15 +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 q85E0FbD064103 for ; Wed, 5 Sep 2012 14:00:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q85E0Fu2064086; Wed, 5 Sep 2012 14:00:15 GMT (envelope-from gnats) Date: Wed, 5 Sep 2012 14:00:15 GMT Message-Id: <201209051400.q85E0Fu2064086@freefall.freebsd.org> To: gecko@FreeBSD.org From: Yamaya Takashi Cc: Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Yamaya Takashi List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2012 14:00:16 -0000 The following reply was made to PR ports/171343; it has been noted by GNATS. From: Yamaya Takashi To: bug-followup@FreeBSD.org, yamayan@kbh.biglobe.ne.jp Cc: Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang Date: Wed, 05 Sep 2012 22:59:46 +0900 This is a multi-part message in MIME format. --------------070402050303020703010402 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit I overwrite mail/thunderbird/files/patch-configure.in. replace this part of gecko.patch.txt to attached gecko2.patch.txt. --------------070402050303020703010402 Content-Type: text/plain; charset=UTF-8; name="gecko2.patch.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="gecko2.patch.txt" SW5kZXg6IG1haWwvdGh1bmRlcmJpcmQvZmlsZXMvcGF0Y2gtY29uZmlndXJlLmluCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIG1haWwvdGh1bmRlcmJpcmQvZmlsZXMvcGF0Y2gtY29uZmlndXJlLmlu CShyZXZpc2lvbiAzMDM3MDApCisrKyBtYWlsL3RodW5kZXJiaXJkL2ZpbGVzL3BhdGNoLWNv bmZpZ3VyZS5pbgkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDY1IEBACi0tLS0gY29uZmln dXJlLmluLm9yaWcJMjAxMi0wNy0xNCAwMDo0MDowOC4wMDAwMDAwMDAgKzAyMDAKLSsrKyBj b25maWd1cmUuaW4JMjAxMi0wOC0xOCAxODoxNjowNi4wMDAwMDAwMDAgKzAyMDAKLUBAIC0z MTAxLDYgKzMxMTgsOCBAQAorLS0tIGNvbmZpZ3VyZS5pbi5vcmlnCTIwMTItMDgtMjUgMDk6 MjQ6MzIuMDAwMDAwMDAwICswOTAwCisrKysgY29uZmlndXJlLmluCTIwMTItMDktMDUgMjI6 NDU6NDguMTkyMTAwNDIyICswOTAwCitAQCAtMjk4NSw1OCArMjk4NSw3IEBACisgICAgICAg ICAgICAgICAgICAgICAgIHJtIC1mIGNvbmZ0ZXN0Lltjc10KKyAgICAgICAgICAgICAgICAg ICAgIF0pCisgICAgICAgaWYgdGVzdCAiJGFjX2N2X3Zpc2liaWxpdHlfcHJhZ21hIiA9ICJ5 ZXMiOyB0aGVuCistICAgICAgICBBQ19DQUNIRV9DSEVDSyhGb3IgZ2NjIHZpc2liaWxpdHkg YnVnIHdpdGggY2xhc3MtbGV2ZWwgYXR0cmlidXRlcyAoR0NDIGJ1ZyAyNjkwNSksCistICAg ICAgICAgICAgICAgICAgICAgICBhY19jdl9oYXZlX3Zpc2liaWxpdHlfY2xhc3NfYnVnLAor LSAgICAgICAgICAgICAgICAgICAgICAgW2NhdCA+IGNvbmZ0ZXN0LmMgPDxFT0YKKy0jcHJh Z21hIEdDQyB2aXNpYmlsaXR5IHB1c2goaGlkZGVuKQorLXN0cnVjdCBfX2F0dHJpYnV0ZV9f ICgodmlzaWJpbGl0eSAoImRlZmF1bHQiKSkpIFRlc3RTdHJ1Y3QgeworLSAgc3RhdGljIHZv aWQgSW5pdCgpOworLX07CistX19hdHRyaWJ1dGVfXyAoKHZpc2liaWxpdHkgKCJkZWZhdWx0 IikpKSB2b2lkIFRlc3RGdW5jKCkgeworLSAgVGVzdFN0cnVjdDo6SW5pdCgpOworLX0KKy1F T0YKKy0gICAgICAgICAgICAgICAgICAgICAgIGFjX2N2X2hhdmVfdmlzaWJpbGl0eV9jbGFz c19idWc9bm8KKy0gICAgICAgICAgICAgICAgICAgICAgIGlmICEgJHtDWFgtZysrfSAke0NY WEZMQUdTfSAke0RTT19QSUNfQ0ZMQUdTfSAke0RTT19MRE9QVFN9IC1TIC1vIGNvbmZ0ZXN0 LlMgY29uZnRlc3QuYyA+IC9kZXYvbnVsbCAyPiYxIDsgdGhlbgorLSAgICAgICAgICAgICAg ICAgICAgICAgICBhY19jdl9oYXZlX3Zpc2liaWxpdHlfY2xhc3NfYnVnPXllcworLSAgICAg ICAgICAgICAgICAgICAgICAgZWxzZQorLSAgICAgICAgICAgICAgICAgICAgICAgICBpZiB0 ZXN0IGBlZ3JlcCAtYyAnQFBMVHxcXCRzdHViJyBjb25mdGVzdC5TYCA9IDA7IHRoZW4KKy0g ICAgICAgICAgICAgICAgICAgICAgICAgICBhY19jdl9oYXZlX3Zpc2liaWxpdHlfY2xhc3Nf YnVnPXllcworLSAgICAgICAgICAgICAgICAgICAgICAgICBmaQorLSAgICAgICAgICAgICAg ICAgICAgICAgZmkKKy0gICAgICAgICAgICAgICAgICAgICAgIHJtIC1yZiBjb25mdGVzdC57 YyxTfQorLSAgICAgICAgICAgICAgICAgICAgICAgXSkKKy0KKy0gICAgICAgIEFDX0NBQ0hF X0NIRUNLKEZvciB4ODZfNjQgZ2NjIHZpc2liaWxpdHkgYnVnIHdpdGggYnVpbHRpbnMgKEdD QyBidWcgMjAyOTcpLAorLSAgICAgICAgICAgICAgICAgICAgICAgYWNfY3ZfaGF2ZV92aXNp YmlsaXR5X2J1aWx0aW5fYnVnLAorLSAgICAgICAgICAgICAgICAgICAgICAgW2NhdCA+IGNv bmZ0ZXN0LmMgPDxFT0YKKy0jcHJhZ21hIEdDQyB2aXNpYmlsaXR5IHB1c2goaGlkZGVuKQor LSNwcmFnbWEgR0NDIHZpc2liaWxpdHkgcHVzaChkZWZhdWx0KQorLSNpbmNsdWRlIDxzdHJp bmcuaD4KKy0jcHJhZ21hIEdDQyB2aXNpYmlsaXR5IHBvcAorLQorLV9fYXR0cmlidXRlX18g KCh2aXNpYmlsaXR5ICgiZGVmYXVsdCIpKSkgdm9pZCBGdW5jKCkgeworLSAgY2hhciBjW1sx MDBdXTsKKy0gIG1lbXNldChjLCAwLCBzaXplb2YoYykpOworLX0KKy1FT0YKKy0gICAgICAg ICAgICAgICAgICAgICAgIGFjX2N2X2hhdmVfdmlzaWJpbGl0eV9idWlsdGluX2J1Zz1ubwor LSAgICAgICAgICAgICAgICAgICAgICAgaWYgISAke0NDLWNjfSAke0NGTEFHU30gJHtEU09f UElDX0NGTEFHU30gJHtEU09fTERPUFRTfSAtTzIgLVMgLW8gY29uZnRlc3QuUyBjb25mdGVz dC5jID4gL2Rldi9udWxsIDI+JjEgOyB0aGVuCistICAgICAgICAgICAgICAgICAgICAgICAg IGFjX2N2X2hhdmVfdmlzaWJpbGl0eV9idWlsdGluX2J1Zz15ZXMKKy0gICAgICAgICAgICAg ICAgICAgICAgIGVsc2UKKy0gICAgICAgICAgICAgICAgICAgICAgICAgaWYgdGVzdCBgZ3Jl cCAtYyAiQFBMVCIgY29uZnRlc3QuU2AgPSAwOyB0aGVuCistICAgICAgICAgICAgICAgICAg ICAgICAgICAgYWNfY3ZfdmlzaWJpbGl0eV9idWlsdGluX2J1Zz15ZXMKKy0gICAgICAgICAg ICAgICAgICAgICAgICAgZmkKKy0gICAgICAgICAgICAgICAgICAgICAgIGZpCistICAgICAg ICAgICAgICAgICAgICAgICBybSAtZiBjb25mdGVzdC57YyxTfQorLSAgICAgICAgICAgICAg ICAgICAgICAgXSkKKy0gICAgICAgIGlmIHRlc3QgIiRhY19jdl9oYXZlX3Zpc2liaWxpdHlf YnVpbHRpbl9idWciID0gIm5vIiAtYSBcCistICAgICAgICAgICAgICAgICIkYWNfY3ZfaGF2 ZV92aXNpYmlsaXR5X2NsYXNzX2J1ZyIgPSAibm8iOyB0aGVuCistICAgICAgICAgIFZJU0lC SUxJVFlfRkxBR1M9Jy1JJChESVNUKS9zeXN0ZW1fd3JhcHBlcnMgLWluY2x1ZGUgJChNT1pJ TExBX1NSQ0RJUikvY29uZmlnL2djY19oaWRkZW4uaCcKKy0gICAgICAgICAgU1RMX0ZMQUdT PSctSSQoRElTVCkvc3RsX3dyYXBwZXJzJworLSAgICAgICAgZWxzZQorICAgICAgICAgICBW SVNJQklMSVRZX0ZMQUdTPSctZnZpc2liaWxpdHk9aGlkZGVuJworLSAgICAgICAgZmkgIyBo YXZlIHZpc2liaWxpdHkgcHJhZ21hIGJ1ZworICAgICAgIGZpICAgIyBoYXZlIHZpc2liaWxp dHkgcHJhZ21hCisgICAgIGZpICAgICAjIGhhdmUgdmlzaWJpbGl0eShkZWZhdWx0KSBhdHRy aWJ1dGUKKyAgIGZpICAgICAgICMgaGF2ZSB2aXNpYmlsaXR5KGhpZGRlbikgYXR0cmlidXRl CitAQCAtMzA0OSw2ICsyOTk4LDggQEAKICAKICBBQ19TVUJTVChWSVNJQklMSVRZX0ZMQUdT KQogIApAQCAtOSw3ICs2OCw3IEBACiAgZG5sIENoZWNrcyBmb3IgaGVhZGVyIGZpbGVzLgog IGRubCA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQogIEFDX0hFQURFUl9ESVJFTlQKLUBAIC00MDY3LDI5ICs0MDg2LDI5IEBACitA QCAtNDAxNSwyOSArMzk2NiwyOSBAQAogIAogIEFDX0NBQ0hFX0NIRUNLKGZvciBfX2F0dHJp YnV0ZV9fKChhbHdheXNfaW5saW5lKSksCiAgICAgICAgICAgICAgICAgYWNfY3ZfYXR0cmli dXRlX2Fsd2F5c19pbmxpbmUsCg== --------------070402050303020703010402-- From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 5 14:45: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 5AA6A106564A for ; Wed, 5 Sep 2012 14:45: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 DD4088FC08 for ; Wed, 5 Sep 2012 14:45: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 q85EjoCc060862 for ; Wed, 5 Sep 2012 14:45:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q85Ejj4c060398 for freebsd-gecko@freebsd.org; Wed, 5 Sep 2012 14:45:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 5 Sep 2012 14:45:45 GMT Message-Id: <201209051445.q85Ejj4c060398@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] r988 - trunk/www/firefox 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: Wed, 05 Sep 2012 14:45:53 -0000 Author: jbeich Date: Wed Sep 5 14:45:45 2012 New Revision: 988 Log: remove dup Modified: trunk/www/firefox/Makefile Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Tue Sep 4 23:19:23 2012 (r987) +++ trunk/www/firefox/Makefile Wed Sep 5 14:45:45 2012 (r988) @@ -68,7 +68,6 @@ .if ${PORT_OPTIONS:MPGO} BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 -USE_PYTHON_BUILD= yes USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 5 14:45:59 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 BA938106566C for ; Wed, 5 Sep 2012 14:45:59 +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 413668FC0C for ; Wed, 5 Sep 2012 14:45:59 +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 q85EjwbR064212 for ; Wed, 5 Sep 2012 14:45:58 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q85EjrX6063785 for freebsd-gecko@freebsd.org; Wed, 5 Sep 2012 14:45:53 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 5 Sep 2012 14:45:53 GMT Message-Id: <201209051445.q85EjrX6063785@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] r989 - in trunk/devel/nspr: . 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: Wed, 05 Sep 2012 14:45:59 -0000 Author: jbeich Date: Wed Sep 5 14:45:53 2012 New Revision: 989 Log: use _linux.cfg, it has support for more archs Existing constants for i386, amd64, powerpc, powerpc64, sparc64 are identical. With this change we get support for arm, mips, hppa, s390, s390x, sh, avr32, m32r, mc68000, sparc. Added: trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg Modified: trunk/devel/nspr/Makefile Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Wed Sep 5 14:45:45 2012 (r988) +++ trunk/devel/nspr/Makefile Wed Sep 5 14:45:53 2012 (r989) @@ -36,7 +36,10 @@ .endif post-patch: - @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e '/MDCPUCFG_H/s/freebsd/linux/' \ + -e 's,-lpthread,${PTHREAD_LIBS},g' \ + -e 's,echo aout,echo elf,g' \ + ${WRKSRC}/${CONFIGURE_SCRIPT} do-install: ${MKDIR} ${PREFIX}/include/nspr Added: trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg Wed Sep 5 14:45:53 2012 (r989) @@ -0,0 +1,15 @@ +--- ../pr/include/md/_linux.cfg ++++ ../pr/include/md/_linux.cfg +@@ -17,9 +17,11 @@ + + #if !defined(LINUX) && defined(__linux__) + #define LINUX ++#elif !defined(FREEBSD) && defined(__FreeBSD__) ++#define FREEBSD + #endif + +-#ifdef __FreeBSD_kernel__ ++#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__) + #define PR_AF_INET6 28 /* same as AF_INET6 */ + #elif defined(__GNU__) + #define PR_AF_INET6 26 /* same as AF_INET6 */ From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 5 14:46:06 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 83B6010656EA for ; Wed, 5 Sep 2012 14:46:06 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 0D0DB8FC15 for ; Wed, 5 Sep 2012 14:46:05 +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 q85Ek5SS066007 for ; Wed, 5 Sep 2012 14:46:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q85Ek0kq065208 for freebsd-gecko@freebsd.org; Wed, 5 Sep 2012 14:46:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 5 Sep 2012 14:46:00 GMT Message-Id: <201209051446.q85Ek0kq065208@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] r990 - trunk 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: Wed, 05 Sep 2012 14:46:06 -0000 Author: jbeich Date: Wed Sep 5 14:45:59 2012 New Revision: 990 Log: describe what's on my plate Added: trunk/Gecko_TODO Modified: trunk/Gecko_ChangeLog Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Wed Sep 5 14:45:53 2012 (r989) +++ trunk/Gecko_ChangeLog Wed Sep 5 14:45:59 2012 (r990) @@ -0,0 +1,2 @@ +16.0: +- improve debugging with nspr/nss Added: trunk/Gecko_TODO ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/Gecko_TODO Wed Sep 5 14:45:59 2012 (r990) @@ -0,0 +1,24 @@ +unassigned: +- implement either OSS or GStreamer backend for libcubeb +- port startup measurement (see bug 633193 and process_util_bsd.cc) +- port WebRTC +- port Gecko Profiler +- port Crash Reporter +- switch to system libxul (needs slaves with common patches); + a Debian patch to reduce configure time can be useful +- integrate enigmail into thunderbird/seamonkey +- move duplicated `>=' deps into bsd.gecko.mk (system libxul?) +- push @plt/.hidden patch for JS upstream (needs a test case) +- push system db(3) patch upstream +- replace FAKEDIR with STAGEDIR +- document GStreamer plugins needed for HTML5 Video (in pkg-message) +- document performance issues with non-ESR + (layers.acceleration.force-enabled -> true ?) + +jbeich: +- push jemalloc patch upstream, e.g. check mallctl via autoconf +- push ALSA patch upstream +- push --ignore-unresolved-symbol upstream (needs tests/approval from author) +- remove duplicate patches by using common PATCHDIR +- add Gtk3 support (waiting for upstream) +- move PGO to bsd.gecko.mk (blocked by USE_PYTHON_BUILD in *-esr) From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 5 16:16:28 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 8EE7D106564A for ; Wed, 5 Sep 2012 16:16:28 +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 2F4008FC14 for ; Wed, 5 Sep 2012 16:16:27 +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 q85GGRvY067644 for ; Wed, 5 Sep 2012 16:16:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q85GGLwT066783 for freebsd-gecko@freebsd.org; Wed, 5 Sep 2012 16:16:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 5 Sep 2012 16:16:21 GMT Message-Id: <201209051616.q85GGLwT066783@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] r991 - in trunk: 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: Wed, 05 Sep 2012 16:16:28 -0000 Author: jbeich Date: Wed Sep 5 16:16:21 2012 New Revision: 991 Log: add visibility hack for clang32 with libc++ http://llvm.org/bugs/show_bug.cgi?id=13688 Added: trunk/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack trunk/mail/thunderbird/files/patch-clang32-libc++-visibility-hack trunk/www/firefox-esr/files/patch-clang32-libc++-visibility-hack trunk/www/firefox-nightly/files/patch-clang32-libc++-visibility-hack trunk/www/firefox/files/patch-clang32-libc++-visibility-hack trunk/www/libxul/files/patch-clang32-libc++-visibility-hack trunk/www/seamonkey/files/patch-clang32-libc++-visibility-hack Added: trunk/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack Wed Sep 5 16:16:21 2012 (r991) @@ -0,0 +1,57 @@ +--- configure.in~ ++++ configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then +--- mozilla/js/src/configure.in~ ++++ mozilla/js/src/configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then Added: trunk/mail/thunderbird/files/patch-clang32-libc++-visibility-hack ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-clang32-libc++-visibility-hack Wed Sep 5 16:16:21 2012 (r991) @@ -0,0 +1,57 @@ +--- configure.in~ ++++ configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then +--- mozilla/js/src/configure.in~ ++++ mozilla/js/src/configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then Added: trunk/www/firefox-esr/files/patch-clang32-libc++-visibility-hack ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-clang32-libc++-visibility-hack Wed Sep 5 16:16:21 2012 (r991) @@ -0,0 +1,38 @@ +--- configure.in~ ++++ configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then +--- js/src/configure.in~ ++++ js/src/configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then Added: trunk/www/firefox-nightly/files/patch-clang32-libc++-visibility-hack ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-clang32-libc++-visibility-hack Wed Sep 5 16:16:21 2012 (r991) @@ -0,0 +1,38 @@ +--- configure.in~ ++++ configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then +--- js/src/configure.in~ ++++ js/src/configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then Added: trunk/www/firefox/files/patch-clang32-libc++-visibility-hack ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-clang32-libc++-visibility-hack Wed Sep 5 16:16:21 2012 (r991) @@ -0,0 +1,38 @@ +--- configure.in~ ++++ configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then +--- js/src/configure.in~ ++++ js/src/configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then Added: trunk/www/libxul/files/patch-clang32-libc++-visibility-hack ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-clang32-libc++-visibility-hack Wed Sep 5 16:16:21 2012 (r991) @@ -0,0 +1,38 @@ +--- configure.in~ ++++ configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then +--- js/src/configure.in~ ++++ js/src/configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then Added: trunk/www/seamonkey/files/patch-clang32-libc++-visibility-hack ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-clang32-libc++-visibility-hack Wed Sep 5 16:16:21 2012 (r991) @@ -0,0 +1,57 @@ +--- configure.in~ ++++ configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then +--- mozilla/js/src/configure.in~ ++++ mozilla/js/src/configure.in +@@ -2855,6 +2855,7 @@ EOF + #pragma GCC visibility push(hidden) + #pragma GCC visibility push(default) + #include ++#include + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { +@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() { + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ++ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes + else + if test `grep -c "@PLT" conftest.S` = 0; then From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 5 16:16:35 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 A82311065670 for ; Wed, 5 Sep 2012 16:16:35 +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 364C18FC16 for ; Wed, 5 Sep 2012 16:16:35 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q85GGYL3069244 for ; Wed, 5 Sep 2012 16:16:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q85GGT5k068797 for freebsd-gecko@freebsd.org; Wed, 5 Sep 2012 16:16:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 5 Sep 2012 16:16:29 GMT Message-Id: <201209051616.q85GGT5k068797@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] r992 - trunk/www/firefox-nightly 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: Wed, 05 Sep 2012 16:16:35 -0000 Author: jbeich Date: Wed Sep 5 16:16:29 2012 New Revision: 992 Log: update Nightly Modified: trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Wed Sep 5 16:16:21 2012 (r991) +++ trunk/www/firefox-nightly/Makefile.hgrev Wed Sep 5 16:16:29 2012 (r992) @@ -1 +1 @@ -HGREV= 104133:059f341beaad +HGREV= 104183:7c75cd38626a Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Wed Sep 5 16:16:21 2012 (r991) +++ trunk/www/firefox-nightly/distinfo Wed Sep 5 16:16:29 2012 (r992) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/059f341beaad.tar.bz2) = a0233e7693a00de0e69a55dc087afd9f78fdd78b7a0ae222674cc52337599ed2 -SIZE (firefox-nightly/059f341beaad.tar.bz2) = 88494697 +SHA256 (firefox-nightly/7c75cd38626a.tar.bz2) = 1285ebbeaba294da12c47fc9323db488eb8c193e5be1bd475c3ad492d3acd385 +SIZE (firefox-nightly/7c75cd38626a.tar.bz2) = 88492019 From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 6 06:17:10 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 AE0CF1065687 for ; Thu, 6 Sep 2012 06:17:10 +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 3B4C08FC1B for ; Thu, 6 Sep 2012 06:17:09 +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 q866H2lV012460 for ; Thu, 6 Sep 2012 06:17:02 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q866Gvjg011758 for freebsd-gecko@freebsd.org; Thu, 6 Sep 2012 06:16:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 6 Sep 2012 06:16:57 GMT Message-Id: <201209060616.q866Gvjg011758@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] r993 - in trunk/devel/nspr: . 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, 06 Sep 2012 06:17:10 -0000 Author: jbeich Date: Thu Sep 6 06:16:57 2012 New Revision: 993 Log: backout r989, too hackish and untested on tier3 archs Let upstream deal with lots of (nearly-)identical *.cfg. Deleted: trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg Modified: trunk/devel/nspr/Makefile Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Wed Sep 5 16:16:29 2012 (r992) +++ trunk/devel/nspr/Makefile Thu Sep 6 06:16:57 2012 (r993) @@ -36,10 +36,7 @@ .endif post-patch: - @${REINPLACE_CMD} -e '/MDCPUCFG_H/s/freebsd/linux/' \ - -e 's,-lpthread,${PTHREAD_LIBS},g' \ - -e 's,echo aout,echo elf,g' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} do-install: ${MKDIR} ${PREFIX}/include/nspr Deleted: trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg ============================================================================== --- trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg Thu Sep 6 06:16:57 2012 (r992) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- ../pr/include/md/_linux.cfg -+++ ../pr/include/md/_linux.cfg -@@ -17,9 +17,11 @@ - - #if !defined(LINUX) && defined(__linux__) - #define LINUX -+#elif !defined(FREEBSD) && defined(__FreeBSD__) -+#define FREEBSD - #endif - --#ifdef __FreeBSD_kernel__ -+#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__) - #define PR_AF_INET6 28 /* same as AF_INET6 */ - #elif defined(__GNU__) - #define PR_AF_INET6 26 /* same as AF_INET6 */ From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 6 09:20:07 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 70C5D106564A for ; Thu, 6 Sep 2012 09:20:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3A3658FC15 for ; Thu, 6 Sep 2012 09:20:07 +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 q869K6rD040574 for ; Thu, 6 Sep 2012 09:20:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q869K6Z1040561; Thu, 6 Sep 2012 09:20:06 GMT (envelope-from gnats) Date: Thu, 6 Sep 2012 09:20:06 GMT Message-Id: <201209060920.q869K6Z1040561@freefall.freebsd.org> To: gecko@FreeBSD.org From: Niclas Zeising Cc: Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Niclas Zeising List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Sep 2012 09:20:07 -0000 The following reply was made to PR ports/171343; it has been noted by GNATS. From: Niclas Zeising To: bug-followup@FreeBSD.org, yamayan@kbh.biglobe.ne.jp Cc: Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang Date: Thu, 06 Sep 2012 11:10:59 +0200 The patches do not apply. Please regenerate them against the freebsd-gecko repository. Regards! -- Niclas From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 6 21:47:48 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 62BA4106566C for ; Thu, 6 Sep 2012 21:47:48 +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 C12358FC16 for ; Thu, 6 Sep 2012 21:47:47 +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 q86Llkbb022820 for ; Thu, 6 Sep 2012 21:47:46 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q86LlfRR021728 for freebsd-gecko@freebsd.org; Thu, 6 Sep 2012 21:47:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 6 Sep 2012 21:47:41 GMT Message-Id: <201209062147.q86LlfRR021728@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] r994 - in trunk: mail/thunderbird/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: Thu, 06 Sep 2012 21:47:48 -0000 Author: zeising Date: Thu Sep 6 21:47:40 2012 New Revision: 994 Log: Fix build using clang 3.2 (on FreeBSD 10-CURRENT). Based on the https://hg.mozilla.org/mozilla-central/rev/a430390ef8cd from mozilla hg repository. This is a candiate to merge into regular ports tree. Added: trunk/mail/thunderbird/files/patch-mozilla-js-src-jsprvtd.h trunk/www/firefox/files/patch-js-src-jsprvtd.h trunk/www/seamonkey/files/patch-mozilla-js-src-jsprvtd.h Added: trunk/mail/thunderbird/files/patch-mozilla-js-src-jsprvtd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-mozilla-js-src-jsprvtd.h Thu Sep 6 21:47:40 2012 (r994) @@ -0,0 +1,15 @@ +--- mozilla/js/src/jsprvtd.h.orig 2012-08-25 02:31:13.000000000 +0200 ++++ mozilla/js/src/jsprvtd.h 2012-09-06 17:14:09.000000000 +0200 +@@ -149,9 +149,9 @@ + class UpvarCookie; + + class Proxy; +-class BaseProxyHandler; +-class DirectWrapper; +-class CrossCompartmentWrapper; ++class JS_FRIEND_API(BaseProxyHandler); ++class JS_FRIEND_API(DirectWrapper); ++class JS_FRIEND_API(CrossCompartmentWrapper); + + class TempAllocPolicy; + class RuntimeAllocPolicy; Added: trunk/www/firefox/files/patch-js-src-jsprvtd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-js-src-jsprvtd.h Thu Sep 6 21:47:40 2012 (r994) @@ -0,0 +1,15 @@ +--- js/src/jsprvtd.h.orig 2012-08-25 00:55:40.000000000 +0200 ++++ js/src/jsprvtd.h 2012-09-06 15:20:48.000000000 +0200 +@@ -149,9 +149,9 @@ + class UpvarCookie; + + class Proxy; +-class BaseProxyHandler; +-class DirectWrapper; +-class CrossCompartmentWrapper; ++class JS_FRIEND_API(BaseProxyHandler); ++class JS_FRIEND_API(DirectWrapper); ++class JS_FRIEND_API(CrossCompartmentWrapper); + + class TempAllocPolicy; + class RuntimeAllocPolicy; Added: trunk/www/seamonkey/files/patch-mozilla-js-src-jsprvtd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-js-src-jsprvtd.h Thu Sep 6 21:47:40 2012 (r994) @@ -0,0 +1,15 @@ +--- mozilla/js/src/jsprvtd.h.orig 2012-08-27 06:49:16.000000000 +0200 ++++ mozilla/js/src/jsprvtd.h 2012-09-06 22:21:52.000000000 +0200 +@@ -149,9 +149,9 @@ + class UpvarCookie; + + class Proxy; +-class BaseProxyHandler; +-class DirectWrapper; +-class CrossCompartmentWrapper; ++class JS_FRIEND_API(BaseProxyHandler); ++class JS_FRIEND_API(DirectWrapper); ++class JS_FRIEND_API(CrossCompartmentWrapper); + + class TempAllocPolicy; + class RuntimeAllocPolicy; From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 6 21:56:19 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 5A9C6106566C for ; Thu, 6 Sep 2012 21:56:19 +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 EA6388FC08 for ; Thu, 6 Sep 2012 21:56:18 +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 q86LuH7r057908 for ; Thu, 6 Sep 2012 21:56:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q86LuClv056554 for freebsd-gecko@freebsd.org; Thu, 6 Sep 2012 21:56:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 6 Sep 2012 21:56:12 GMT Message-Id: <201209062156.q86LuClv056554@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] r995 - in trunk: mail/thunderbird/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: Thu, 06 Sep 2012 21:56:19 -0000 Author: zeising Date: Thu Sep 6 21:56:12 2012 New Revision: 995 Log: Rename patches. Added: trunk/mail/thunderbird/files/patch-bug774671 - copied unchanged from r994, trunk/mail/thunderbird/files/patch-mozilla-js-src-jsprvtd.h trunk/www/firefox/files/patch-bug774671 - copied unchanged from r994, trunk/www/firefox/files/patch-js-src-jsprvtd.h trunk/www/seamonkey/files/patch-bug774671 - copied unchanged from r994, trunk/www/seamonkey/files/patch-mozilla-js-src-jsprvtd.h Deleted: trunk/mail/thunderbird/files/patch-mozilla-js-src-jsprvtd.h trunk/www/firefox/files/patch-js-src-jsprvtd.h trunk/www/seamonkey/files/patch-mozilla-js-src-jsprvtd.h Copied: trunk/mail/thunderbird/files/patch-bug774671 (from r994, trunk/mail/thunderbird/files/patch-mozilla-js-src-jsprvtd.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug774671 Thu Sep 6 21:56:12 2012 (r995, copy of r994, trunk/mail/thunderbird/files/patch-mozilla-js-src-jsprvtd.h) @@ -0,0 +1,15 @@ +--- mozilla/js/src/jsprvtd.h.orig 2012-08-25 02:31:13.000000000 +0200 ++++ mozilla/js/src/jsprvtd.h 2012-09-06 17:14:09.000000000 +0200 +@@ -149,9 +149,9 @@ + class UpvarCookie; + + class Proxy; +-class BaseProxyHandler; +-class DirectWrapper; +-class CrossCompartmentWrapper; ++class JS_FRIEND_API(BaseProxyHandler); ++class JS_FRIEND_API(DirectWrapper); ++class JS_FRIEND_API(CrossCompartmentWrapper); + + class TempAllocPolicy; + class RuntimeAllocPolicy; Deleted: trunk/mail/thunderbird/files/patch-mozilla-js-src-jsprvtd.h ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-js-src-jsprvtd.h Thu Sep 6 21:56:12 2012 (r994) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/js/src/jsprvtd.h.orig 2012-08-25 02:31:13.000000000 +0200 -+++ mozilla/js/src/jsprvtd.h 2012-09-06 17:14:09.000000000 +0200 -@@ -149,9 +149,9 @@ - class UpvarCookie; - - class Proxy; --class BaseProxyHandler; --class DirectWrapper; --class CrossCompartmentWrapper; -+class JS_FRIEND_API(BaseProxyHandler); -+class JS_FRIEND_API(DirectWrapper); -+class JS_FRIEND_API(CrossCompartmentWrapper); - - class TempAllocPolicy; - class RuntimeAllocPolicy; Copied: trunk/www/firefox/files/patch-bug774671 (from r994, trunk/www/firefox/files/patch-js-src-jsprvtd.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug774671 Thu Sep 6 21:56:12 2012 (r995, copy of r994, trunk/www/firefox/files/patch-js-src-jsprvtd.h) @@ -0,0 +1,15 @@ +--- js/src/jsprvtd.h.orig 2012-08-25 00:55:40.000000000 +0200 ++++ js/src/jsprvtd.h 2012-09-06 15:20:48.000000000 +0200 +@@ -149,9 +149,9 @@ + class UpvarCookie; + + class Proxy; +-class BaseProxyHandler; +-class DirectWrapper; +-class CrossCompartmentWrapper; ++class JS_FRIEND_API(BaseProxyHandler); ++class JS_FRIEND_API(DirectWrapper); ++class JS_FRIEND_API(CrossCompartmentWrapper); + + class TempAllocPolicy; + class RuntimeAllocPolicy; Deleted: trunk/www/firefox/files/patch-js-src-jsprvtd.h ============================================================================== --- trunk/www/firefox/files/patch-js-src-jsprvtd.h Thu Sep 6 21:56:12 2012 (r994) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- js/src/jsprvtd.h.orig 2012-08-25 00:55:40.000000000 +0200 -+++ js/src/jsprvtd.h 2012-09-06 15:20:48.000000000 +0200 -@@ -149,9 +149,9 @@ - class UpvarCookie; - - class Proxy; --class BaseProxyHandler; --class DirectWrapper; --class CrossCompartmentWrapper; -+class JS_FRIEND_API(BaseProxyHandler); -+class JS_FRIEND_API(DirectWrapper); -+class JS_FRIEND_API(CrossCompartmentWrapper); - - class TempAllocPolicy; - class RuntimeAllocPolicy; Copied: trunk/www/seamonkey/files/patch-bug774671 (from r994, trunk/www/seamonkey/files/patch-mozilla-js-src-jsprvtd.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug774671 Thu Sep 6 21:56:12 2012 (r995, copy of r994, trunk/www/seamonkey/files/patch-mozilla-js-src-jsprvtd.h) @@ -0,0 +1,15 @@ +--- mozilla/js/src/jsprvtd.h.orig 2012-08-27 06:49:16.000000000 +0200 ++++ mozilla/js/src/jsprvtd.h 2012-09-06 22:21:52.000000000 +0200 +@@ -149,9 +149,9 @@ + class UpvarCookie; + + class Proxy; +-class BaseProxyHandler; +-class DirectWrapper; +-class CrossCompartmentWrapper; ++class JS_FRIEND_API(BaseProxyHandler); ++class JS_FRIEND_API(DirectWrapper); ++class JS_FRIEND_API(CrossCompartmentWrapper); + + class TempAllocPolicy; + class RuntimeAllocPolicy; Deleted: trunk/www/seamonkey/files/patch-mozilla-js-src-jsprvtd.h ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-js-src-jsprvtd.h Thu Sep 6 21:56:12 2012 (r994) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/js/src/jsprvtd.h.orig 2012-08-27 06:49:16.000000000 +0200 -+++ mozilla/js/src/jsprvtd.h 2012-09-06 22:21:52.000000000 +0200 -@@ -149,9 +149,9 @@ - class UpvarCookie; - - class Proxy; --class BaseProxyHandler; --class DirectWrapper; --class CrossCompartmentWrapper; -+class JS_FRIEND_API(BaseProxyHandler); -+class JS_FRIEND_API(DirectWrapper); -+class JS_FRIEND_API(CrossCompartmentWrapper); - - class TempAllocPolicy; - class RuntimeAllocPolicy; From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 7 12:59:07 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 5966E106566C for ; Fri, 7 Sep 2012 12:59:07 +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 EE75A8FC0A for ; Fri, 7 Sep 2012 12:59:06 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q87CwxGN055790 for ; Fri, 7 Sep 2012 12:58:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q87CwsAu054117 for freebsd-gecko@freebsd.org; Fri, 7 Sep 2012 12:58:54 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 7 Sep 2012 12:58:54 GMT Message-Id: <201209071258.q87CwsAu054117@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] r996 - in trunk: . www/firefox-nightly 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: Fri, 07 Sep 2012 12:59:07 -0000 Author: jbeich Date: Fri Sep 7 12:58:54 2012 New Revision: 996 Log: rename jemalloc patch Added: trunk/www/firefox-nightly/files/patch-bug788955 Deleted: trunk/www/firefox-nightly/files/patch-memory-build-mozjemalloc_compat.c trunk/www/firefox-nightly/files/patch-memory-jemalloc-Makefile.in trunk/www/firefox-nightly/files/patch-memory-mozjemalloc-jemalloc.h trunk/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Modified: trunk/Gecko_TODO trunk/www/firefox-nightly/Makefile Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Thu Sep 6 21:56:12 2012 (r995) +++ trunk/Gecko_TODO Fri Sep 7 12:58:54 2012 (r996) @@ -16,7 +16,6 @@ (layers.acceleration.force-enabled -> true ?) jbeich: -- push jemalloc patch upstream, e.g. check mallctl via autoconf - push ALSA patch upstream - push --ignore-unresolved-symbol upstream (needs tests/approval from author) - remove duplicate patches by using common PATCHDIR Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Thu Sep 6 21:56:12 2012 (r995) +++ trunk/www/firefox-nightly/Makefile Fri Sep 7 12:58:54 2012 (r996) @@ -62,11 +62,6 @@ WRKSRC:= ${WRKSRC}-central-${HGREV:C/.*://} -.if ${OSVERSION} > 1000011 -MOZ_OPTIONS+= --enable-jemalloc -MOZ_EXPORT+= MOZ_JEMALLOC=1 -.endif - .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Added: trunk/www/firefox-nightly/files/patch-bug788955 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug788955 Fri Sep 7 12:58:54 2012 (r996) @@ -0,0 +1,195 @@ +diff --git Makefile.in Makefile.in +index e341462..26d19ad 100644 +--- Makefile.in ++++ Makefile.in +@@ -47,7 +47,7 @@ endif + + ifdef MOZ_MEMORY + tier_base_dirs += memory/mozjemalloc +-ifdef MOZ_JEMALLOC ++ifeq (1_,$(MOZ_JEMALLOC)_$(MOZ_NATIVE_JEMALLOC)) + tier_base_dirs += memory/jemalloc + endif + tier_base_dirs += memory/build +diff --git configure.in configure.in +index 4070d8c..3b39473 100644 +--- configure.in ++++ configure.in +@@ -3670,21 +3670,22 @@ fi + + dnl Check for the existence of various allocation headers/functions + ++MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" + MALLOC_H= +-MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) +-if test "$MALLOC_H" = ""; then +- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) +- if test "$MALLOC_H" = ""; then +- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) ++ ++for file in $MALLOC_HEADERS; do ++ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) ++ if test "$MALLOC_H" != ""; then ++ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) ++ break + fi +-fi +-if test "$MALLOC_H" != ""; then +- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) +-fi ++done + + MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" + AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) + ++AC_CHECK_FUNCS(malloc_usable_size) ++ + dnl See if compiler supports some gcc-style attributes + + AC_CACHE_CHECK(for __attribute__((always_inline)), +@@ -6902,7 +6903,21 @@ if test -z "$MOZ_MEMORY"; then + AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.]) + fi + ;; ++ *-freebsd*) ++ MOZ_JEMALLOC=1 ++ ;; + esac ++ ++ if test -n "$MOZ_JEMALLOC"; then ++ AC_CHECK_FUNCS(mallctl nallocm, ++ [MOZ_NATIVE_JEMALLOC=1 MOZ_MEMORY=1], ++ [MOZ_NATIVE_JEMALLOC= MOZ_MEMORY=]) ++ fi ++ if test -n "$MOZ_NATIVE_JEMALLOC"; then ++ AC_DEFINE(MOZ_NATIVE_JEMALLOC) ++ AC_DEFINE(MOZ_MEMORY) ++ AC_DEFINE(MOZ_JEMALLOC) ++ fi + else + dnl Don't try to run compiler tests on Windows + if test "$OS_ARCH" = "WINNT"; then +@@ -6988,6 +7003,7 @@ else + ;; + esac + fi # MOZ_MEMORY ++AC_SUBST(MOZ_NATIVE_JEMALLOC) + AC_SUBST(MOZ_MEMORY) + AC_SUBST(MOZ_JEMALLOC) + AC_SUBST(MOZ_GLUE_LDFLAGS) +@@ -8754,7 +8770,7 @@ fi + + # Run jemalloc configure script + +-if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then ++if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then + ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_" + if test "$OS_ARCH" = "Linux"; then + MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" +diff --git memory/build/Makefile.in memory/build/Makefile.in +index dca0f48..af93ee0 100644 +--- memory/build/Makefile.in ++++ memory/build/Makefile.in +@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c + + ifdef MOZ_JEMALLOC + CSRCS += mozjemalloc_compat.c ++ifndef MOZ_NATIVE_JEMALLOC + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) ++endif + else + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) + endif +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 10a845a..57245f6 100644 +--- memory/build/mozjemalloc_compat.c ++++ memory/build/mozjemalloc_compat.c +@@ -5,7 +5,15 @@ + #include "mozilla/Types.h" + #include "jemalloc_types.h" + ++#if defined(MALLOC_H) ++#include MALLOC_H /* for mallctl */ ++#endif ++ ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define je_mallctl mallctl ++#else + extern int je_mallctl(const char*, void*, size_t*, void*, size_t); ++#endif + + MOZ_EXPORT_API (void) + jemalloc_stats(jemalloc_stats_t *stats) +diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp +index 5b61050b..16bba36 100644 +--- memory/mozalloc/mozalloc.cpp ++++ memory/mozalloc/mozalloc.cpp +@@ -12,16 +12,13 @@ + #include + + #if defined(MALLOC_H) +-# include MALLOC_H // for memalign, valloc where available ++# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size + #endif // if defined(MALLOC_H) + #include // for size_t + #include // for malloc, free + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) +-#if defined(__FreeBSD__) +-# include // for malloc_usable_size +-#endif // if defined(__FreeBSD__) + + #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) + # define MOZALLOC_EXPORT __declspec(dllexport) +@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) +- // Android bionic libc doesn't have malloc_usable_size. ++#elif defined(MOZ_MEMORY) || defined(HAVE_MALLOC_USABLE_SIZE) + return malloc_usable_size(ptr); + #elif defined(XP_WIN) + return _msize(ptr); +diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h +index f0e0878..8f78123 100644 +--- memory/mozjemalloc/jemalloc.h ++++ memory/mozjemalloc/jemalloc.h +@@ -32,8 +32,8 @@ + #ifndef _JEMALLOC_H_ + #define _JEMALLOC_H_ + +-#if defined(MOZ_MEMORY_DARWIN) +-#include ++#if defined(MALLOC_H) ++#include MALLOC_H /* for malloc_good_size and nallocm */ + #endif + #include "jemalloc_types.h" + +@@ -51,7 +51,9 @@ void jemalloc_stats(jemalloc_stats_t *stats); + #if defined(MOZ_MEMORY_LINUX) + __attribute__((weak)) + #endif +-#if defined(MOZ_JEMALLOC) ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define je_nallocm nallocm ++#elif defined(MOZ_JEMALLOC) + int je_nallocm(size_t *rsize, size_t size, int flags); + #else + size_t je_malloc_good_size(size_t size); +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 7dbbbc6..0b06ad0 100644 +--- toolkit/library/Makefile.in ++++ toolkit/library/Makefile.in +@@ -346,6 +346,10 @@ EXTRA_DSO_LDOPTS += \ + $(SQLITE_LIBS) \ + $(NULL) + ++ifdef MOZ_NATIVE_JEMALLOC ++EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,memory,$(DIST)/lib) ++endif ++ + ifdef MOZ_NATIVE_JPEG + EXTRA_DSO_LDOPTS += $(MOZ_JPEG_LIBS) + endif Deleted: trunk/www/firefox-nightly/files/patch-memory-build-mozjemalloc_compat.c ============================================================================== --- trunk/www/firefox-nightly/files/patch-memory-build-mozjemalloc_compat.c Fri Sep 7 12:58:54 2012 (r995) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- memory/build/mozjemalloc_compat.c~ -+++ memory/build/mozjemalloc_compat.c -@@ -5,7 +5,12 @@ - #include "mozilla/Types.h" - #include "jemalloc_types.h" - -+#ifdef __FreeBSD__ -+#include -+#define je_mallctl mallctl -+#else - extern int je_mallctl(const char*, void*, size_t*, void*, size_t); -+#endif - - MOZ_EXPORT_API (void) - jemalloc_stats(jemalloc_stats_t *stats) Deleted: trunk/www/firefox-nightly/files/patch-memory-jemalloc-Makefile.in ============================================================================== --- trunk/www/firefox-nightly/files/patch-memory-jemalloc-Makefile.in Fri Sep 7 12:58:54 2012 (r995) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- memory/jemalloc/Makefile.in~ -+++ memory/jemalloc/Makefile.in -@@ -19,10 +19,12 @@ SDK_LIBRARY = $(REAL_LIBRARY) - DIST_INSTALL = 1 - endif - -+ifneq ($(OS_TARGET),FreeBSD) - CSRCS := $(notdir $(wildcard $(srcdir)/src/src/*.c)) - ifneq ($(OS_TARGET),Darwin) - CSRCS := $(filter-out zone.c,$(CSRCS)) - endif -+endif - - include $(topsrcdir)/config/rules.mk - Deleted: trunk/www/firefox-nightly/files/patch-memory-mozjemalloc-jemalloc.h ============================================================================== --- trunk/www/firefox-nightly/files/patch-memory-mozjemalloc-jemalloc.h Fri Sep 7 12:58:54 2012 (r995) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- memory/mozjemalloc/jemalloc.h~ -+++ memory/mozjemalloc/jemalloc.h -@@ -52,7 +52,12 @@ void jemalloc_stats(jemalloc_stats_t *st - __attribute__((weak)) - #endif - #if defined(MOZ_JEMALLOC) -+#ifdef __FreeBSD__ -+#include -+#define je_nallocm nallocm -+#else - int je_nallocm(size_t *rsize, size_t size, int flags); -+#endif - #else - size_t je_malloc_good_size(size_t size); - #endif Deleted: trunk/www/firefox-nightly/files/patch-toolkit_library_Makefile.in ============================================================================== --- trunk/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Fri Sep 7 12:58:54 2012 (r995) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 -+++ toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 -@@ -387,6 +387,10 @@ ifdef HAVE_CLOCK_MONOTONIC - EXTRA_DSO_LDOPTS += $(REALTIME_LIBS) - endif - -+ifdef MOZ_MEMORY -+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,memory,$(DIST)/lib) -+endif -+ - ifeq (android,$(MOZ_WIDGET_TOOLKIT)) - OS_LIBS += -lGLESv2 - endif From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 7 12:59:15 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 B56A11065675 for ; Fri, 7 Sep 2012 12:59:15 +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 2AAB58FC0C for ; Fri, 7 Sep 2012 12:59: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 q87CxEu8059977 for ; Fri, 7 Sep 2012 12:59: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 q87Cx9Jk057293 for freebsd-gecko@freebsd.org; Fri, 7 Sep 2012 12:59:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 7 Sep 2012 12:59:09 GMT Message-Id: <201209071259.q87Cx9Jk057293@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] r997 - in trunk: 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: Fri, 07 Sep 2012 12:59:15 -0000 Author: jbeich Date: Fri Sep 7 12:59:08 2012 New Revision: 997 Log: propagate r922, except gecko1.9 Added: trunk/mail/thunderbird-esr/files/patch-bug788108 - copied, changed from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h trunk/mail/thunderbird/files/patch-bug788108 - copied, changed from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h trunk/www/firefox-esr/files/patch-bug788108 - copied, changed from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h trunk/www/firefox-nightly/files/patch-bug788108 - copied, changed from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h trunk/www/firefox/files/patch-bug788108 - copied, changed from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h trunk/www/libxul/files/patch-bug788108 - copied, changed from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h trunk/www/seamonkey/files/patch-bug788108 - copied, changed from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Deleted: trunk/mail/thunderbird-esr/files/patch-bug351181 trunk/mail/thunderbird-esr/files/patch-bug781474 trunk/mail/thunderbird/files/patch-bug351181 trunk/mail/thunderbird/files/patch-bug781474 trunk/www/firefox-esr/files/patch-bug351181 trunk/www/firefox-esr/files/patch-bug781474 trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h trunk/www/firefox/files/patch-bug351181 trunk/www/firefox/files/patch-bug781474 trunk/www/libxul/files/patch-bug351181 trunk/www/libxul/files/patch-bug781474 trunk/www/seamonkey/files/patch-bug351181 trunk/www/seamonkey/files/patch-bug781474 Deleted: trunk/mail/thunderbird-esr/files/patch-bug351181 ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-bug351181 Fri Sep 7 12:59:08 2012 (r996) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ ---- mozilla/js/src/jsnum.cpp.orig Sun Nov 5 18:37:07 2006 -+++ mozilla/js/src/jsnum.cpp Sun Nov 5 18:42:31 2006 -@@ -45,6 +45,9 @@ - #if defined(XP_WIN) || defined(XP_OS2) - #include - #endif -+#if defined(__FreeBSD__) -+#include -+#endif - #include - #include - #include -@@ -532,7 +535,15 @@ static jsdouble NaN; - - #else - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000 -+#include -+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT)) -+ -+#else -+ - #define FIX_FPU() ((void)0) -+ -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ - - #endif - Deleted: trunk/mail/thunderbird-esr/files/patch-bug781474 ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-bug781474 Fri Sep 7 12:59:08 2012 (r996) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200 -+++ mozilla/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__ - #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; Copied and modified: trunk/mail/thunderbird-esr/files/patch-bug788108 (from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h) ============================================================================== --- trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Fri Sep 7 12:58:54 2012 (r996, copy source) +++ trunk/mail/thunderbird-esr/files/patch-bug788108 Fri Sep 7 12:59:08 2012 (r997) @@ -1,5 +1,5 @@ ---- content/base/public/nsContentUtils.h~ -+++ content/base/public/nsContentUtils.h +--- mozilla/content/base/public/nsContentUtils.h~ ++++ mozilla/content/base/public/nsContentUtils.h @@ -18,17 +18,6 @@ #include #endif @@ -7,7 +7,7 @@ -//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. -#ifdef __FreeBSD__ -#include --#if !defined(__i386__) && !defined(__x86_64__) +-#ifdef __alpha__ -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; Deleted: trunk/mail/thunderbird/files/patch-bug351181 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug351181 Fri Sep 7 12:59:08 2012 (r996) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,31 +0,0 @@ ---- mozilla/js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500 -+++ mozilla/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 Deleted: trunk/mail/thunderbird/files/patch-bug781474 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug781474 Fri Sep 7 12:59:08 2012 (r996) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200 -+++ mozilla/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__ - #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; Copied and modified: trunk/mail/thunderbird/files/patch-bug788108 (from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h) ============================================================================== --- trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Fri Sep 7 12:58:54 2012 (r996, copy source) +++ trunk/mail/thunderbird/files/patch-bug788108 Fri Sep 7 12:59:08 2012 (r997) @@ -1,5 +1,5 @@ ---- content/base/public/nsContentUtils.h~ -+++ content/base/public/nsContentUtils.h +--- mozilla/content/base/public/nsContentUtils.h~ ++++ mozilla/content/base/public/nsContentUtils.h @@ -18,17 +18,6 @@ #include #endif @@ -7,7 +7,7 @@ -//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. -#ifdef __FreeBSD__ -#include --#if !defined(__i386__) && !defined(__x86_64__) +-#ifdef __alpha__ -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; Deleted: trunk/www/firefox-esr/files/patch-bug351181 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug351181 Fri Sep 7 12:59:08 2012 (r996) +++ /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 -@@ -43,6 +43,9 @@ - /* - * JS number type and wrapper class. - */ -+#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 Deleted: trunk/www/firefox-esr/files/patch-bug781474 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug781474 Fri Sep 7 12:59:08 2012 (r996) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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__ - #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; Copied and modified: trunk/www/firefox-esr/files/patch-bug788108 (from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h) ============================================================================== --- trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Fri Sep 7 12:58:54 2012 (r996, copy source) +++ trunk/www/firefox-esr/files/patch-bug788108 Fri Sep 7 12:59:08 2012 (r997) @@ -7,7 +7,7 @@ -//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. -#ifdef __FreeBSD__ -#include --#if !defined(__i386__) && !defined(__x86_64__) +-#ifdef __alpha__ -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; Copied and modified: trunk/www/firefox-nightly/files/patch-bug788108 (from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h) ============================================================================== Deleted: trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h ============================================================================== --- trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Fri Sep 7 12:59:08 2012 (r996) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- 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 --#if !defined(__i386__) && !defined(__x86_64__) --static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; --#endif --static fp_except_t oldmask = fpsetmask(~allmask); --#endif -- - #include "nsAString.h" - #include "nsIStatefulFrame.h" - #include "nsNodeInfoManager.h" Deleted: trunk/www/firefox/files/patch-bug351181 ============================================================================== --- trunk/www/firefox/files/patch-bug351181 Fri Sep 7 12:59:08 2012 (r996) +++ /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 Deleted: trunk/www/firefox/files/patch-bug781474 ============================================================================== --- trunk/www/firefox/files/patch-bug781474 Fri Sep 7 12:59:08 2012 (r996) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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__ - #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; Copied and modified: trunk/www/firefox/files/patch-bug788108 (from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h) ============================================================================== --- trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Fri Sep 7 12:58:54 2012 (r996, copy source) +++ trunk/www/firefox/files/patch-bug788108 Fri Sep 7 12:59:08 2012 (r997) @@ -7,7 +7,7 @@ -//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. -#ifdef __FreeBSD__ -#include --#if !defined(__i386__) && !defined(__x86_64__) +-#ifdef __alpha__ -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; Deleted: trunk/www/libxul/files/patch-bug351181 ============================================================================== --- trunk/www/libxul/files/patch-bug351181 Fri Sep 7 12:59:08 2012 (r996) +++ /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 -@@ -43,6 +43,9 @@ - /* - * JS number type and wrapper class. - */ -+#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 Deleted: trunk/www/libxul/files/patch-bug781474 ============================================================================== --- trunk/www/libxul/files/patch-bug781474 Fri Sep 7 12:59:08 2012 (r996) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- 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__ - #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; Copied and modified: trunk/www/libxul/files/patch-bug788108 (from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h) ============================================================================== --- trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Fri Sep 7 12:58:54 2012 (r996, copy source) +++ trunk/www/libxul/files/patch-bug788108 Fri Sep 7 12:59:08 2012 (r997) @@ -7,7 +7,7 @@ -//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. -#ifdef __FreeBSD__ -#include --#if !defined(__i386__) && !defined(__x86_64__) +-#ifdef __alpha__ -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; Deleted: trunk/www/seamonkey/files/patch-bug351181 ============================================================================== --- trunk/www/seamonkey/files/patch-bug351181 Fri Sep 7 12:59:08 2012 (r996) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,31 +0,0 @@ ---- mozilla/js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500 -+++ mozilla/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 Deleted: trunk/www/seamonkey/files/patch-bug781474 ============================================================================== --- trunk/www/seamonkey/files/patch-bug781474 Fri Sep 7 12:59:08 2012 (r996) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200 -+++ mozilla/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__ - #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; Copied and modified: trunk/www/seamonkey/files/patch-bug788108 (from r996, trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h) ============================================================================== --- trunk/www/firefox-nightly/files/patch-content__base__public__nsContentUtils.h Fri Sep 7 12:58:54 2012 (r996, copy source) +++ trunk/www/seamonkey/files/patch-bug788108 Fri Sep 7 12:59:08 2012 (r997) @@ -1,5 +1,5 @@ ---- content/base/public/nsContentUtils.h~ -+++ content/base/public/nsContentUtils.h +--- mozilla/content/base/public/nsContentUtils.h~ ++++ mozilla/content/base/public/nsContentUtils.h @@ -18,17 +18,6 @@ #include #endif @@ -7,7 +7,7 @@ -//A trick to handle IEEE floating point exceptions on FreeBSD - E.D. -#ifdef __FreeBSD__ -#include --#if !defined(__i386__) && !defined(__x86_64__) +-#ifdef __alpha__ -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; From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 7 12:59:27 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 3BE29106564A for ; Fri, 7 Sep 2012 12:59:27 +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 D0DE78FC17 for ; Fri, 7 Sep 2012 12:59:26 +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 q87CxPQ9062819 for ; Fri, 7 Sep 2012 12:59:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q87CxKav061104 for freebsd-gecko@freebsd.org; Fri, 7 Sep 2012 12:59:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 7 Sep 2012 12:59:20 GMT Message-Id: <201209071259.q87CxKav061104@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] r998 - in trunk: 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: Fri, 07 Sep 2012 12:59:27 -0000 Author: jbeich Date: Fri Sep 7 12:59:20 2012 New Revision: 998 Log: remove one more exceptions workaround Added: trunk/mail/thunderbird-esr/files/patch-bug789436 trunk/mail/thunderbird/files/patch-bug789436 trunk/www/firefox-esr/files/patch-bug789436 trunk/www/firefox-nightly/files/patch-bug789436 trunk/www/firefox/files/patch-bug789436 trunk/www/libxul/files/patch-bug789436 trunk/www/seamonkey/files/patch-bug789436 Added: trunk/mail/thunderbird-esr/files/patch-bug789436 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird-esr/files/patch-bug789436 Fri Sep 7 12:59:20 2012 (r998) @@ -0,0 +1,27 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) + + #endif + +-#if defined(FREEBSD) +-// pick up fpsetmask prototype. +-#include +-#endif +- + static inline void + DumpVersion() + { +@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname) + + // Unbuffer stdout, needed for tinderbox tests. + setbuf(stdout, 0); +- +-#if defined(FREEBSD) +- // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp +- // trap behavior that trips up on floating-point tests performed by +- // the JS engine. See bugzilla bug 9967 details. +- fpsetmask(0); +-#endif + } + Added: trunk/mail/thunderbird/files/patch-bug789436 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug789436 Fri Sep 7 12:59:20 2012 (r998) @@ -0,0 +1,27 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) + + #endif + +-#if defined(FREEBSD) +-// pick up fpsetmask prototype. +-#include +-#endif +- + static inline void + DumpVersion() + { +@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname) + + // Unbuffer stdout, needed for tinderbox tests. + setbuf(stdout, 0); +- +-#if defined(FREEBSD) +- // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp +- // trap behavior that trips up on floating-point tests performed by +- // the JS engine. See bugzilla bug 9967 details. +- fpsetmask(0); +-#endif + } + Added: trunk/www/firefox-esr/files/patch-bug789436 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug789436 Fri Sep 7 12:59:20 2012 (r998) @@ -0,0 +1,27 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) + + #endif + +-#if defined(FREEBSD) +-// pick up fpsetmask prototype. +-#include +-#endif +- + static inline void + DumpVersion() + { +@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname) + + // Unbuffer stdout, needed for tinderbox tests. + setbuf(stdout, 0); +- +-#if defined(FREEBSD) +- // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp +- // trap behavior that trips up on floating-point tests performed by +- // the JS engine. See bugzilla bug 9967 details. +- fpsetmask(0); +-#endif + } + Added: trunk/www/firefox-nightly/files/patch-bug789436 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug789436 Fri Sep 7 12:59:20 2012 (r998) @@ -0,0 +1,27 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) + + #endif + +-#if defined(FREEBSD) +-// pick up fpsetmask prototype. +-#include +-#endif +- + static inline void + DumpVersion() + { +@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname) + + // Unbuffer stdout, needed for tinderbox tests. + setbuf(stdout, 0); +- +-#if defined(FREEBSD) +- // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp +- // trap behavior that trips up on floating-point tests performed by +- // the JS engine. See bugzilla bug 9967 details. +- fpsetmask(0); +-#endif + } + Added: trunk/www/firefox/files/patch-bug789436 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug789436 Fri Sep 7 12:59:20 2012 (r998) @@ -0,0 +1,27 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) + + #endif + +-#if defined(FREEBSD) +-// pick up fpsetmask prototype. +-#include +-#endif +- + static inline void + DumpVersion() + { +@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname) + + // Unbuffer stdout, needed for tinderbox tests. + setbuf(stdout, 0); +- +-#if defined(FREEBSD) +- // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp +- // trap behavior that trips up on floating-point tests performed by +- // the JS engine. See bugzilla bug 9967 details. +- fpsetmask(0); +-#endif + } + Added: trunk/www/libxul/files/patch-bug789436 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug789436 Fri Sep 7 12:59:20 2012 (r998) @@ -0,0 +1,27 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) + + #endif + +-#if defined(FREEBSD) +-// pick up fpsetmask prototype. +-#include +-#endif +- + static inline void + DumpVersion() + { +@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname) + + // Unbuffer stdout, needed for tinderbox tests. + setbuf(stdout, 0); +- +-#if defined(FREEBSD) +- // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp +- // trap behavior that trips up on floating-point tests performed by +- // the JS engine. See bugzilla bug 9967 details. +- fpsetmask(0); +-#endif + } + Added: trunk/www/seamonkey/files/patch-bug789436 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug789436 Fri Sep 7 12:59:20 2012 (r998) @@ -0,0 +1,27 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -1388,11 +1388,6 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) + + #endif + +-#if defined(FREEBSD) +-// pick up fpsetmask prototype. +-#include +-#endif +- + static inline void + DumpVersion() + { +@@ -4136,12 +4131,5 @@ SetupErrorHandling(const char* progname) + + // Unbuffer stdout, needed for tinderbox tests. + setbuf(stdout, 0); +- +-#if defined(FREEBSD) +- // Disable all SIGFPE's on FreeBSD, as it has non-IEEE-conformant fp +- // trap behavior that trips up on floating-point tests performed by +- // the JS engine. See bugzilla bug 9967 details. +- fpsetmask(0); +-#endif + } + From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 7 12:59:43 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 A33E9106564A for ; Fri, 7 Sep 2012 12:59:43 +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 84D0F8FC08 for ; Fri, 7 Sep 2012 12:59:42 +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 q87CxfXN073800 for ; Fri, 7 Sep 2012 12:59:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q87CxZb7063494 for freebsd-gecko@freebsd.org; Fri, 7 Sep 2012 12:59:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 7 Sep 2012 12:59:35 GMT Message-Id: <201209071259.q87CxZb7063494@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] r999 - in trunk: 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: Fri, 07 Sep 2012 12:59:43 -0000 Author: jbeich Date: Fri Sep 7 12:59:35 2012 New Revision: 999 Log: update Added: trunk/mail/thunderbird/files/patch-bug788955 trunk/mail/thunderbird/files/patch-config-baseconfig.mk trunk/www/firefox/files/patch-bug788955 trunk/www/firefox/files/patch-config-baseconfig.mk trunk/www/seamonkey/files/patch-bug788955 trunk/www/seamonkey/files/patch-config-autoconf.mk.in - copied, changed from r998, trunk/www/firefox/files/patch-config_autoconf.mk.in trunk/www/seamonkey/files/patch-config-baseconfig.mk Deleted: trunk/mail/thunderbird/files/patch-bug723860 trunk/mail/thunderbird/files/patch-bug759459 trunk/mail/thunderbird/files/patch-bug760899 trunk/mail/thunderbird/files/patch-bug761030 trunk/mail/thunderbird/files/patch-bug761419 trunk/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in trunk/www/firefox-nightly/files/patch-bug786995 trunk/www/firefox-nightly/files/patch-bug788039 trunk/www/firefox-nightly/files/patch-bug788108 trunk/www/firefox/files/patch-bug723860 trunk/www/firefox/files/patch-bug752895 trunk/www/firefox/files/patch-bug759459 trunk/www/firefox/files/patch-bug760899 trunk/www/firefox/files/patch-bug761030 trunk/www/firefox/files/patch-bug761419 trunk/www/firefox/files/patch-config_autoconf.mk.in trunk/www/seamonkey/files/patch-bug723860 trunk/www/seamonkey/files/patch-bug759459 trunk/www/seamonkey/files/patch-bug760899 trunk/www/seamonkey/files/patch-bug761030 trunk/www/seamonkey/files/patch-bug761419 trunk/www/seamonkey/files/patch-config_autoconf.mk.in Modified: trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/distinfo trunk/mail/thunderbird/files/extra-bug780531 trunk/mail/thunderbird/files/patch-bug753046 trunk/mail/thunderbird/files/patch-bug778056 trunk/mail/thunderbird/files/patch-bug778078 trunk/mail/thunderbird/files/patch-bug784776 trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/firefox/files/extra-bug780531 trunk/www/firefox/files/patch-bug753046 trunk/www/firefox/files/patch-bug778056 trunk/www/firefox/files/patch-bug778078 trunk/www/firefox/files/patch-bug784776 trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo trunk/www/seamonkey/files/extra-bug780531 trunk/www/seamonkey/files/patch-bug753046 trunk/www/seamonkey/files/patch-bug778056 trunk/www/seamonkey/files/patch-bug778078 trunk/www/seamonkey/files/patch-bug784776 Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Fri Sep 7 12:59:20 2012 (r998) +++ trunk/mail/thunderbird/Makefile Fri Sep 7 12:59:35 2012 (r999) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 15.0 +DISTVERSION= 16.0b2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -57,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: trunk/mail/thunderbird/distinfo ============================================================================== --- trunk/mail/thunderbird/distinfo Fri Sep 7 12:59:20 2012 (r998) +++ trunk/mail/thunderbird/distinfo Fri Sep 7 12:59:35 2012 (r999) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-15.0.source.tar.bz2) = acbf31d36c49a878eeefd59c37e2fd9e2173c99482c93310dfd9c6c799bb3d4d -SIZE (thunderbird-15.0.source.tar.bz2) = 105942186 +SHA256 (thunderbird-16.0b2.source.tar.bz2) = bba7d79e2939806c027ac82592c408ea815d3094a70f8f277b959966d1baa511 +SIZE (thunderbird-16.0b2.source.tar.bz2) = 111787029 Modified: trunk/mail/thunderbird/files/extra-bug780531 ============================================================================== --- trunk/mail/thunderbird/files/extra-bug780531 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/mail/thunderbird/files/extra-bug780531 Fri Sep 7 12:59:35 2012 (r999) @@ -1,13 +1,12 @@ --- mozilla/configure.in~ +++ mozilla/configure.in -@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then +@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then MOZ_SYDNEYAUDIO=1 MOZ_CUBEB=1 MOZ_MEDIA=1 - case "$target_cpu" in -- arm*) + case "$target" in -+ arm-*-linux*) + arm*) MOZ_TREMOR=1 ;; + *-freebsd*) @@ -16,14 +15,13 @@ *) MOZ_VORBIS=1 ;; -@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV +@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then MOZ_SYDNEYAUDIO=1 MOZ_CUBEB=1 MOZ_MEDIA=1 - case "$target_cpu" in -- arm*) + case "$target" in -+ arm-*-linux*) + arm*) MOZ_TREMOR=1 ;; + *-freebsd*) Deleted: trunk/mail/thunderbird/files/patch-bug723860 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug723860 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,54 +0,0 @@ -commit 4e07587 -Author: Matthew Gregan -Date: Wed Jun 6 17:58:07 2012 +1200 - - Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized. r=doublec ---- - content/media/gstreamer/nsGStreamerReader.cpp | 4 ++++ - content/media/ogg/nsOggReader.cpp | 3 +-- - content/media/wave/nsWaveReader.cpp | 3 +++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp -index 164fb2e..06a09b5 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -505,6 +505,10 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, - nsresult nsGStreamerReader::GetBuffered(nsTimeRanges* aBuffered, - PRInt64 aStartTime) - { -+ if (!mInfo.mHasVideo && !mInfo.mHasAudio) { -+ return NS_OK; -+ } -+ - GstFormat format = GST_FORMAT_TIME; - MediaResource* resource = mDecoder->GetResource(); - gint64 resourceLength = resource->GetLength(); -diff --git mozilla/content/media/ogg/nsOggReader.cpp mozilla/content/media/ogg/nsOggReader.cpp -index c6ff008..8d40e2c 100644 ---- mozilla/content/media/ogg/nsOggReader.cpp -+++ mozilla/content/media/ogg/nsOggReader.cpp -@@ -1532,8 +1532,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) - { - // HasAudio and HasVideo are not used here as they take a lock and cause - // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change -- // after metadata is read and GetBuffered isn't called before metadata is -- // read. -+ // after metadata is read. - if (!mInfo.mHasVideo && !mInfo.mHasAudio) { - // No need to search through the file if there are no audio or video tracks - return NS_OK; -diff --git mozilla/content/media/wave/nsWaveReader.cpp mozilla/content/media/wave/nsWaveReader.cpp -index 7242eb5..60fc1e1 100644 ---- mozilla/content/media/wave/nsWaveReader.cpp -+++ mozilla/content/media/wave/nsWaveReader.cpp -@@ -239,6 +239,9 @@ static double RoundToUsecs(double aSeconds) { - - nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) - { -+ if (!mInfo.mHasAudio) { -+ return NS_OK; -+ } - PRInt64 startOffset = mDecoder->GetResource()->GetNextCachedData(mWavePCMOffset); - while (startOffset >= 0) { - PRInt64 endOffset = mDecoder->GetResource()->GetCachedDataEnd(startOffset); Modified: trunk/mail/thunderbird/files/patch-bug753046 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug753046 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/mail/thunderbird/files/patch-bug753046 Fri Sep 7 12:59:35 2012 (r999) @@ -978,57 +978,6 @@ #else long pages = sysconf(_SC_PHYS_PAGES); long page_size = sysconf(_SC_PAGE_SIZE); -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h -@@ -34,7 +34,7 @@ - #include "base/third_party/nspr/prcpucfg_win.h" - #elif defined(__APPLE__) - #include "base/third_party/nspr/prcpucfg_mac.h" --#elif defined(__linux__) || defined(ANDROID) -+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) - #include "base/third_party/nspr/prcpucfg_linux.h" - #elif defined(__OpenBSD__) - #include "base/third_party/nspr/prcpucfg_openbsd.h" -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2011-12-20 23:28:19.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc -@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp - LL_ADD(retVal, retVal, temp); - - return retVal; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_DRAGONFLY) - struct tm exp_tm = {0}; - exp_tm.tm_sec = exploded->tm_sec; - exp_tm.tm_min = exploded->tm_min; -@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp - result *= kSecondsToMicroseconds; - result += exploded->tm_usec; - return result; -+#elif defined(OS_FREEBSD) || defined(OS_NETBSD) -+ struct tm exp_tm = {0}; -+ exp_tm.tm_sec = exploded->tm_sec; -+ exp_tm.tm_min = exploded->tm_min; -+ exp_tm.tm_hour = exploded->tm_hour; -+ exp_tm.tm_mday = exploded->tm_mday; -+ exp_tm.tm_mon = exploded->tm_month; -+ exp_tm.tm_year = exploded->tm_year - 1900; -+ -+ // time_t is 64bit -+ time_t absolute_time = timegm(&exp_tm); -+ -+ PRTime result = static_cast(absolute_time); -+ result -= exploded->tm_params.tp_gmt_offset + -+ exploded->tm_params.tp_dst_offset; -+ result *= kSecondsToMicroseconds; -+ result += exploded->tm_usec; -+ return result; - #else - #error No PR_ImplodeTime implemented on your platform. - #endif diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc index abf2a56..48791f6 100644 --- mozilla/ipc/chromium/src/base/time_posix.cc Deleted: trunk/mail/thunderbird/files/patch-bug759459 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug759459 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ -commit 4d0c5b9 -Author: Marco Perez -Date: Sat Jun 9 12:24:56 2012 -0400 - - Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence ---- - js/src/gc/Memory.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp -index 815e90b..10c1a91 100644 ---- 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() Deleted: trunk/mail/thunderbird/files/patch-bug760899 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug760899 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,54 +0,0 @@ -commit 667daed -Author: Stephen Moehle -Date: Tue Jun 5 11:32:36 2012 +1200 - - Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik - - --HG-- - extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a ---- - content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 6a50e09..164fb2e 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) - if (gst_element_query_duration(GST_ELEMENT(mPlayBin), - &format, &duration) && format == GST_FORMAT_TIME) { - ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor()); -- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT, - GST_TIME_ARGS (duration))); - duration = GST_TIME_AS_USECONDS (duration); - mDecoder->GetStateMachine()->SetDuration(duration); -@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, - nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen); - - if (timestamp < aTimeThreshold) { -- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT -- " threshold %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT -+ " threshold %" GST_TIME_FORMAT, - GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold))); - gst_buffer_unref(buffer); - buffer = NULL; -@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, - NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread."); - - gint64 seekPos = aTarget * GST_USECOND; -- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT, - mDecoder, GST_TIME_ARGS(seekPos))); - - if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME, -@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration() - if (gst_element_query_duration(GST_ELEMENT(mPlayBin), - &format, &duration)) { - if (format == GST_FORMAT_TIME) { -- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT, - GST_TIME_ARGS (duration))); - duration = GST_TIME_AS_USECONDS (duration); - } Deleted: trunk/mail/thunderbird/files/patch-bug761030 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug761030 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ -commit 8bc9e15 -Author: Stephen Moehle -Date: Tue Jun 5 11:31:13 2012 +1200 - - Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik - - --HG-- - extra : rebase_source : 5e884550f9870bd2fda247d50bebd472e8368588 ---- - content/media/gstreamer/nsGStreamerReader.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp -index 17374a3..6a50e09 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -452,6 +452,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, - i, height); - b.mPlanes[i].mWidth = gst_video_format_get_component_width(format, - i, width); -+ b.mPlanes[i].mOffset = 0; -+ b.mPlanes[i].mSkip = 0; - } - - bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, Deleted: trunk/mail/thunderbird/files/patch-bug761419 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug761419 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,22 +0,0 @@ -commit f0a73aa -Author: Paul Adenot -Date: Thu Jun 21 20:44:39 2012 -0400 - - Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik ---- - content/media/gstreamer/nsGStreamerReader.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 06a09b5..c48f92e 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) - * stream but that are otherwise decodeable. - */ - guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO, -- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO}; -+ static_cast(~GST_PLAY_FLAG_AUDIO), static_cast(~GST_PLAY_FLAG_VIDEO)}; - guint default_flags, current_flags; - g_object_get(mPlayBin, "flags", &default_flags, NULL); - Modified: trunk/mail/thunderbird/files/patch-bug778056 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug778056 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/mail/thunderbird/files/patch-bug778056 Fri Sep 7 12:59:35 2012 (r999) @@ -4,9 +4,9 @@ #if defined(XP_UNIX) # include // for valloc on *BSD #endif //if defined(XP_UNIX) -+#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) +# include // for malloc_usable_size -+#endif ++#endif // if defined(__FreeBSD__) #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) # define MOZALLOC_EXPORT __declspec(dllexport) Modified: trunk/mail/thunderbird/files/patch-bug778078 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug778078 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/mail/thunderbird/files/patch-bug778078 Fri Sep 7 12:59:35 2012 (r999) @@ -1,9 +1,9 @@ --- mozilla/toolkit/xre/nsAppRunner.cpp~ +++ mozilla/toolkit/xre/nsAppRunner.cpp -@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[] +@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[] ScopedLogging log; - #if defined(MOZ_WIDGET_GTK2) + #if defined(MOZ_WIDGET_GTK) -#ifdef MOZ_MEMORY +#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) // Disable the slice allocator, since jemalloc already uses similar layout Modified: trunk/mail/thunderbird/files/patch-bug784776 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug784776 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/mail/thunderbird/files/patch-bug784776 Fri Sep 7 12:59:35 2012 (r999) @@ -1,20 +1,3 @@ ---- mozilla/content/media/MediaEngineDefault.cpp~ -+++ mozilla/content/media/MediaEngineDefault.cpp -@@ -232,12 +232,12 @@ nsresult - MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID) - { - if (mState != kAllocated) { -- return NULL; -+ return 0; - } - - mTimer = do_CreateInstance(NS_TIMER_CONTRACTID); - if (!mTimer) { -- return NULL; -+ return 0; - } - - mSource = aStream; --- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~ +++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp @@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources() Added: trunk/mail/thunderbird/files/patch-bug788955 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug788955 Fri Sep 7 12:59:35 2012 (r999) @@ -0,0 +1,205 @@ +diff --git Makefile.in Makefile.in +index e341462..26d19ad 100644 +--- mozilla/Makefile.in ++++ mozilla/Makefile.in +@@ -47,7 +47,7 @@ endif + + ifdef MOZ_MEMORY + tier_base_dirs += memory/mozjemalloc +-ifdef MOZ_JEMALLOC ++ifeq (1_,$(MOZ_JEMALLOC)_$(MOZ_NATIVE_JEMALLOC)) + tier_base_dirs += memory/jemalloc + endif + tier_base_dirs += memory/build +--- mozilla/config/autoconf.mk.in ++++ mozilla/config/autoconf.mk.in +@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@ + MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@ + MOZ_MEMORY = @MOZ_MEMORY@ + MOZ_JEMALLOC = @MOZ_JEMALLOC@ ++MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@ + MOZ_PROFILING = @MOZ_PROFILING@ + MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@ + MOZ_JPROF = @MOZ_JPROF@ +diff --git configure.in configure.in +index 4070d8c..3b39473 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -3670,21 +3670,22 @@ fi + + dnl Check for the existence of various allocation headers/functions + ++MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" + MALLOC_H= +-MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) +-if test "$MALLOC_H" = ""; then +- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) +- if test "$MALLOC_H" = ""; then +- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) ++ ++for file in $MALLOC_HEADERS; do ++ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) ++ if test "$MALLOC_H" != ""; then ++ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) ++ break + fi +-fi +-if test "$MALLOC_H" != ""; then +- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) +-fi ++done + + MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" + AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) + ++AC_CHECK_FUNCS(malloc_usable_size) ++ + dnl See if compiler supports some gcc-style attributes + + AC_CACHE_CHECK(for __attribute__((always_inline)), +@@ -6902,7 +6903,21 @@ if test -z "$MOZ_MEMORY"; then + AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.]) + fi + ;; ++ *-freebsd*) ++ MOZ_JEMALLOC=1 ++ ;; + esac ++ ++ if test -n "$MOZ_JEMALLOC"; then ++ AC_CHECK_FUNCS(mallctl nallocm, ++ [MOZ_NATIVE_JEMALLOC=1 MOZ_MEMORY=1], ++ [MOZ_NATIVE_JEMALLOC= MOZ_MEMORY=]) ++ fi ++ if test -n "$MOZ_NATIVE_JEMALLOC"; then ++ AC_DEFINE(MOZ_NATIVE_JEMALLOC) ++ AC_DEFINE(MOZ_MEMORY) ++ AC_DEFINE(MOZ_JEMALLOC) ++ fi + else + dnl Don't try to run compiler tests on Windows + if test "$OS_ARCH" = "WINNT"; then +@@ -6988,6 +7003,7 @@ else + ;; + esac + fi # MOZ_MEMORY ++AC_SUBST(MOZ_NATIVE_JEMALLOC) + AC_SUBST(MOZ_MEMORY) + AC_SUBST(MOZ_JEMALLOC) + AC_SUBST(MOZ_GLUE_LDFLAGS) +@@ -8754,7 +8770,7 @@ fi + + # Run jemalloc configure script + +-if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then ++if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then + ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_" + if test "$OS_ARCH" = "Linux"; then + MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" +diff --git memory/build/Makefile.in memory/build/Makefile.in +index dca0f48..af93ee0 100644 +--- mozilla/memory/build/Makefile.in ++++ mozilla/memory/build/Makefile.in +@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c + + ifdef MOZ_JEMALLOC + CSRCS += mozjemalloc_compat.c ++ifndef MOZ_NATIVE_JEMALLOC + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) ++endif + else + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) + endif +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 10a845a..57245f6 100644 +--- mozilla/memory/build/mozjemalloc_compat.c ++++ mozilla/memory/build/mozjemalloc_compat.c +@@ -5,7 +5,15 @@ + #include "mozilla/Types.h" + #include "jemalloc_types.h" + ++#if defined(MALLOC_H) ++#include MALLOC_H /* for mallctl */ ++#endif ++ ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define je_mallctl mallctl ++#else + extern int je_mallctl(const char*, void*, size_t*, void*, size_t); ++#endif + + MOZ_EXPORT_API (void) + jemalloc_stats(jemalloc_stats_t *stats) +diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp +index 5b61050b..16bba36 100644 +--- mozilla/memory/mozalloc/mozalloc.cpp ++++ mozilla/memory/mozalloc/mozalloc.cpp +@@ -12,16 +12,13 @@ + #include + + #if defined(MALLOC_H) +-# include MALLOC_H // for memalign, valloc where available ++# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size + #endif // if defined(MALLOC_H) + #include // for size_t + #include // for malloc, free + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) +-#if defined(__FreeBSD__) +-# include // for malloc_usable_size +-#endif // if defined(__FreeBSD__) + + #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) + # define MOZALLOC_EXPORT __declspec(dllexport) +@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) +- // Android bionic libc doesn't have malloc_usable_size. ++#elif defined(MOZ_MEMORY) || defined(HAVE_MALLOC_USABLE_SIZE) + return malloc_usable_size(ptr); + #elif defined(XP_WIN) + return _msize(ptr); +diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h +index f0e0878..8f78123 100644 +--- mozilla/memory/mozjemalloc/jemalloc.h ++++ mozilla/memory/mozjemalloc/jemalloc.h +@@ -32,8 +32,8 @@ + #ifndef _JEMALLOC_H_ + #define _JEMALLOC_H_ + +-#if defined(MOZ_MEMORY_DARWIN) +-#include ++#if defined(MALLOC_H) ++#include MALLOC_H /* for malloc_good_size and nallocm */ + #endif + #include "jemalloc_types.h" + +@@ -51,7 +51,9 @@ void jemalloc_stats(jemalloc_stats_t *stats); + #if defined(MOZ_MEMORY_LINUX) + __attribute__((weak)) + #endif +-#if defined(MOZ_JEMALLOC) ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define je_nallocm nallocm ++#elif defined(MOZ_JEMALLOC) + int je_nallocm(size_t *rsize, size_t size, int flags); + #else + size_t je_malloc_good_size(size_t size); +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 7dbbbc6..0b06ad0 100644 +--- mozilla/toolkit/library/Makefile.in ++++ mozilla/toolkit/library/Makefile.in +@@ -346,6 +346,10 @@ EXTRA_DSO_LDOPTS += \ + $(SQLITE_LIBS) \ + $(NULL) + ++ifdef MOZ_NATIVE_JEMALLOC ++EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,memory,$(DIST)/lib) ++endif ++ + ifdef MOZ_NATIVE_JPEG + EXTRA_DSO_LDOPTS += $(MOZ_JPEG_LIBS) + endif Added: trunk/mail/thunderbird/files/patch-config-baseconfig.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-config-baseconfig.mk Fri Sep 7 12:59:35 2012 (r999) @@ -0,0 +1,16 @@ +--- mozilla/config/baseconfig.mk~ ++++ mozilla/config/baseconfig.mk +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/%%MOZILLA%% ++idldir = $(datadir)/idl/%%MOZILLA%% ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't Deleted: trunk/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,22 +0,0 @@ ---- mozilla/config/autoconf.mk.in.orig 2007-08-28 12:02:43.000000000 -0400 -+++ mozilla/config/autoconf.mk.in 2007-09-26 14:21:51.000000000 -0400 -@@ -58,14 +58,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/%%MOZILLA%% - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/%%MOZILLA%% -+sdkdir = $(libdir)/%%MOZILLA%% - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ - Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/firefox-nightly/Makefile.hgrev Fri Sep 7 12:59:35 2012 (r999) @@ -1 +1 @@ -HGREV= 104183:7c75cd38626a +HGREV= 104498:36427d4b2cf6 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/firefox-nightly/distinfo Fri Sep 7 12:59:35 2012 (r999) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/7c75cd38626a.tar.bz2) = 1285ebbeaba294da12c47fc9323db488eb8c193e5be1bd475c3ad492d3acd385 -SIZE (firefox-nightly/7c75cd38626a.tar.bz2) = 88492019 +SHA256 (firefox-nightly/36427d4b2cf6.tar.bz2) = 204602a5866150bc943d5b59966c63b9ea8d7f8b5808a4da1a1d2da958370dcb +SIZE (firefox-nightly/36427d4b2cf6.tar.bz2) = 88616803 Deleted: trunk/www/firefox-nightly/files/patch-bug786995 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug786995 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,36 +0,0 @@ -# Bug 786995 - configure should check for SSSE3 support in the whole toolchain - ---- configure.in.orig 2012-09-02 00:37:29.000000000 +0200 -+++ configure.in 2012-09-02 00:38:50.000000000 +0200 -@@ -1710,15 +1710,15 @@ - _MOZ_RTTI_FLAGS_OFF=-fno-rtti - - # Check for -mssse3 on $CC -- AC_MSG_CHECKING([for -mssse3 option to $CC]) -- HAVE_COMPILER_FLAG_MSSSE3= -+ AC_MSG_CHECKING([if toolchain supports -mssse3 option]) -+ HAVE_TOOLCHAIN_SUPPORT_MSSSE3= - _SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -mssse3" -- AC_TRY_COMPILE(,,AC_MSG_RESULT([yes]) -- [HAVE_COMPILER_FLAG_MSSSE3=1], -+ AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes]) -+ [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1], - AC_MSG_RESULT([no])) - CFLAGS=$_SAVE_CFLAGS -- AC_SUBST(HAVE_COMPILER_FLAG_MSSSE3) -+ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3) - - # Turn on GNU-specific warnings: - # -Wall - turn on a lot of warnings ---- gfx/skia/Makefile.in.orig 2012-09-02 00:39:00.000000000 +0200 -+++ gfx/skia/Makefile.in 2012-09-02 00:39:21.000000000 +0200 -@@ -365,7 +365,7 @@ - SkUtils_opts_SSE2.cpp \ - opts_check_SSE2.cpp \ - $(NULL) --ifdef HAVE_COMPILER_FLAG_MSSSE3 -+ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3 - DEFINES += -DSK_BUILD_SSSE3 - CPPSRCS += SkBitmapProcState_opts_SSSE3.cpp - endif Deleted: trunk/www/firefox-nightly/files/patch-bug788039 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug788039 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,48 +0,0 @@ -# Bug 788039 - With no prefix search libevent via pkg-config. - ---- configure.in -+++ configure.in -@@ -3854,7 +3854,7 @@ fi - dnl system libevent Support - dnl ======================================================== - MOZ_ARG_WITH_STRING(system-libevent, --[ --with-system-libevent=[PFX] -+[ --with-system-libevent[=PFX] - Use system libevent [installed at prefix PFX]], - LIBEVENT_DIR=$withval) - -@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS - _SAVE_LIBS=$LIBS - if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then - MOZ_NATIVE_LIBEVENT= -+elif test "$LIBEVENT_DIR" = yes; then -+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, -+ MOZ_NATIVE_LIBEVENT=1, -+ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found])) - else -- if test "${LIBEVENT_DIR}" = "yes"; then -- LIBEVENT_DIR=/usr -- fi - CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" - LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" - MOZ_CHECK_HEADER(event.h, -@@ -3876,16 +3877,16 @@ else - AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) - AC_CHECK_LIB(event, event_init, - [MOZ_NATIVE_LIBEVENT=1 -- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" -+ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include" - MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], -- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) -+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=]) - fi - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - - AC_SUBST(MOZ_NATIVE_LIBEVENT) --AC_SUBST(MOZ_LIBEVENT_INCLUDES) -+AC_SUBST(MOZ_LIBEVENT_CFLAGS) - AC_SUBST(MOZ_LIBEVENT_LIBS) - - dnl ======================================================== Deleted: trunk/www/firefox-nightly/files/patch-bug788108 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug788108 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ ---- 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 --#if !defined(__i386__) && !defined(__x86_64__) --static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; --#endif --static fp_except_t oldmask = fpsetmask(~allmask); --#endif -- - #include "nsAString.h" - #include "nsIStatefulFrame.h" - #include "nsNodeInfoManager.h" Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/firefox/Makefile Fri Sep 7 12:59:35 2012 (r999) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 15.0 +DISTVERSION= 16.0b2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -53,7 +53,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: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/firefox/distinfo Fri Sep 7 12:59:35 2012 (r999) @@ -1,2 +1,2 @@ -SHA256 (firefox-15.0.source.tar.bz2) = 5416f0d6ab139846343deb86f604352d06a487ed142920613a2d2d3dd96bc789 -SIZE (firefox-15.0.source.tar.bz2) = 83713360 +SHA256 (firefox-16.0b2.source.tar.bz2) = cb578278304815992144703de1a0d85fdadcf683cb501398c668be8cef9c2be6 +SIZE (firefox-16.0b2.source.tar.bz2) = 89195582 Modified: trunk/www/firefox/files/extra-bug780531 ============================================================================== --- trunk/www/firefox/files/extra-bug780531 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/firefox/files/extra-bug780531 Fri Sep 7 12:59:35 2012 (r999) @@ -1,13 +1,12 @@ --- configure.in~ +++ configure.in -@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then +@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then MOZ_SYDNEYAUDIO=1 MOZ_CUBEB=1 MOZ_MEDIA=1 - case "$target_cpu" in -- arm*) + case "$target" in -+ arm-*-linux*) + arm*) MOZ_TREMOR=1 ;; + *-freebsd*) @@ -16,14 +15,13 @@ *) MOZ_VORBIS=1 ;; -@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV +@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then MOZ_SYDNEYAUDIO=1 MOZ_CUBEB=1 MOZ_MEDIA=1 - case "$target_cpu" in -- arm*) + case "$target" in -+ arm-*-linux*) + arm*) MOZ_TREMOR=1 ;; + *-freebsd*) Deleted: trunk/www/firefox/files/patch-bug723860 ============================================================================== --- trunk/www/firefox/files/patch-bug723860 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,54 +0,0 @@ -commit 4e07587 -Author: Matthew Gregan -Date: Wed Jun 6 17:58:07 2012 +1200 - - Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized. r=doublec ---- - content/media/gstreamer/nsGStreamerReader.cpp | 4 ++++ - content/media/ogg/nsOggReader.cpp | 3 +-- - content/media/wave/nsWaveReader.cpp | 3 +++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 164fb2e..06a09b5 100644 ---- content/media/gstreamer/nsGStreamerReader.cpp -+++ content/media/gstreamer/nsGStreamerReader.cpp -@@ -505,6 +505,10 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, - nsresult nsGStreamerReader::GetBuffered(nsTimeRanges* aBuffered, - PRInt64 aStartTime) - { -+ if (!mInfo.mHasVideo && !mInfo.mHasAudio) { -+ return NS_OK; -+ } -+ - GstFormat format = GST_FORMAT_TIME; - MediaResource* resource = mDecoder->GetResource(); - gint64 resourceLength = resource->GetLength(); -diff --git content/media/ogg/nsOggReader.cpp content/media/ogg/nsOggReader.cpp -index c6ff008..8d40e2c 100644 ---- content/media/ogg/nsOggReader.cpp -+++ content/media/ogg/nsOggReader.cpp -@@ -1532,8 +1532,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) - { - // HasAudio and HasVideo are not used here as they take a lock and cause - // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change -- // after metadata is read and GetBuffered isn't called before metadata is -- // read. -+ // after metadata is read. - if (!mInfo.mHasVideo && !mInfo.mHasAudio) { - // No need to search through the file if there are no audio or video tracks - return NS_OK; -diff --git content/media/wave/nsWaveReader.cpp content/media/wave/nsWaveReader.cpp -index 7242eb5..60fc1e1 100644 ---- content/media/wave/nsWaveReader.cpp -+++ content/media/wave/nsWaveReader.cpp -@@ -239,6 +239,9 @@ static double RoundToUsecs(double aSeconds) { - - nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) - { -+ if (!mInfo.mHasAudio) { -+ return NS_OK; -+ } - PRInt64 startOffset = mDecoder->GetResource()->GetNextCachedData(mWavePCMOffset); - while (startOffset >= 0) { - PRInt64 endOffset = mDecoder->GetResource()->GetCachedDataEnd(startOffset); Deleted: trunk/www/firefox/files/patch-bug752895 ============================================================================== --- trunk/www/firefox/files/patch-bug752895 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,71 +0,0 @@ -commit de14ddd -Author: Andrew Benton -Date: Tue Jun 12 09:10:09 2012 +0200 - - Bug 752895 - Don't try to install nspr, nss and sqlite when using system libraries. r=glandium ---- - browser/installer/Makefile.in | 8 ++++++++ - browser/installer/package-manifest.in | 6 ++++++ - 2 files changed, 14 insertions(+) - -diff --git browser/installer/Makefile.in browser/installer/Makefile.in -index 975b1f4..c791872 100644 ---- browser/installer/Makefile.in -+++ browser/installer/Makefile.in -@@ -44,6 +44,14 @@ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT)) - DEFINES += -DMOZ_GTK2=1 - endif - -+ifdef MOZ_NATIVE_NSPR -+DEFINES += -DMOZ_NATIVE_NSPR=1 -+endif -+ -+ifdef MOZ_NATIVE_NSS -+DEFINES += -DMOZ_NATIVE_NSS=1 -+endif -+ - ifdef NSS_DISABLE_DBM - DEFINES += -DNSS_DISABLE_DBM=1 - endif -diff --git browser/installer/package-manifest.in browser/installer/package-manifest.in -index 2969643..b8fddf0 100644 ---- browser/installer/package-manifest.in -+++ browser/installer/package-manifest.in -@@ -58,9 +58,11 @@ - #ifndef MOZ_STATIC_JS - @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ - #endif -+#ifndef MOZ_NATIVE_NSPR - @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ -+#endif - @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - #ifdef XP_MACOSX - @BINPATH@/XUL -@@ -109,7 +111,9 @@ - #endif - @BINPATH@/platform.ini - #ifndef XP_OS2 -+#ifndef MOZ_NATIVE_SQLITE - @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ -+#endif - #else - @BINPATH@/mozsqlt3@DLL_SUFFIX@ - #endif -@@ -583,6 +587,7 @@ - ; NSS libraries are signed in the staging directory, - ; meaning their .chk files are created there directly. - ; -+#ifndef MOZ_NATIVE_NSS - @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@ -@@ -593,6 +598,7 @@ - @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@ -+#endif - @BINPATH@/chrome/pippki@JAREXT@ - @BINPATH@/chrome/pippki.manifest - @BINPATH@/components/pipboot.xpt Modified: trunk/www/firefox/files/patch-bug753046 ============================================================================== --- trunk/www/firefox/files/patch-bug753046 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/firefox/files/patch-bug753046 Fri Sep 7 12:59:35 2012 (r999) @@ -978,57 +978,6 @@ #else long pages = sysconf(_SC_PHYS_PAGES); long page_size = sysconf(_SC_PAGE_SIZE); -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h -@@ -34,7 +34,7 @@ - #include "base/third_party/nspr/prcpucfg_win.h" - #elif defined(__APPLE__) - #include "base/third_party/nspr/prcpucfg_mac.h" --#elif defined(__linux__) || defined(ANDROID) -+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) - #include "base/third_party/nspr/prcpucfg_linux.h" - #elif defined(__OpenBSD__) - #include "base/third_party/nspr/prcpucfg_openbsd.h" -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2011-12-20 23:28:19.000000000 +0000 -+++ ipc/chromium/src/base/third_party/nspr/prtime.cc -@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp - LL_ADD(retVal, retVal, temp); - - return retVal; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_DRAGONFLY) - struct tm exp_tm = {0}; - exp_tm.tm_sec = exploded->tm_sec; - exp_tm.tm_min = exploded->tm_min; -@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp - result *= kSecondsToMicroseconds; - result += exploded->tm_usec; - return result; -+#elif defined(OS_FREEBSD) || defined(OS_NETBSD) -+ struct tm exp_tm = {0}; -+ exp_tm.tm_sec = exploded->tm_sec; -+ exp_tm.tm_min = exploded->tm_min; -+ exp_tm.tm_hour = exploded->tm_hour; -+ exp_tm.tm_mday = exploded->tm_mday; -+ exp_tm.tm_mon = exploded->tm_month; -+ exp_tm.tm_year = exploded->tm_year - 1900; -+ -+ // time_t is 64bit -+ time_t absolute_time = timegm(&exp_tm); -+ -+ PRTime result = static_cast(absolute_time); -+ result -= exploded->tm_params.tp_gmt_offset + -+ exploded->tm_params.tp_dst_offset; -+ result *= kSecondsToMicroseconds; -+ result += exploded->tm_usec; -+ return result; - #else - #error No PR_ImplodeTime implemented on your platform. - #endif diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc index abf2a56..48791f6 100644 --- ipc/chromium/src/base/time_posix.cc Deleted: trunk/www/firefox/files/patch-bug759459 ============================================================================== --- trunk/www/firefox/files/patch-bug759459 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ -commit 4d0c5b9 -Author: Marco Perez -Date: Sat Jun 9 12:24:56 2012 -0400 - - Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence ---- - js/src/gc/Memory.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp -index 815e90b..10c1a91 100644 ---- 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() Deleted: trunk/www/firefox/files/patch-bug760899 ============================================================================== --- trunk/www/firefox/files/patch-bug760899 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,54 +0,0 @@ -commit 667daed -Author: Stephen Moehle -Date: Tue Jun 5 11:32:36 2012 +1200 - - Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik - - --HG-- - extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a ---- - content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 6a50e09..164fb2e 100644 ---- content/media/gstreamer/nsGStreamerReader.cpp -+++ content/media/gstreamer/nsGStreamerReader.cpp -@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) - if (gst_element_query_duration(GST_ELEMENT(mPlayBin), - &format, &duration) && format == GST_FORMAT_TIME) { - ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor()); -- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT, - GST_TIME_ARGS (duration))); - duration = GST_TIME_AS_USECONDS (duration); - mDecoder->GetStateMachine()->SetDuration(duration); -@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, - nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen); - - if (timestamp < aTimeThreshold) { -- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT -- " threshold %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT -+ " threshold %" GST_TIME_FORMAT, - GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold))); - gst_buffer_unref(buffer); - buffer = NULL; -@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, - NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread."); - - gint64 seekPos = aTarget * GST_USECOND; -- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT, - mDecoder, GST_TIME_ARGS(seekPos))); - - if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME, -@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration() - if (gst_element_query_duration(GST_ELEMENT(mPlayBin), - &format, &duration)) { - if (format == GST_FORMAT_TIME) { -- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT, - GST_TIME_ARGS (duration))); - duration = GST_TIME_AS_USECONDS (duration); - } Deleted: trunk/www/firefox/files/patch-bug761030 ============================================================================== --- trunk/www/firefox/files/patch-bug761030 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ -commit 8bc9e15 -Author: Stephen Moehle -Date: Tue Jun 5 11:31:13 2012 +1200 - - Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik - - --HG-- - extra : rebase_source : 5e884550f9870bd2fda247d50bebd472e8368588 ---- - content/media/gstreamer/nsGStreamerReader.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 17374a3..6a50e09 100644 ---- content/media/gstreamer/nsGStreamerReader.cpp -+++ content/media/gstreamer/nsGStreamerReader.cpp -@@ -452,6 +452,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, - i, height); - b.mPlanes[i].mWidth = gst_video_format_get_component_width(format, - i, width); -+ b.mPlanes[i].mOffset = 0; -+ b.mPlanes[i].mSkip = 0; - } - - bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, Deleted: trunk/www/firefox/files/patch-bug761419 ============================================================================== --- trunk/www/firefox/files/patch-bug761419 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,22 +0,0 @@ -commit f0a73aa -Author: Paul Adenot -Date: Thu Jun 21 20:44:39 2012 -0400 - - Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik ---- - content/media/gstreamer/nsGStreamerReader.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 06a09b5..c48f92e 100644 ---- content/media/gstreamer/nsGStreamerReader.cpp -+++ content/media/gstreamer/nsGStreamerReader.cpp -@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) - * stream but that are otherwise decodeable. - */ - guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO, -- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO}; -+ static_cast(~GST_PLAY_FLAG_AUDIO), static_cast(~GST_PLAY_FLAG_VIDEO)}; - guint default_flags, current_flags; - g_object_get(mPlayBin, "flags", &default_flags, NULL); - Modified: trunk/www/firefox/files/patch-bug778056 ============================================================================== --- trunk/www/firefox/files/patch-bug778056 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/firefox/files/patch-bug778056 Fri Sep 7 12:59:35 2012 (r999) @@ -4,9 +4,9 @@ #if defined(XP_UNIX) # include // for valloc on *BSD #endif //if defined(XP_UNIX) -+#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) +# include // for malloc_usable_size -+#endif ++#endif // if defined(__FreeBSD__) #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) # define MOZALLOC_EXPORT __declspec(dllexport) Modified: trunk/www/firefox/files/patch-bug778078 ============================================================================== --- trunk/www/firefox/files/patch-bug778078 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/firefox/files/patch-bug778078 Fri Sep 7 12:59:35 2012 (r999) @@ -1,9 +1,9 @@ --- toolkit/xre/nsAppRunner.cpp~ +++ toolkit/xre/nsAppRunner.cpp -@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[] +@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[] ScopedLogging log; - #if defined(MOZ_WIDGET_GTK2) + #if defined(MOZ_WIDGET_GTK) -#ifdef MOZ_MEMORY +#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) // Disable the slice allocator, since jemalloc already uses similar layout Modified: trunk/www/firefox/files/patch-bug784776 ============================================================================== --- trunk/www/firefox/files/patch-bug784776 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/firefox/files/patch-bug784776 Fri Sep 7 12:59:35 2012 (r999) @@ -1,20 +1,3 @@ ---- content/media/MediaEngineDefault.cpp~ -+++ content/media/MediaEngineDefault.cpp -@@ -232,12 +232,12 @@ nsresult - MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID) - { - if (mState != kAllocated) { -- return NULL; -+ return 0; - } - - mTimer = do_CreateInstance(NS_TIMER_CONTRACTID); - if (!mTimer) { -- return NULL; -+ return 0; - } - - mSource = aStream; --- gfx/layers/opengl/ImageLayerOGL.cpp~ +++ gfx/layers/opengl/ImageLayerOGL.cpp @@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources() Added: trunk/www/firefox/files/patch-bug788955 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug788955 Fri Sep 7 12:59:35 2012 (r999) @@ -0,0 +1,205 @@ +diff --git Makefile.in Makefile.in +index e341462..26d19ad 100644 +--- Makefile.in ++++ Makefile.in +@@ -47,7 +47,7 @@ endif + + ifdef MOZ_MEMORY + tier_base_dirs += memory/mozjemalloc +-ifdef MOZ_JEMALLOC ++ifeq (1_,$(MOZ_JEMALLOC)_$(MOZ_NATIVE_JEMALLOC)) + tier_base_dirs += memory/jemalloc + endif + tier_base_dirs += memory/build +--- config/autoconf.mk.in ++++ config/autoconf.mk.in +@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@ + MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@ + MOZ_MEMORY = @MOZ_MEMORY@ + MOZ_JEMALLOC = @MOZ_JEMALLOC@ ++MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@ + MOZ_PROFILING = @MOZ_PROFILING@ + MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@ + MOZ_JPROF = @MOZ_JPROF@ +diff --git configure.in configure.in +index 4070d8c..3b39473 100644 +--- configure.in ++++ configure.in +@@ -3670,21 +3670,22 @@ fi + + dnl Check for the existence of various allocation headers/functions + ++MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" + MALLOC_H= +-MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) +-if test "$MALLOC_H" = ""; then +- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) +- if test "$MALLOC_H" = ""; then +- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) ++ ++for file in $MALLOC_HEADERS; do ++ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) ++ if test "$MALLOC_H" != ""; then ++ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) ++ break + fi +-fi +-if test "$MALLOC_H" != ""; then +- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) +-fi ++done + + MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" + AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) + ++AC_CHECK_FUNCS(malloc_usable_size) ++ + dnl See if compiler supports some gcc-style attributes + + AC_CACHE_CHECK(for __attribute__((always_inline)), +@@ -6902,7 +6903,21 @@ if test -z "$MOZ_MEMORY"; then + AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.]) + fi + ;; ++ *-freebsd*) ++ MOZ_JEMALLOC=1 ++ ;; + esac ++ ++ if test -n "$MOZ_JEMALLOC"; then ++ AC_CHECK_FUNCS(mallctl nallocm, ++ [MOZ_NATIVE_JEMALLOC=1 MOZ_MEMORY=1], ++ [MOZ_NATIVE_JEMALLOC= MOZ_MEMORY=]) ++ fi ++ if test -n "$MOZ_NATIVE_JEMALLOC"; then ++ AC_DEFINE(MOZ_NATIVE_JEMALLOC) ++ AC_DEFINE(MOZ_MEMORY) ++ AC_DEFINE(MOZ_JEMALLOC) ++ fi + else + dnl Don't try to run compiler tests on Windows + if test "$OS_ARCH" = "WINNT"; then +@@ -6988,6 +7003,7 @@ else + ;; + esac + fi # MOZ_MEMORY ++AC_SUBST(MOZ_NATIVE_JEMALLOC) + AC_SUBST(MOZ_MEMORY) + AC_SUBST(MOZ_JEMALLOC) + AC_SUBST(MOZ_GLUE_LDFLAGS) +@@ -8754,7 +8770,7 @@ fi + + # Run jemalloc configure script + +-if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then ++if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then + ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_" + if test "$OS_ARCH" = "Linux"; then + MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" +diff --git memory/build/Makefile.in memory/build/Makefile.in +index dca0f48..af93ee0 100644 +--- memory/build/Makefile.in ++++ memory/build/Makefile.in +@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c + + ifdef MOZ_JEMALLOC + CSRCS += mozjemalloc_compat.c ++ifndef MOZ_NATIVE_JEMALLOC + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) ++endif + else + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) + endif +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 10a845a..57245f6 100644 +--- memory/build/mozjemalloc_compat.c ++++ memory/build/mozjemalloc_compat.c +@@ -5,7 +5,15 @@ + #include "mozilla/Types.h" + #include "jemalloc_types.h" + ++#if defined(MALLOC_H) ++#include MALLOC_H /* for mallctl */ ++#endif ++ ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define je_mallctl mallctl ++#else + extern int je_mallctl(const char*, void*, size_t*, void*, size_t); ++#endif + + MOZ_EXPORT_API (void) + jemalloc_stats(jemalloc_stats_t *stats) +diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp +index 5b61050b..16bba36 100644 +--- memory/mozalloc/mozalloc.cpp ++++ memory/mozalloc/mozalloc.cpp +@@ -12,16 +12,13 @@ + #include + + #if defined(MALLOC_H) +-# include MALLOC_H // for memalign, valloc where available ++# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size + #endif // if defined(MALLOC_H) + #include // for size_t + #include // for malloc, free + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) +-#if defined(__FreeBSD__) +-# include // for malloc_usable_size +-#endif // if defined(__FreeBSD__) + + #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) + # define MOZALLOC_EXPORT __declspec(dllexport) +@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) +- // Android bionic libc doesn't have malloc_usable_size. ++#elif defined(MOZ_MEMORY) || defined(HAVE_MALLOC_USABLE_SIZE) + return malloc_usable_size(ptr); + #elif defined(XP_WIN) + return _msize(ptr); +diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h +index f0e0878..8f78123 100644 +--- memory/mozjemalloc/jemalloc.h ++++ memory/mozjemalloc/jemalloc.h +@@ -32,8 +32,8 @@ + #ifndef _JEMALLOC_H_ + #define _JEMALLOC_H_ + +-#if defined(MOZ_MEMORY_DARWIN) +-#include ++#if defined(MALLOC_H) ++#include MALLOC_H /* for malloc_good_size and nallocm */ + #endif + #include "jemalloc_types.h" + +@@ -51,7 +51,9 @@ void jemalloc_stats(jemalloc_stats_t *stats); + #if defined(MOZ_MEMORY_LINUX) + __attribute__((weak)) + #endif +-#if defined(MOZ_JEMALLOC) ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define je_nallocm nallocm ++#elif defined(MOZ_JEMALLOC) + int je_nallocm(size_t *rsize, size_t size, int flags); + #else + size_t je_malloc_good_size(size_t size); +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 7dbbbc6..0b06ad0 100644 +--- toolkit/library/Makefile.in ++++ toolkit/library/Makefile.in +@@ -346,6 +346,10 @@ EXTRA_DSO_LDOPTS += \ + $(SQLITE_LIBS) \ + $(NULL) + ++ifdef MOZ_NATIVE_JEMALLOC ++EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,memory,$(DIST)/lib) ++endif ++ + ifdef MOZ_NATIVE_JPEG + EXTRA_DSO_LDOPTS += $(MOZ_JPEG_LIBS) + endif Added: trunk/www/firefox/files/patch-config-baseconfig.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-config-baseconfig.mk Fri Sep 7 12:59:35 2012 (r999) @@ -0,0 +1,16 @@ +--- config/baseconfig.mk~ ++++ config/baseconfig.mk +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/%%MOZILLA%% ++idldir = $(datadir)/idl/%%MOZILLA%% ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't Deleted: trunk/www/firefox/files/patch-config_autoconf.mk.in ============================================================================== --- trunk/www/firefox/files/patch-config_autoconf.mk.in Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200 -+++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200 -@@ -57,14 +57,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/%%MOZILLA%% - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/%%MOZILLA%% -+sdkdir = $(libdir)/%%MOZILLA%% - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/seamonkey/Makefile Fri Sep 7 12:59:35 2012 (r999) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.12 +DISTVERSION= 2.13b1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -56,7 +56,7 @@ .include "${.CURDIR}/../../www/firefox/Makefile.options" .include -WRKSRC= ${WRKDIR}/comm-release +WRKSRC= ${WRKDIR}/comm-beta MOZSRC:= ${WRKSRC}/mozilla .if ${ARCH} == amd64 Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/seamonkey/distinfo Fri Sep 7 12:59:35 2012 (r999) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.12.source.tar.bz2) = 04f4d938a77bd651201497a768908ca75c95d44fda8adbc11f40a967f7a9605a -SIZE (seamonkey-2.12.source.tar.bz2) = 106854466 +SHA256 (seamonkey-2.13b1.source.tar.bz2) = 7469a70c29ea5e7f41cd0ca7638739a53d4aa7dd1b5745e54189a7f35607af81 +SIZE (seamonkey-2.13b1.source.tar.bz2) = 112039009 Modified: trunk/www/seamonkey/files/extra-bug780531 ============================================================================== --- trunk/www/seamonkey/files/extra-bug780531 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/seamonkey/files/extra-bug780531 Fri Sep 7 12:59:35 2012 (r999) @@ -1,13 +1,12 @@ --- mozilla/configure.in~ +++ mozilla/configure.in -@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then +@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then MOZ_SYDNEYAUDIO=1 MOZ_CUBEB=1 MOZ_MEDIA=1 - case "$target_cpu" in -- arm*) + case "$target" in -+ arm-*-linux*) + arm*) MOZ_TREMOR=1 ;; + *-freebsd*) @@ -16,14 +15,13 @@ *) MOZ_VORBIS=1 ;; -@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV +@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then MOZ_SYDNEYAUDIO=1 MOZ_CUBEB=1 MOZ_MEDIA=1 - case "$target_cpu" in -- arm*) + case "$target" in -+ arm-*-linux*) + arm*) MOZ_TREMOR=1 ;; + *-freebsd*) Deleted: trunk/www/seamonkey/files/patch-bug723860 ============================================================================== --- trunk/www/seamonkey/files/patch-bug723860 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,54 +0,0 @@ -commit 4e07587 -Author: Matthew Gregan -Date: Wed Jun 6 17:58:07 2012 +1200 - - Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized. r=doublec ---- - content/media/gstreamer/nsGStreamerReader.cpp | 4 ++++ - content/media/ogg/nsOggReader.cpp | 3 +-- - content/media/wave/nsWaveReader.cpp | 3 +++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp -index 164fb2e..06a09b5 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -505,6 +505,10 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, - nsresult nsGStreamerReader::GetBuffered(nsTimeRanges* aBuffered, - PRInt64 aStartTime) - { -+ if (!mInfo.mHasVideo && !mInfo.mHasAudio) { -+ return NS_OK; -+ } -+ - GstFormat format = GST_FORMAT_TIME; - MediaResource* resource = mDecoder->GetResource(); - gint64 resourceLength = resource->GetLength(); -diff --git mozilla/content/media/ogg/nsOggReader.cpp mozilla/content/media/ogg/nsOggReader.cpp -index c6ff008..8d40e2c 100644 ---- mozilla/content/media/ogg/nsOggReader.cpp -+++ mozilla/content/media/ogg/nsOggReader.cpp -@@ -1532,8 +1532,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) - { - // HasAudio and HasVideo are not used here as they take a lock and cause - // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change -- // after metadata is read and GetBuffered isn't called before metadata is -- // read. -+ // after metadata is read. - if (!mInfo.mHasVideo && !mInfo.mHasAudio) { - // No need to search through the file if there are no audio or video tracks - return NS_OK; -diff --git mozilla/content/media/wave/nsWaveReader.cpp mozilla/content/media/wave/nsWaveReader.cpp -index 7242eb5..60fc1e1 100644 ---- mozilla/content/media/wave/nsWaveReader.cpp -+++ mozilla/content/media/wave/nsWaveReader.cpp -@@ -239,6 +239,9 @@ static double RoundToUsecs(double aSeconds) { - - nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime) - { -+ if (!mInfo.mHasAudio) { -+ return NS_OK; -+ } - PRInt64 startOffset = mDecoder->GetResource()->GetNextCachedData(mWavePCMOffset); - while (startOffset >= 0) { - PRInt64 endOffset = mDecoder->GetResource()->GetCachedDataEnd(startOffset); Modified: trunk/www/seamonkey/files/patch-bug753046 ============================================================================== --- trunk/www/seamonkey/files/patch-bug753046 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/seamonkey/files/patch-bug753046 Fri Sep 7 12:59:35 2012 (r999) @@ -978,57 +978,6 @@ #else long pages = sysconf(_SC_PHYS_PAGES); long page_size = sysconf(_SC_PAGE_SIZE); -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-12-20 23:28:19.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h -@@ -34,7 +34,7 @@ - #include "base/third_party/nspr/prcpucfg_win.h" - #elif defined(__APPLE__) - #include "base/third_party/nspr/prcpucfg_mac.h" --#elif defined(__linux__) || defined(ANDROID) -+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) - #include "base/third_party/nspr/prcpucfg_linux.h" - #elif defined(__OpenBSD__) - #include "base/third_party/nspr/prcpucfg_openbsd.h" -$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $ - ---- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2011-12-20 23:28:19.000000000 +0000 -+++ mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc -@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp - LL_ADD(retVal, retVal, temp); - - return retVal; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_DRAGONFLY) - struct tm exp_tm = {0}; - exp_tm.tm_sec = exploded->tm_sec; - exp_tm.tm_min = exploded->tm_min; -@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp - result *= kSecondsToMicroseconds; - result += exploded->tm_usec; - return result; -+#elif defined(OS_FREEBSD) || defined(OS_NETBSD) -+ struct tm exp_tm = {0}; -+ exp_tm.tm_sec = exploded->tm_sec; -+ exp_tm.tm_min = exploded->tm_min; -+ exp_tm.tm_hour = exploded->tm_hour; -+ exp_tm.tm_mday = exploded->tm_mday; -+ exp_tm.tm_mon = exploded->tm_month; -+ exp_tm.tm_year = exploded->tm_year - 1900; -+ -+ // time_t is 64bit -+ time_t absolute_time = timegm(&exp_tm); -+ -+ PRTime result = static_cast(absolute_time); -+ result -= exploded->tm_params.tp_gmt_offset + -+ exploded->tm_params.tp_dst_offset; -+ result *= kSecondsToMicroseconds; -+ result += exploded->tm_usec; -+ return result; - #else - #error No PR_ImplodeTime implemented on your platform. - #endif diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc index abf2a56..48791f6 100644 --- mozilla/ipc/chromium/src/base/time_posix.cc Deleted: trunk/www/seamonkey/files/patch-bug759459 ============================================================================== --- trunk/www/seamonkey/files/patch-bug759459 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ -commit 4d0c5b9 -Author: Marco Perez -Date: Sat Jun 9 12:24:56 2012 -0400 - - Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence ---- - js/src/gc/Memory.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp -index 815e90b..10c1a91 100644 ---- 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() Deleted: trunk/www/seamonkey/files/patch-bug760899 ============================================================================== --- trunk/www/seamonkey/files/patch-bug760899 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,54 +0,0 @@ -commit 667daed -Author: Stephen Moehle -Date: Tue Jun 5 11:32:36 2012 +1200 - - Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik - - --HG-- - extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a ---- - content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 6a50e09..164fb2e 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) - if (gst_element_query_duration(GST_ELEMENT(mPlayBin), - &format, &duration) && format == GST_FORMAT_TIME) { - ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor()); -- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT, - GST_TIME_ARGS (duration))); - duration = GST_TIME_AS_USECONDS (duration); - mDecoder->GetStateMachine()->SetDuration(duration); -@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, - nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen); - - if (timestamp < aTimeThreshold) { -- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT -- " threshold %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT -+ " threshold %" GST_TIME_FORMAT, - GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold))); - gst_buffer_unref(buffer); - buffer = NULL; -@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget, - NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread."); - - gint64 seekPos = aTarget * GST_USECOND; -- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT, - mDecoder, GST_TIME_ARGS(seekPos))); - - if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME, -@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration() - if (gst_element_query_duration(GST_ELEMENT(mPlayBin), - &format, &duration)) { - if (format == GST_FORMAT_TIME) { -- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT, -+ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT, - GST_TIME_ARGS (duration))); - duration = GST_TIME_AS_USECONDS (duration); - } Deleted: trunk/www/seamonkey/files/patch-bug761030 ============================================================================== --- trunk/www/seamonkey/files/patch-bug761030 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,25 +0,0 @@ -commit 8bc9e15 -Author: Stephen Moehle -Date: Tue Jun 5 11:31:13 2012 +1200 - - Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik - - --HG-- - extra : rebase_source : 5e884550f9870bd2fda247d50bebd472e8368588 ---- - content/media/gstreamer/nsGStreamerReader.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp -index 17374a3..6a50e09 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -452,6 +452,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip, - i, height); - b.mPlanes[i].mWidth = gst_video_format_get_component_width(format, - i, width); -+ b.mPlanes[i].mOffset = 0; -+ b.mPlanes[i].mSkip = 0; - } - - bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, Deleted: trunk/www/seamonkey/files/patch-bug761419 ============================================================================== --- trunk/www/seamonkey/files/patch-bug761419 Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,22 +0,0 @@ -commit f0a73aa -Author: Paul Adenot -Date: Thu Jun 21 20:44:39 2012 -0400 - - Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik ---- - content/media/gstreamer/nsGStreamerReader.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp -index 06a09b5..c48f92e 100644 ---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp -+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp -@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo) - * stream but that are otherwise decodeable. - */ - guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO, -- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO}; -+ static_cast(~GST_PLAY_FLAG_AUDIO), static_cast(~GST_PLAY_FLAG_VIDEO)}; - guint default_flags, current_flags; - g_object_get(mPlayBin, "flags", &default_flags, NULL); - Modified: trunk/www/seamonkey/files/patch-bug778056 ============================================================================== --- trunk/www/seamonkey/files/patch-bug778056 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/seamonkey/files/patch-bug778056 Fri Sep 7 12:59:35 2012 (r999) @@ -4,9 +4,9 @@ #if defined(XP_UNIX) # include // for valloc on *BSD #endif //if defined(XP_UNIX) -+#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) +# include // for malloc_usable_size -+#endif ++#endif // if defined(__FreeBSD__) #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) # define MOZALLOC_EXPORT __declspec(dllexport) Modified: trunk/www/seamonkey/files/patch-bug778078 ============================================================================== --- trunk/www/seamonkey/files/patch-bug778078 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/seamonkey/files/patch-bug778078 Fri Sep 7 12:59:35 2012 (r999) @@ -1,9 +1,9 @@ --- mozilla/toolkit/xre/nsAppRunner.cpp~ +++ mozilla/toolkit/xre/nsAppRunner.cpp -@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[] +@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[] ScopedLogging log; - #if defined(MOZ_WIDGET_GTK2) + #if defined(MOZ_WIDGET_GTK) -#ifdef MOZ_MEMORY +#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) // Disable the slice allocator, since jemalloc already uses similar layout Modified: trunk/www/seamonkey/files/patch-bug784776 ============================================================================== --- trunk/www/seamonkey/files/patch-bug784776 Fri Sep 7 12:59:20 2012 (r998) +++ trunk/www/seamonkey/files/patch-bug784776 Fri Sep 7 12:59:35 2012 (r999) @@ -1,20 +1,3 @@ ---- mozilla/content/media/MediaEngineDefault.cpp~ -+++ mozilla/content/media/MediaEngineDefault.cpp -@@ -232,12 +232,12 @@ nsresult - MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID) - { - if (mState != kAllocated) { -- return NULL; -+ return 0; - } - - mTimer = do_CreateInstance(NS_TIMER_CONTRACTID); - if (!mTimer) { -- return NULL; -+ return 0; - } - - mSource = aStream; --- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~ +++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp @@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources() Added: trunk/www/seamonkey/files/patch-bug788955 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug788955 Fri Sep 7 12:59:35 2012 (r999) @@ -0,0 +1,205 @@ +diff --git Makefile.in Makefile.in +index e341462..26d19ad 100644 +--- mozilla/Makefile.in ++++ mozilla/Makefile.in +@@ -47,7 +47,7 @@ endif + + ifdef MOZ_MEMORY + tier_base_dirs += memory/mozjemalloc +-ifdef MOZ_JEMALLOC ++ifeq (1_,$(MOZ_JEMALLOC)_$(MOZ_NATIVE_JEMALLOC)) + tier_base_dirs += memory/jemalloc + endif + tier_base_dirs += memory/build +--- mozilla/config/autoconf.mk.in ++++ mozilla/config/autoconf.mk.in +@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@ + MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@ + MOZ_MEMORY = @MOZ_MEMORY@ + MOZ_JEMALLOC = @MOZ_JEMALLOC@ ++MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@ + MOZ_PROFILING = @MOZ_PROFILING@ + MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@ + MOZ_JPROF = @MOZ_JPROF@ +diff --git configure.in configure.in +index 4070d8c..3b39473 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -3670,21 +3670,22 @@ fi + + dnl Check for the existence of various allocation headers/functions + ++MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" + MALLOC_H= +-MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h]) +-if test "$MALLOC_H" = ""; then +- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h]) +- if test "$MALLOC_H" = ""; then +- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h]) ++ ++for file in $MALLOC_HEADERS; do ++ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) ++ if test "$MALLOC_H" != ""; then ++ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) ++ break + fi +-fi +-if test "$MALLOC_H" != ""; then +- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) +-fi ++done + + MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" + AC_CHECK_FUNCS(strndup posix_memalign memalign valloc) + ++AC_CHECK_FUNCS(malloc_usable_size) ++ + dnl See if compiler supports some gcc-style attributes + + AC_CACHE_CHECK(for __attribute__((always_inline)), +@@ -6902,7 +6903,21 @@ if test -z "$MOZ_MEMORY"; then + AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.]) + fi + ;; ++ *-freebsd*) ++ MOZ_JEMALLOC=1 ++ ;; + esac ++ ++ if test -n "$MOZ_JEMALLOC"; then ++ AC_CHECK_FUNCS(mallctl nallocm, ++ [MOZ_NATIVE_JEMALLOC=1 MOZ_MEMORY=1], ++ [MOZ_NATIVE_JEMALLOC= MOZ_MEMORY=]) ++ fi ++ if test -n "$MOZ_NATIVE_JEMALLOC"; then ++ AC_DEFINE(MOZ_NATIVE_JEMALLOC) ++ AC_DEFINE(MOZ_MEMORY) ++ AC_DEFINE(MOZ_JEMALLOC) ++ fi + else + dnl Don't try to run compiler tests on Windows + if test "$OS_ARCH" = "WINNT"; then +@@ -6988,6 +7003,7 @@ else + ;; + esac + fi # MOZ_MEMORY ++AC_SUBST(MOZ_NATIVE_JEMALLOC) + AC_SUBST(MOZ_MEMORY) + AC_SUBST(MOZ_JEMALLOC) + AC_SUBST(MOZ_GLUE_LDFLAGS) +@@ -8754,7 +8770,7 @@ fi + + # Run jemalloc configure script + +-if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then ++if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then + ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_" + if test "$OS_ARCH" = "Linux"; then + MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size" +diff --git memory/build/Makefile.in memory/build/Makefile.in +index dca0f48..af93ee0 100644 +--- mozilla/memory/build/Makefile.in ++++ mozilla/memory/build/Makefile.in +@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c + + ifdef MOZ_JEMALLOC + CSRCS += mozjemalloc_compat.c ++ifndef MOZ_NATIVE_JEMALLOC + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) ++endif + else + SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc) + endif +diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c +index 10a845a..57245f6 100644 +--- mozilla/memory/build/mozjemalloc_compat.c ++++ mozilla/memory/build/mozjemalloc_compat.c +@@ -5,7 +5,15 @@ + #include "mozilla/Types.h" + #include "jemalloc_types.h" + ++#if defined(MALLOC_H) ++#include MALLOC_H /* for mallctl */ ++#endif ++ ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define je_mallctl mallctl ++#else + extern int je_mallctl(const char*, void*, size_t*, void*, size_t); ++#endif + + MOZ_EXPORT_API (void) + jemalloc_stats(jemalloc_stats_t *stats) +diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp +index 5b61050b..16bba36 100644 +--- mozilla/memory/mozalloc/mozalloc.cpp ++++ mozilla/memory/mozalloc/mozalloc.cpp +@@ -12,16 +12,13 @@ + #include + + #if defined(MALLOC_H) +-# include MALLOC_H // for memalign, valloc where available ++# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size + #endif // if defined(MALLOC_H) + #include // for size_t + #include // for malloc, free + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) +-#if defined(__FreeBSD__) +-# include // for malloc_usable_size +-#endif // if defined(__FreeBSD__) + + #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) + # define MOZALLOC_EXPORT __declspec(dllexport) +@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) +- // Android bionic libc doesn't have malloc_usable_size. ++#elif defined(MOZ_MEMORY) || defined(HAVE_MALLOC_USABLE_SIZE) + return malloc_usable_size(ptr); + #elif defined(XP_WIN) + return _msize(ptr); +diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h +index f0e0878..8f78123 100644 +--- mozilla/memory/mozjemalloc/jemalloc.h ++++ mozilla/memory/mozjemalloc/jemalloc.h +@@ -32,8 +32,8 @@ + #ifndef _JEMALLOC_H_ + #define _JEMALLOC_H_ + +-#if defined(MOZ_MEMORY_DARWIN) +-#include ++#if defined(MALLOC_H) ++#include MALLOC_H /* for malloc_good_size and nallocm */ + #endif + #include "jemalloc_types.h" + +@@ -51,7 +51,9 @@ void jemalloc_stats(jemalloc_stats_t *stats); + #if defined(MOZ_MEMORY_LINUX) + __attribute__((weak)) + #endif +-#if defined(MOZ_JEMALLOC) ++#if defined(MOZ_NATIVE_JEMALLOC) ++#define je_nallocm nallocm ++#elif defined(MOZ_JEMALLOC) + int je_nallocm(size_t *rsize, size_t size, int flags); + #else + size_t je_malloc_good_size(size_t size); +diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in +index 7dbbbc6..0b06ad0 100644 +--- mozilla/toolkit/library/Makefile.in ++++ mozilla/toolkit/library/Makefile.in +@@ -346,6 +346,10 @@ EXTRA_DSO_LDOPTS += \ + $(SQLITE_LIBS) \ + $(NULL) + ++ifdef MOZ_NATIVE_JEMALLOC ++EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,memory,$(DIST)/lib) ++endif ++ + ifdef MOZ_NATIVE_JPEG + EXTRA_DSO_LDOPTS += $(MOZ_JPEG_LIBS) + endif Copied and modified: trunk/www/seamonkey/files/patch-config-autoconf.mk.in (from r998, trunk/www/firefox/files/patch-config_autoconf.mk.in) ============================================================================== Added: trunk/www/seamonkey/files/patch-config-baseconfig.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-config-baseconfig.mk Fri Sep 7 12:59:35 2012 (r999) @@ -0,0 +1,16 @@ +--- mozilla/config/baseconfig.mk~ ++++ mozilla/config/baseconfig.mk +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/%%MOZILLA%% ++idldir = $(datadir)/idl/%%MOZILLA%% ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't Deleted: trunk/www/seamonkey/files/patch-config_autoconf.mk.in ============================================================================== --- trunk/www/seamonkey/files/patch-config_autoconf.mk.in Fri Sep 7 12:59:35 2012 (r998) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- config/autoconf.mk.in.orig 2011-08-17 10:26:35.000000000 +0200 -+++ config/autoconf.mk.in 2011-08-17 10:27:16.000000000 +0200 -@@ -60,14 +60,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/%%MOZILLA%% - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/%%MOZILLA%% -+sdkdir = $(libdir)/%%MOZILLA%% - - MOZDEPTH = $(DEPTH)/mozilla - DIST = $(MOZDEPTH)/dist From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 7 12:59:50 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 F24101065679 for ; Fri, 7 Sep 2012 12:59:49 +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 811018FC0A for ; Fri, 7 Sep 2012 12:59:49 +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 q87CxmH5076238 for ; Fri, 7 Sep 2012 12:59:48 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q87Cxh88076096 for freebsd-gecko@freebsd.org; Fri, 7 Sep 2012 12:59:43 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 7 Sep 2012 12:59:43 GMT Message-Id: <201209071259.q87Cxh88076096@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] r1000 - trunk 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, 07 Sep 2012 12:59:50 -0000 Author: jbeich Date: Fri Sep 7 12:59:43 2012 New Revision: 1000 Log: add more desired items Modified: trunk/Gecko_TODO Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Fri Sep 7 12:59:35 2012 (r999) +++ trunk/Gecko_TODO Fri Sep 7 12:59:43 2012 (r1000) @@ -1,9 +1,12 @@ unassigned: +- port libxul-1.9 consumers to libxul-10, lest they be removed - implement either OSS or GStreamer backend for libcubeb +- fix audio desync issue with OSS backend in libsydneyaudio (deprecated) - port startup measurement (see bug 633193 and process_util_bsd.cc) - port WebRTC - port Gecko Profiler - port Crash Reporter +- add BlueGriffon to replace www/kompozer - switch to system libxul (needs slaves with common patches); a Debian patch to reduce configure time can be useful - integrate enigmail into thunderbird/seamonkey From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 7 13:06:40 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 11A331065670 for ; Fri, 7 Sep 2012 13:06:39 +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 7B7DF8FC1B for ; Fri, 7 Sep 2012 13:06:38 +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 q87D6cGT003368 for ; Fri, 7 Sep 2012 13:06:38 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q87D6XMa003194 for freebsd-gecko@freebsd.org; Fri, 7 Sep 2012 13:06:33 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 7 Sep 2012 13:06:33 GMT Message-Id: <201209071306.q87D6XMa003194@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] r1001 - trunk 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, 07 Sep 2012 13:06:40 -0000 Author: jbeich Date: Fri Sep 7 13:06:32 2012 New Revision: 1001 Log: reword Modified: trunk/Gecko_TODO Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Fri Sep 7 12:59:43 2012 (r1000) +++ trunk/Gecko_TODO Fri Sep 7 13:06:32 2012 (r1001) @@ -1,7 +1,7 @@ unassigned: - port libxul-1.9 consumers to libxul-10, lest they be removed - implement either OSS or GStreamer backend for libcubeb -- fix audio desync issue with OSS backend in libsydneyaudio (deprecated) +- fix pause latency issue with OSS backend in libsydneyaudio (deprecated) - port startup measurement (see bug 633193 and process_util_bsd.cc) - port WebRTC - port Gecko Profiler From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 7 19:54:26 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 AC71A1065670; Fri, 7 Sep 2012 19:54:26 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7FBDF8FC21; Fri, 7 Sep 2012 19:54:26 +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 q87JsQZR060629; Fri, 7 Sep 2012 19:54:26 GMT (envelope-from linimon@freefall.freebsd.org) Received: (from linimon@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q87JsQCo060614; Fri, 7 Sep 2012 19:54:26 GMT (envelope-from linimon) Date: Fri, 7 Sep 2012 19:54:26 GMT Message-Id: <201209071954.q87JsQCo060614@freefall.freebsd.org> To: linimon@FreeBSD.org, freebsd-bugs@FreeBSD.org, gecko@FreeBSD.org From: linimon@FreeBSD.org Cc: Subject: Re: ports/171414: [patch] www/firefox: compile error at dbus header in c++11 mode 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: Fri, 07 Sep 2012 19:54:26 -0000 Old Synopsis: [patch] compile error at dbus header in c++11 mode New Synopsis: [patch] www/firefox: compile error at dbus header in c++11 mode Responsible-Changed-From-To: freebsd-bugs->gecko Responsible-Changed-By: linimon Responsible-Changed-When: Fri Sep 7 19:53:27 UTC 2012 Responsible-Changed-Why: Fix synopsis and assign. http://www.freebsd.org/cgi/query-pr.cgi?pr=171414 From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 7 20:00:18 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 2A917106566C for ; Fri, 7 Sep 2012 20:00:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F052C8FC15 for ; Fri, 7 Sep 2012 20:00:17 +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 q87K0H38025075 for ; Fri, 7 Sep 2012 20:00:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q87K0HU5025056; Fri, 7 Sep 2012 20:00:17 GMT (envelope-from gnats) Date: Fri, 7 Sep 2012 20:00:17 GMT Message-Id: <201209072000.q87K0HU5025056@freefall.freebsd.org> To: gecko@FreeBSD.org From: Niclas Zeising Cc: Subject: Re: misc/171414: [patch] compile error at dbus header in c++11 mode X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Niclas Zeising List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Sep 2012 20:00:18 -0000 The following reply was made to PR ports/171414; it has been noted by GNATS. From: Niclas Zeising To: bug-followup@FreeBSD.org, yamayan@kbh.biglobe.ne.jp Cc: Subject: Re: misc/171414: [patch] compile error at dbus header in c++11 mode Date: Fri, 07 Sep 2012 21:56:41 +0200 This is a known problem with a known fix. I have prodded the dbus maintainer about it. Regards! -- Niclas From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 7 22:13:40 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 9EA1D106564A; Fri, 7 Sep 2012 22:13:40 +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 728908FC0A; Fri, 7 Sep 2012 22:13:40 +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 q87MDevP056151; Fri, 7 Sep 2012 22:13:40 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q87MDeuA056048; Fri, 7 Sep 2012 22:13:40 GMT (envelope-from flo) Date: Fri, 7 Sep 2012 22:13:40 GMT Message-Id: <201209072213.q87MDeuA056048@freefall.freebsd.org> To: yamayan@kbh.biglobe.ne.jp, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Cc: Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang 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: Fri, 07 Sep 2012 22:13:40 -0000 Synopsis: [patch] build www/firefox and mail/thunderbird with clang State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Fri Sep 7 22:13:39 UTC 2012 State-Changed-Why: Should be fixed by r303831 http://www.freebsd.org/cgi/query-pr.cgi?pr=171343 From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 8 00:00:17 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 C9D83106566B for ; Sat, 8 Sep 2012 00:00:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9DB508FC08 for ; Sat, 8 Sep 2012 00:00:17 +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 q8800HFX088627 for ; Sat, 8 Sep 2012 00:00:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8800HLk088614; Sat, 8 Sep 2012 00:00:17 GMT (envelope-from gnats) Date: Sat, 8 Sep 2012 00:00:17 GMT Message-Id: <201209080000.q8800HLk088614@freefall.freebsd.org> To: gecko@FreeBSD.org From: Yamaya Takashi Cc: Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Yamaya Takashi List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Sep 2012 00:00:17 -0000 The following reply was made to PR ports/171343; it has been noted by GNATS. From: Yamaya Takashi To: Jan Beich , bug-followup@FreeBSD.org Cc: Florian Smeets Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang Date: Sat, 08 Sep 2012 08:57:59 +0900 On 2012/09/05 23:30, Jan Beich wrote: > yamayan writes: > >> +CXX_NAME!= ${CXX} --version | ${AWK} 'NR == 1 { gsub(/[()]/, "", $$2); print $$2 }' > It's probably less error prone to just check for a known string. > > https://github.com/libav/libav/blob/master/configure#L2268 > > $ /usr/local/bin/clang++ | awk 'NR == 1 { gsub(/[()]/, "", $2); print $2 }' > version > > $ g++47 --version | awk 'NR == 1 { gsub(/[()]/, "", $2); print $2 }' > FreeBSD > > Compiler detection needs to be in bsd.port.mk, similar to ports/162178. > Wait for CLANG_IS_CC to become default and put pressure on portmgr@. > > This affects all ports, not only gecko. > >> +.if ${CXX_NAME} == "clang" >> +.if empty(CXXFLAGS:M-stdlib=libc++) >> +CXXFLAGS+= -stdlib=libc++ >> +.endif > Ditto for WITH_LIBCPLUSPLUS. > What do you mean? >> +CXXFLAGS+= -Wno-c++11-narrowing > Can you show where it occurs with firefox? Those in thunderbird/seamonkey > were fixed by jkim@ patch and later in upstream, too. > > https://bugzilla.mozilla.org/show_bug.cgi?id=747621 different bug!!! error log: (snip) c++ -o jscntxt.o -c -fvisibility=hidden -DENABLE_YARR_JIT=1 -DMOZ_GLUE_IN_PROGRAM -DEXPORT_JS_API -DJS_HAS_CTYPES -DDLL_PREFIX=\"lib\" -DDLL_SUFFIX=\".so\" -DNO_NSPR_10_SUPPORT -I/usr/local/lib/libffi-3.0.9/incl ude -I. -I./../../mfbt/double-conversion -I. -I. -I./../../dist/include -I./../../dist/include/nsprpub -I/usr/local/include/nspr -I. -I./assembler -I./yarr -fPIC -Qunused-arguments -isystem/usr/local/include -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/local/include -fno-rtti -Qunused-arguments -Wall -Wpointer-arith -Woverloaded-virtual -Werror=return-type -Wtype-limits -Wempty-body -Wno- ctor-dtor-privacy -Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros -Wno-c++0x-extensions -Wno-extended-offsetof -Wno-unknown-warning-option -Wno-return-type-c-linkage -O2 -pipe -Qunused-argument s -march=native -fno-strict-aliasing -std=c++11 -stdlib=libc++ -ffunction-sections -fdata-sections -pipe -DNDEBUG -DTRIMMED -O2 -fomit-frame-pointer -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 -Qu nused-arguments -isystem/usr/local/include -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/local/include -DMOZILLA_CLIENT -include ./js-confdefs.h -MD -MF .deps/jscntxt.pp /usr/ports/www/ firefox/work/mozilla-release/js/src/jscntxt.cpp In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsarray.cpp:1: /usr/ports/www/firefox/work/mozilla-release/js/src/jsarray.cpp:2290:47: error: non-constant-expression cannot be narrowed from type 'int' to 'size_t' (aka 'unsigned long') in initializer list [-Wc++11-narrowing] StringifiedElement el = { cursor, sb.length(), i }; ^~~~~~ /usr/ports/www/firefox/work/mozilla-release/js/src/jsarray.cpp:2290:47: note: override this message by inserting an explicit cast StringifiedElement el = { cursor, sb.length(), i }; ^~~~~~ (snip) >> +CXXFLAGS+= -Wno-reserved-user-defined-literal > Do you mean those occuring with DBUS and GSTREAMER? Fixing in their > respective ports would benefit all consumers, not only gecko. DBUS:yes GSTREAMER:unknown see ports/171414 >> Index: www/firefox/files/patch-js-src-configure.in > It seems to be a libc++ bug and can be worked around with a shorter patch. > > http://llvm.org/bugs/show_bug.cgi?id=13688 > No libc++ bug, but shorter patch works. For controlling visibility, use gcc_hidden.h or -fvisibility option. When no gcc bug, use gcc_hidden.h. When gcc bug, use -fvisibility option. Both clang and gcc support -fvisibility option and attribute visibility, so I think always use -fvisibility option when gcc bug or not. error log: (snip) In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsapi.cpp:1: In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsapi.cpp:45: ./jsproxy.h:17:22: error: visibility does not match previous declaration class __attribute__((visibility("default"))) BaseProxyHandler { ^ ./config/gcc_hidden.h:6:13: note: previous attribute is here #pragma GCC visibility push(hidden) ^ In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsapi.cpp:1: In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsapi.cpp:51: ./jswrapper.h:81:22: error: visibility does not match previous declaration class __attribute__((visibility("default"))) DirectWrapper : public AbstractWrapper ^ ./config/gcc_hidden.h:6:13: note: previous attribute is here #pragma GCC visibility push(hidden) ^ In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsapi.cpp:1: In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsapi.cpp:51: ./jswrapper.h:132:22: error: visibility does not match previous declaration class __attribute__((visibility("default"))) CrossCompartmentWrapper : public DirectWrapper ^ ./config/gcc_hidden.h:6:13: note: previous attribute is here #pragma GCC visibility push(hidden) ^ (snip) In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsanalyze.cpp:1: In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsanalyze.cpp:12: In file included from ./jsinferinlines.h:18: In file included from ./vm/Stack-inl.h:17: In file included from ./jsscriptinlines.h:22: In file included from ./jsscopeinlines.h:28: In file included from ./jsobjinlines.h:24: ./jsproxy.h:17:22: error: visibility does not match previous declaration class __attribute__((visibility("default"))) BaseProxyHandler { ^ ./config/gcc_hidden.h:6:13: note: previous attribute is here #pragma GCC visibility push(hidden) ^ In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsanalyze.cpp:1: In file included from /usr/ports/www/firefox/work/mozilla-release/js/src/jsanalyze.cpp:12: In file included from ./jsinferinlines.h:18: In file included from ./vm/Stack-inl.h:17: In file included from ./jsscriptinlines.h:22: In file included from ./jsscopeinlines.h:28: In file included from ./jsobjinlines.h:29: ./jswrapper.h:81:22: error: visibility does not match previous declaration class __attribute__((visibility("default"))) DirectWrapper : public AbstractWrapper ^ ./config/gcc_hidden.h:6:13: note: previous attribute is here #pragma GCC visibility push(hidden) ^ (snip) From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 8 03:52:43 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 138D1106564A for ; Sat, 8 Sep 2012 03:52:43 +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 8DD198FC08 for ; Sat, 8 Sep 2012 03:52:41 +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 q883qdGT003271 for ; Sat, 8 Sep 2012 03:52: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 q883qY4X002616 for freebsd-gecko@freebsd.org; Sat, 8 Sep 2012 03:52:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 8 Sep 2012 03:52:34 GMT Message-Id: <201209080352.q883qY4X002616@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] r1002 - in trunk: mail/thunderbird/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: Sat, 08 Sep 2012 03:52:43 -0000 Author: jbeich Date: Sat Sep 8 03:52:33 2012 New Revision: 1002 Log: sync clang3.2 fix after r999 Modified: trunk/mail/thunderbird/files/patch-bug774671 trunk/www/firefox/files/patch-bug774671 trunk/www/seamonkey/files/patch-bug774671 Modified: trunk/mail/thunderbird/files/patch-bug774671 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug774671 Fri Sep 7 13:06:32 2012 (r1001) +++ trunk/mail/thunderbird/files/patch-bug774671 Sat Sep 8 03:52:33 2012 (r1002) @@ -1,6 +1,31 @@ ---- mozilla/js/src/jsprvtd.h.orig 2012-08-25 02:31:13.000000000 +0200 -+++ mozilla/js/src/jsprvtd.h 2012-09-06 17:14:09.000000000 +0200 -@@ -149,9 +149,9 @@ +commit 7e9eda2 +Author: Rafael Ávila de Espíndola +Date: Tue Jul 17 12:54:41 2012 -0400 + + Bug 774671 - Fix mismatched declarations. r=luke. +--- + mozilla/js/src/jsproxy.h | 2 +- + mozilla/js/src/jsprvtd.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git mozilla/js/src/jsproxy.h mozilla/js/src/jsproxy.h +index ec26e3a..aa0e782 100644 +--- mozilla/js/src/jsproxy.h ++++ mozilla/js/src/jsproxy.h +@@ -13,7 +13,7 @@ + + namespace js { + +-class Wrapper; ++class JS_FRIEND_API(Wrapper); + + /* + * A proxy is a JSObject that implements generic behavior by providing custom +diff --git mozilla/js/src/jsprvtd.h mozilla/js/src/jsprvtd.h +index 19b5aef..93e1216 100644 +--- mozilla/js/src/jsprvtd.h ++++ mozilla/js/src/jsprvtd.h +@@ -146,9 +146,9 @@ struct TreeContext; class UpvarCookie; class Proxy; Modified: trunk/www/firefox/files/patch-bug774671 ============================================================================== --- trunk/www/firefox/files/patch-bug774671 Fri Sep 7 13:06:32 2012 (r1001) +++ trunk/www/firefox/files/patch-bug774671 Sat Sep 8 03:52:33 2012 (r1002) @@ -1,6 +1,31 @@ ---- js/src/jsprvtd.h.orig 2012-08-25 00:55:40.000000000 +0200 -+++ js/src/jsprvtd.h 2012-09-06 15:20:48.000000000 +0200 -@@ -149,9 +149,9 @@ +commit 7e9eda2 +Author: Rafael Ávila de Espíndola +Date: Tue Jul 17 12:54:41 2012 -0400 + + Bug 774671 - Fix mismatched declarations. r=luke. +--- + js/src/jsproxy.h | 2 +- + js/src/jsprvtd.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git js/src/jsproxy.h js/src/jsproxy.h +index ec26e3a..aa0e782 100644 +--- js/src/jsproxy.h ++++ js/src/jsproxy.h +@@ -13,7 +13,7 @@ + + namespace js { + +-class Wrapper; ++class JS_FRIEND_API(Wrapper); + + /* + * A proxy is a JSObject that implements generic behavior by providing custom +diff --git js/src/jsprvtd.h js/src/jsprvtd.h +index 19b5aef..93e1216 100644 +--- js/src/jsprvtd.h ++++ js/src/jsprvtd.h +@@ -146,9 +146,9 @@ struct TreeContext; class UpvarCookie; class Proxy; Modified: trunk/www/seamonkey/files/patch-bug774671 ============================================================================== --- trunk/www/seamonkey/files/patch-bug774671 Fri Sep 7 13:06:32 2012 (r1001) +++ trunk/www/seamonkey/files/patch-bug774671 Sat Sep 8 03:52:33 2012 (r1002) @@ -1,6 +1,31 @@ ---- mozilla/js/src/jsprvtd.h.orig 2012-08-27 06:49:16.000000000 +0200 -+++ mozilla/js/src/jsprvtd.h 2012-09-06 22:21:52.000000000 +0200 -@@ -149,9 +149,9 @@ +commit 7e9eda2 +Author: Rafael Ávila de Espíndola +Date: Tue Jul 17 12:54:41 2012 -0400 + + Bug 774671 - Fix mismatched declarations. r=luke. +--- + mozilla/js/src/jsproxy.h | 2 +- + mozilla/js/src/jsprvtd.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git mozilla/js/src/jsproxy.h mozilla/js/src/jsproxy.h +index ec26e3a..aa0e782 100644 +--- mozilla/js/src/jsproxy.h ++++ mozilla/js/src/jsproxy.h +@@ -13,7 +13,7 @@ + + namespace js { + +-class Wrapper; ++class JS_FRIEND_API(Wrapper); + + /* + * A proxy is a JSObject that implements generic behavior by providing custom +diff --git mozilla/js/src/jsprvtd.h mozilla/js/src/jsprvtd.h +index 19b5aef..93e1216 100644 +--- mozilla/js/src/jsprvtd.h ++++ mozilla/js/src/jsprvtd.h +@@ -146,9 +146,9 @@ struct TreeContext; class UpvarCookie; class Proxy; From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 8 04:57:50 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 3D51F106564A for ; Sat, 8 Sep 2012 04:57:50 +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 B88038FC08 for ; Sat, 8 Sep 2012 04:57:49 +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 q884vmp7049727 for ; Sat, 8 Sep 2012 04:57:48 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q884vhG3048568 for freebsd-gecko@freebsd.org; Sat, 8 Sep 2012 04:57:43 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 8 Sep 2012 04:57:43 GMT Message-Id: <201209080457.q884vhG3048568@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] r1003 - in trunk: 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: Sat, 08 Sep 2012 04:57:50 -0000 Author: jbeich Date: Sat Sep 8 04:57:42 2012 New Revision: 1003 Log: use lrintf() instead of casting to int in bundled libopus Affects: bug 674225 (landed in mozilla15) Added: trunk/mail/thunderbird/files/patch-bug789656 trunk/www/firefox-nightly/files/patch-bug789656 trunk/www/firefox/files/patch-bug789656 trunk/www/seamonkey/files/patch-bug789656 Added: trunk/mail/thunderbird/files/patch-bug789656 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug789656 Sat Sep 8 04:57:42 2012 (r1003) @@ -0,0 +1,11 @@ +--- mozilla/media/libopus/Makefile.in~ ++++ mozilla/media/libopus/Makefile.in +@@ -20,7 +20,7 @@ DEFINES += \ + -Drestrict= \ + $(NULL) + +-ifneq ($(filter $(OS_ARCH),Linux Darwin),) ++ifneq ($(filter $(OS_ARCH),Linux Darwin DragonFly FreeBSD NetBSD OpenBSD),) + DEFINES += -DHAVE_LRINTF + endif + ifeq ($(OS_ARCH), WINNT) Added: trunk/www/firefox-nightly/files/patch-bug789656 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug789656 Sat Sep 8 04:57:42 2012 (r1003) @@ -0,0 +1,11 @@ +--- media/libopus/Makefile.in~ ++++ media/libopus/Makefile.in +@@ -20,7 +20,7 @@ DEFINES += \ + -Drestrict= \ + $(NULL) + +-ifneq ($(filter $(OS_ARCH),Linux Darwin),) ++ifneq ($(filter $(OS_ARCH),Linux Darwin DragonFly FreeBSD NetBSD OpenBSD),) + DEFINES += -DHAVE_LRINTF + endif + ifeq ($(OS_ARCH), WINNT) Added: trunk/www/firefox/files/patch-bug789656 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug789656 Sat Sep 8 04:57:42 2012 (r1003) @@ -0,0 +1,11 @@ +--- media/libopus/Makefile.in~ ++++ media/libopus/Makefile.in +@@ -20,7 +20,7 @@ DEFINES += \ + -Drestrict= \ + $(NULL) + +-ifneq ($(filter $(OS_ARCH),Linux Darwin),) ++ifneq ($(filter $(OS_ARCH),Linux Darwin DragonFly FreeBSD NetBSD OpenBSD),) + DEFINES += -DHAVE_LRINTF + endif + ifeq ($(OS_ARCH), WINNT) Added: trunk/www/seamonkey/files/patch-bug789656 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug789656 Sat Sep 8 04:57:42 2012 (r1003) @@ -0,0 +1,11 @@ +--- mozilla/media/libopus/Makefile.in~ ++++ mozilla/media/libopus/Makefile.in +@@ -20,7 +20,7 @@ DEFINES += \ + -Drestrict= \ + $(NULL) + +-ifneq ($(filter $(OS_ARCH),Linux Darwin),) ++ifneq ($(filter $(OS_ARCH),Linux Darwin DragonFly FreeBSD NetBSD OpenBSD),) + DEFINES += -DHAVE_LRINTF + endif + ifeq ($(OS_ARCH), WINNT) From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 8 06:30:12 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 8A52A106566C for ; Sat, 8 Sep 2012 06:30:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5706C8FC14 for ; Sat, 8 Sep 2012 06:30:09 +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 q886U8Mi017279 for ; Sat, 8 Sep 2012 06:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q886U83N017265; Sat, 8 Sep 2012 06:30:08 GMT (envelope-from gnats) Date: Sat, 8 Sep 2012 06:30:08 GMT Message-Id: <201209080630.q886U83N017265@freefall.freebsd.org> To: gecko@FreeBSD.org From: Niclas Zeising Cc: Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Niclas Zeising List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Sep 2012 06:30:12 -0000 The following reply was made to PR ports/171343; it has been noted by GNATS. From: Niclas Zeising To: bug-followup@FreeBSD.org, yamayan@kbh.biglobe.ne.jp Cc: Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang Date: Sat, 08 Sep 2012 08:21:55 +0200 I can't reproduce any of this. Do you have any wierdness in your make.conf or in the port build configuration? The issues with DBUS and gstreamer are known, and I'm working with the maintainer to fix those. Regards! -- Niclas From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 8 08:51:59 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 3FDF2106566C for ; Sat, 8 Sep 2012 08:51:59 +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 C36428FC08 for ; Sat, 8 Sep 2012 08:51:58 +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 q888pvn2063185 for ; Sat, 8 Sep 2012 08:51: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 q888pq17062811 for freebsd-gecko@freebsd.org; Sat, 8 Sep 2012 08:51:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 8 Sep 2012 08:51:52 GMT Message-Id: <201209080851.q888pq17062811@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] r1004 - trunk/devel/nspr 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, 08 Sep 2012 08:51:59 -0000 Author: flo Date: Sat Sep 8 08:51:51 2012 New Revision: 1004 Log: Merge from port svn Modified: trunk/devel/nspr/Makefile Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Sat Sep 8 04:57:42 2012 (r1003) +++ trunk/devel/nspr/Makefile Sat Sep 8 08:51:51 2012 (r1004) @@ -31,6 +31,10 @@ .include +.if ${ARCH} == "arm" +BROKEN= Does not compile on arm +.endif + .if !defined(WITH_DEBUG) CONFIGURE_ARGS+=--disable-debug .endif From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 8 09:33:26 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 7FCB71065747 for ; Sat, 8 Sep 2012 09:33:26 +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 E3F8C8FC08 for ; Sat, 8 Sep 2012 09:33:25 +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 q889XO0q014162 for ; Sat, 8 Sep 2012 09:33:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q889XJSR013970 for freebsd-gecko@freebsd.org; Sat, 8 Sep 2012 09:33:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 8 Sep 2012 09:33:19 GMT Message-Id: <201209080933.q889XJSR013970@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] r1005 - trunk/Mk 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, 08 Sep 2012 09:33:26 -0000 Author: beat Date: Sat Sep 8 09:33:19 2012 New Revision: 1005 Log: - Update comments for libxul19 Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sat Sep 8 08:51:51 2012 (r1004) +++ trunk/Mk/bsd.gecko.mk Sat Sep 8 09:33:19 2012 (r1005) @@ -36,9 +36,8 @@ # Users should use the following syntax: # -# WITH_GECKO= libxul libxul-devel -# Use libxul whenever a port supports it, falling back on libxul-devel. -# Note: libxul-devel does not exist at the moment! +# WITH_GECKO= libxul libxul19 +# Use libxul whenever a port supports it, falling back on libxul19. # WITH_GECKO= libxul # Sets your preferred backend. With this example, libxul will always # be chosen, unless the port doesn't support a libxul backend. In that @@ -48,20 +47,19 @@ # # Ports should use the following: # -# USE_GECKO= libxul libxul-devel +# USE_GECKO= libxul libxul19 # The list of gecko backends that the port supports. Unless the user # overrides it with WITH_GECKO, the first gecko listed in USE_GECKO # will be the default. In the above example, www/libxul will be used -# as a gecko backend unless WITH_GECKO=libxul-devel is defined by the -# user. Note: libxul-devel does not exist at the moment! +# as a gecko backend unless WITH_GECKO=libxul19 is defined by the +# user. # -# USE_GECKO= libxul-devel<->libxul -# This will sed -e 's/libxul/libxul-devel/' on Makefile.in's and configure -# if ${GECKO}=="libxul-devel" +# USE_GECKO= libxul19<->libxul +# This will sed -e 's/libxul/libxul19/' on Makefile.in's and configure +# if ${GECKO}=="libxul19" # # Example: -# USE_GECKO= libxul libxul-devel -# Note: libxul-devel does not exist at the moment! +# USE_GECKO= libxul libxul19 # # post-patch: # @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \ @@ -71,11 +69,10 @@ # has been chosen. # # Example: -# USE_GECKO= libxul libxul-devel -# Note: libxul-devel does not exist at the moment! +# USE_GECKO= libxul libxul19 # # post-patch: -# .if ${GECKO}=="libxul-devel" +# .if ${GECKO}=="libxul19" # @${REINPLACE_CMD} -e 's|mozilla-|libxul-|' \ # ${MOZSRC}/configure # .endif From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 8 09:34:00 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 108A21065673 for ; Sat, 8 Sep 2012 09:34:00 +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 92EC78FC1A for ; Sat, 8 Sep 2012 09:33:59 +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 q889XwUM017148 for ; Sat, 8 Sep 2012 09:33:58 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q889Xrb1016979 for freebsd-gecko@freebsd.org; Sat, 8 Sep 2012 09:33:53 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 8 Sep 2012 09:33:53 GMT Message-Id: <201209080933.q889Xrb1016979@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] r1006 - trunk/www/libxul19 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, 08 Sep 2012 09:34:00 -0000 Author: beat Date: Sat Sep 8 09:33:53 2012 New Revision: 1006 Log: - Set LATEST_LINK Modified: trunk/www/libxul19/Makefile Modified: trunk/www/libxul19/Makefile ============================================================================== --- trunk/www/libxul19/Makefile Sat Sep 8 09:33:19 2012 (r1005) +++ trunk/www/libxul19/Makefile Sat Sep 8 09:33:53 2012 (r1006) @@ -21,6 +21,7 @@ GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ lib/${MOZILLA}/include lib/${MOZILLA}/lib +LATEST_LINK= libxul19 USE_AUTOTOOLS= autoconf213:env WANT_GNOME= yes WANT_PERL= yes From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 8 11:07:25 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 8D645106566B; Sat, 8 Sep 2012 11:07:25 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 606E68FC0A; Sat, 8 Sep 2012 11:07:25 +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 q88B7Pn8044093; Sat, 8 Sep 2012 11:07:25 GMT (envelope-from kwm@freefall.freebsd.org) Received: (from kwm@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q88B7Pij044009; Sat, 8 Sep 2012 11:07:25 GMT (envelope-from kwm) Date: Sat, 8 Sep 2012 11:07:25 GMT Message-Id: <201209081107.q88B7Pij044009@freefall.freebsd.org> To: yamayan@kbh.biglobe.ne.jp, kwm@FreeBSD.org, gecko@FreeBSD.org From: kwm@FreeBSD.org Cc: Subject: Re: ports/171414: [patch] www/firefox: compile error at dbus header in c++11 mode 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: Sat, 08 Sep 2012 11:07:25 -0000 Synopsis: [patch] www/firefox: compile error at dbus header in c++11 mode State-Changed-From-To: open->closed State-Changed-By: kwm State-Changed-When: Sat Sep 8 11:06:37 UTC 2012 State-Changed-Why: http://www.freebsd.org/cgi/query-pr.cgi?pr=171414 From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 8 14:30:08 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 B49D0106564A for ; Sat, 8 Sep 2012 14:30:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 98F608FC08 for ; Sat, 8 Sep 2012 14:30:08 +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 q88EU8pY014524 for ; Sat, 8 Sep 2012 14:30:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q88EU8xR014511; Sat, 8 Sep 2012 14:30:08 GMT (envelope-from gnats) Date: Sat, 8 Sep 2012 14:30:08 GMT Message-Id: <201209081430.q88EU8xR014511@freefall.freebsd.org> To: gecko@FreeBSD.org From: Yamaya Takashi Cc: Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Yamaya Takashi List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Sep 2012 14:30:08 -0000 The following reply was made to PR ports/171343; it has been noted by GNATS. From: Yamaya Takashi To: Niclas Zeising Cc: bug-followup@FreeBSD.org Subject: Re: ports/171343: [patch] build www/firefox and mail/thunderbird with clang Date: Sat, 08 Sep 2012 23:23:53 +0900 On 2012/09/08 15:21, Niclas Zeising wrote: > I can't reproduce any of this. Do you have any wierdness in your > make.conf or in the port build configuration? The issues with DBUS and > gstreamer are known, and I'm working with the maintainer to fix those. > Regards! $cat /etc/make.conf (snip) #### use libc++ .if ${CXX:T} == "c++" || ${CXX:T} == "clang++" .if empty(.CURDIR:M/usr/src*) && empty(.CURDIR:M/usr/obj*) .if !defined(OLDCXX) CXXFLAGS+= -std=c++11 .endif .if !defined(NOLIBCXX) CXXFLAGS+= -stdlib=libc++ .endif .else CXXFLAGS+= -std=c++11 -stdlib=libc++ .endif .endif (snip) $cc --version FreeBSD clang version 3.2 (trunk 162107) 20120817 Target: x86_64-unknown-freebsd10.0 Thread model: posix Before r303831: c++11-narrowing bug dbus header bug visibility bug After r303831: work around visibility bug After r303893: fix dbus header bug. Now: c++11-narrowing bug is not fixed. Patch is (pointed by Jan Beich) https://hg.mozilla.org/mozilla-central/rev/dfb4c969dc3c After patch: No build error. From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 8 14:32:34 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 17DBD106564A for ; Sat, 8 Sep 2012 14:32:34 +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 78EE28FC1C for ; Sat, 8 Sep 2012 14:32:30 +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 q88EWOra096988 for ; Sat, 8 Sep 2012 14:32:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q88EWIaB095439 for freebsd-gecko@freebsd.org; Sat, 8 Sep 2012 14:32:18 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 8 Sep 2012 14:32:18 GMT Message-Id: <201209081432.q88EWIaB095439@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] r1007 - in trunk: . 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: Sat, 08 Sep 2012 14:32:34 -0000 Author: jbeich Date: Sat Sep 8 14:32:18 2012 New Revision: 1007 Log: record process creation for telemetry Added: trunk/mail/thunderbird-esr/files/patch-bug789693 trunk/mail/thunderbird/files/patch-bug789693 trunk/www/firefox-esr/files/patch-bug789693 trunk/www/firefox-nightly/files/patch-bug789693 trunk/www/firefox/files/patch-bug789693 trunk/www/libxul/files/patch-bug789693 trunk/www/seamonkey/files/patch-bug789693 Modified: trunk/Gecko_TODO Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Sat Sep 8 09:33:53 2012 (r1006) +++ trunk/Gecko_TODO Sat Sep 8 14:32:18 2012 (r1007) @@ -2,7 +2,6 @@ - port libxul-1.9 consumers to libxul-10, lest they be removed - implement either OSS or GStreamer backend for libcubeb - fix pause latency issue with OSS backend in libsydneyaudio (deprecated) -- port startup measurement (see bug 633193 and process_util_bsd.cc) - port WebRTC - port Gecko Profiler - port Crash Reporter Added: trunk/mail/thunderbird-esr/files/patch-bug789693 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird-esr/files/patch-bug789693 Sat Sep 8 14:32:18 2012 (r1007) @@ -0,0 +1,97 @@ +--- mozilla/toolkit/components/startup/nsAppStartup.cpp ++++ mozilla/toolkit/components/startup/nsAppStartup.cpp +@@ -50,13 +50,14 @@ + #include + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include + #include + #endif + +-#ifdef __OpenBSD__ +-#include +-#include ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include + #endif + + #include "mozilla/Telemetry.h" +@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { ++#if defined(__NetBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc2), 1 }; ++#elif defined(__OpenBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; ++#else + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; ++#endif + size_t buffer_size; ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++#else + if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++#endif + return 0; + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); ++#if defined(__NetBSD__) ++ struct kinfo_proc2 *proc = (struct kinfo_proc2 *) malloc(buffer_size); ++#else ++ struct kinfo_proc *proc = (struct kinfo_proc *) malloc(buffer_size); ++#endif ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { ++#else + if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { ++#endif + free(proc); + return 0; + } ++ ++#if defined(XP_MACOSX) + PRTime starttime = static_cast(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; + starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) +- return 0; +- +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } ++#elif defined(__DragonFly__) ++ PRTime starttime = static_cast(proc->kp_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->kp_start.tv_usec; ++#elif defined(__FreeBSD__) ++ PRTime starttime = static_cast(proc->ki_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->ki_start.tv_usec; ++#else + PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; + starttime += proc->p_ustart_usec; ++#endif ++ + free(proc); + return starttime; + } Added: trunk/mail/thunderbird/files/patch-bug789693 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug789693 Sat Sep 8 14:32:18 2012 (r1007) @@ -0,0 +1,97 @@ +--- mozilla/toolkit/components/startup/nsAppStartup.cpp ++++ mozilla/toolkit/components/startup/nsAppStartup.cpp +@@ -50,13 +50,14 @@ + #include + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include + #include + #endif + +-#ifdef __OpenBSD__ +-#include +-#include ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include + #endif + + #include "mozilla/Telemetry.h" +@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { ++#if defined(__NetBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc2), 1 }; ++#elif defined(__OpenBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; ++#else + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; ++#endif + size_t buffer_size; ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++#else + if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++#endif + return 0; + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); ++#if defined(__NetBSD__) ++ struct kinfo_proc2 *proc = (struct kinfo_proc2 *) malloc(buffer_size); ++#else ++ struct kinfo_proc *proc = (struct kinfo_proc *) malloc(buffer_size); ++#endif ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { ++#else + if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { ++#endif + free(proc); + return 0; + } ++ ++#if defined(XP_MACOSX) + PRTime starttime = static_cast(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; + starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) +- return 0; +- +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } ++#elif defined(__DragonFly__) ++ PRTime starttime = static_cast(proc->kp_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->kp_start.tv_usec; ++#elif defined(__FreeBSD__) ++ PRTime starttime = static_cast(proc->ki_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->ki_start.tv_usec; ++#else + PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; + starttime += proc->p_ustart_usec; ++#endif ++ + free(proc); + return starttime; + } Added: trunk/www/firefox-esr/files/patch-bug789693 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug789693 Sat Sep 8 14:32:18 2012 (r1007) @@ -0,0 +1,97 @@ +--- toolkit/components/startup/nsAppStartup.cpp ++++ toolkit/components/startup/nsAppStartup.cpp +@@ -50,13 +50,14 @@ + #include + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include + #include + #endif + +-#ifdef __OpenBSD__ +-#include +-#include ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include + #endif + + #include "mozilla/Telemetry.h" +@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { ++#if defined(__NetBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc2), 1 }; ++#elif defined(__OpenBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; ++#else + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; ++#endif + size_t buffer_size; ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++#else + if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++#endif + return 0; + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); ++#if defined(__NetBSD__) ++ struct kinfo_proc2 *proc = (struct kinfo_proc2 *) malloc(buffer_size); ++#else ++ struct kinfo_proc *proc = (struct kinfo_proc *) malloc(buffer_size); ++#endif ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { ++#else + if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { ++#endif + free(proc); + return 0; + } ++ ++#if defined(XP_MACOSX) + PRTime starttime = static_cast(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; + starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) +- return 0; +- +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } ++#elif defined(__DragonFly__) ++ PRTime starttime = static_cast(proc->kp_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->kp_start.tv_usec; ++#elif defined(__FreeBSD__) ++ PRTime starttime = static_cast(proc->ki_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->ki_start.tv_usec; ++#else + PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; + starttime += proc->p_ustart_usec; ++#endif ++ + free(proc); + return starttime; + } Added: trunk/www/firefox-nightly/files/patch-bug789693 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug789693 Sat Sep 8 14:32:18 2012 (r1007) @@ -0,0 +1,97 @@ +--- toolkit/components/startup/nsAppStartup.cpp ++++ toolkit/components/startup/nsAppStartup.cpp +@@ -50,13 +50,14 @@ + #include + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include + #include + #endif + +-#ifdef __OpenBSD__ +-#include +-#include ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include + #endif + + #include "mozilla/Telemetry.h" +@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { ++#if defined(__NetBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc2), 1 }; ++#elif defined(__OpenBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; ++#else + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; ++#endif + size_t buffer_size; ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++#else + if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++#endif + return 0; + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); ++#if defined(__NetBSD__) ++ struct kinfo_proc2 *proc = (struct kinfo_proc2 *) malloc(buffer_size); ++#else ++ struct kinfo_proc *proc = (struct kinfo_proc *) malloc(buffer_size); ++#endif ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { ++#else + if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { ++#endif + free(proc); + return 0; + } ++ ++#if defined(XP_MACOSX) + PRTime starttime = static_cast(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; + starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) +- return 0; +- +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } ++#elif defined(__DragonFly__) ++ PRTime starttime = static_cast(proc->kp_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->kp_start.tv_usec; ++#elif defined(__FreeBSD__) ++ PRTime starttime = static_cast(proc->ki_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->ki_start.tv_usec; ++#else + PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; + starttime += proc->p_ustart_usec; ++#endif ++ + free(proc); + return starttime; + } Added: trunk/www/firefox/files/patch-bug789693 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug789693 Sat Sep 8 14:32:18 2012 (r1007) @@ -0,0 +1,97 @@ +--- toolkit/components/startup/nsAppStartup.cpp ++++ toolkit/components/startup/nsAppStartup.cpp +@@ -50,13 +50,14 @@ + #include + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include + #include + #endif + +-#ifdef __OpenBSD__ +-#include +-#include ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include + #endif + + #include "mozilla/Telemetry.h" +@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { ++#if defined(__NetBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc2), 1 }; ++#elif defined(__OpenBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; ++#else + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; ++#endif + size_t buffer_size; ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++#else + if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++#endif + return 0; + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); ++#if defined(__NetBSD__) ++ struct kinfo_proc2 *proc = (struct kinfo_proc2 *) malloc(buffer_size); ++#else ++ struct kinfo_proc *proc = (struct kinfo_proc *) malloc(buffer_size); ++#endif ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { ++#else + if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { ++#endif + free(proc); + return 0; + } ++ ++#if defined(XP_MACOSX) + PRTime starttime = static_cast(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; + starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) +- return 0; +- +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } ++#elif defined(__DragonFly__) ++ PRTime starttime = static_cast(proc->kp_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->kp_start.tv_usec; ++#elif defined(__FreeBSD__) ++ PRTime starttime = static_cast(proc->ki_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->ki_start.tv_usec; ++#else + PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; + starttime += proc->p_ustart_usec; ++#endif ++ + free(proc); + return starttime; + } Added: trunk/www/libxul/files/patch-bug789693 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug789693 Sat Sep 8 14:32:18 2012 (r1007) @@ -0,0 +1,97 @@ +--- toolkit/components/startup/nsAppStartup.cpp ++++ toolkit/components/startup/nsAppStartup.cpp +@@ -50,13 +50,14 @@ + #include + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include + #include + #endif + +-#ifdef __OpenBSD__ +-#include +-#include ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include + #endif + + #include "mozilla/Telemetry.h" +@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { ++#if defined(__NetBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc2), 1 }; ++#elif defined(__OpenBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; ++#else + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; ++#endif + size_t buffer_size; ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++#else + if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++#endif + return 0; + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); ++#if defined(__NetBSD__) ++ struct kinfo_proc2 *proc = (struct kinfo_proc2 *) malloc(buffer_size); ++#else ++ struct kinfo_proc *proc = (struct kinfo_proc *) malloc(buffer_size); ++#endif ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { ++#else + if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { ++#endif + free(proc); + return 0; + } ++ ++#if defined(XP_MACOSX) + PRTime starttime = static_cast(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; + starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) +- return 0; +- +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } ++#elif defined(__DragonFly__) ++ PRTime starttime = static_cast(proc->kp_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->kp_start.tv_usec; ++#elif defined(__FreeBSD__) ++ PRTime starttime = static_cast(proc->ki_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->ki_start.tv_usec; ++#else + PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; + starttime += proc->p_ustart_usec; ++#endif ++ + free(proc); + return starttime; + } Added: trunk/www/seamonkey/files/patch-bug789693 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug789693 Sat Sep 8 14:32:18 2012 (r1007) @@ -0,0 +1,97 @@ +--- mozilla/toolkit/components/startup/nsAppStartup.cpp ++++ mozilla/toolkit/components/startup/nsAppStartup.cpp +@@ -50,13 +50,14 @@ + #include + #endif + +-#ifdef XP_MACOSX ++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) ++#include + #include + #endif + +-#ifdef __OpenBSD__ +-#include +-#include ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include + #endif + + #include "mozilla/Telemetry.h" +@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #endif + return timestamp; + } +-#elif defined(XP_MACOSX) ++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + static PRTime + CalculateProcessCreationTimestamp() + { ++#if defined(__NetBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC2, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc2), 1 }; ++#elif defined(__OpenBSD__) ++ int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; ++#else + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; ++#endif + size_t buffer_size; ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) ++#else + if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++#endif + return 0; + +- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); ++#if defined(__NetBSD__) ++ struct kinfo_proc2 *proc = (struct kinfo_proc2 *) malloc(buffer_size); ++#else ++ struct kinfo_proc *proc = (struct kinfo_proc *) malloc(buffer_size); ++#endif ++ ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { ++#else + if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { ++#endif + free(proc); + return 0; + } ++ ++#if defined(XP_MACOSX) + PRTime starttime = static_cast(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; + starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; +- free(proc); +- return starttime; +-} +-#elif defined(__OpenBSD__) +-static PRTime +-CalculateProcessCreationTimestamp() +-{ +- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; +- size_t buffer_size; +- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) +- return 0; +- +- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); +- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } ++#elif defined(__DragonFly__) ++ PRTime starttime = static_cast(proc->kp_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->kp_start.tv_usec; ++#elif defined(__FreeBSD__) ++ PRTime starttime = static_cast(proc->ki_start.tv_sec) * PR_USEC_PER_SEC; ++ starttime += proc->ki_start.tv_usec; ++#else + PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; + starttime += proc->p_ustart_usec; ++#endif ++ + free(proc); + return starttime; + }