From owner-freebsd-gecko@FreeBSD.ORG Sun Sep 9 07:00:20 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 3CC12106564A for ; Sun, 9 Sep 2012 07:00:20 +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 27E008FC14 for ; Sun, 9 Sep 2012 07:00:20 +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 q8970Jgg065625 for ; Sun, 9 Sep 2012 07:00:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8970Jwc065611; Sun, 9 Sep 2012 07:00:19 GMT (envelope-from gnats) Date: Sun, 9 Sep 2012 07:00:19 GMT Message-Id: <201209090700.q8970Jwc065611@freefall.freebsd.org> To: gecko@FreeBSD.org From: clutton Cc: Subject: Re: ports/162075: www/firefox >= 7.0.1_2 bug with respect to pentadactyl addon X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: clutton List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Sep 2012 07:00:20 -0000 The following reply was made to PR ports/162075; it has been noted by GNATS. From: clutton To: bug-followup@FreeBSD.org, pmn@bakarika.net Cc: Subject: Re: ports/162075: www/firefox >= 7.0.1_2 bug with respect to pentadactyl addon Date: Sun, 09 Sep 2012 03:13:11 +0300 --=-uvRQdt6ZsavefrKK9QOU Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Please close that ticket. www/xpi-pentadactyl exists and works. --=-uvRQdt6ZsavefrKK9QOU Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAABAgAGBQJQS98XAAoJEKC15pvo+84RGPQH/ifvarQn9+am20mPzP9dN0fX Xsw7CDeUjDdUAwB+QdmRytCsPFzEmQ8cBnnqnpMx1Iw3F9i1y8YV1UT7Ay0KVx0c W1MBUnprroFKBT1B9A0hTtKlJIA7Eh5nfiQusV2CG7CwLsgR9liSUyp6c+bJkOvR TUw0bsojNIpc56wJ7okJAps1PrB0G974aVl0QImpNTPyqiIOfHtffwpoEvpe7OzY x/iMWbM9GqRVM5s+9AnMqyud1EU7odesH4DxM8uoAJ+ag126pJw7YlPqAeC+ILRY eAvxlsfweQR9GAT8kBgphBjbNpqaS5o6I+o6Md0K/VDTmhBWpqrhGQTNbtuTz+c= =1oza -----END PGP SIGNATURE----- --=-uvRQdt6ZsavefrKK9QOU-- From owner-freebsd-gecko@FreeBSD.ORG Mon Sep 10 11:10:46 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 111B21065672 for ; Mon, 10 Sep 2012 11:10:46 +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 EFB468FC19 for ; Mon, 10 Sep 2012 11:10:45 +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 q8ABAjct079098 for ; Mon, 10 Sep 2012 11:10:45 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8ABAina078709 for gecko@FreeBSD.org; Mon, 10 Sep 2012 11:10:44 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 10 Sep 2012 11:10:44 GMT Message-Id: <201209101110.q8ABAina078709@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, 10 Sep 2012 11:10:46 -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 -------------------------------------------------------------------------------- p ports/171255 gecko Fix www/firefox on FreeBSD 7.4/amd64 o ports/171219 gecko www/firefox-i18n russian language pack don't translate o ports/170402 gecko www/linux-firefox: crash with flashplugin o ports/170310 gecko mail/thunderbird: coredump/crash when used with OpenLD o ports/169729 gecko www/firefox-esr "make package" produces package with z o ports/169366 gecko www/xpi-* ports need re-install after each Firefox upd o ports/169241 gecko www/firefox Right mouse buttom click freeze screen o ports/168091 gecko Mk/bsd.gecko.mk error: USE_FIREFOX doesn't work correc o ports/167397 gecko mail/thunderbird-i18n Version 12.0 and freebsd 9.0: ca 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 10 11:58:09 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 4BDDE106566B for ; Mon, 10 Sep 2012 11:58:09 +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 CFE358FC0A for ; Mon, 10 Sep 2012 11:58:08 +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 q8ABw1UK071786 for ; Mon, 10 Sep 2012 11:58:01 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8ABvtn6071092 for freebsd-gecko@freebsd.org; Mon, 10 Sep 2012 11:57:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 10 Sep 2012 11:57:55 GMT Message-Id: <201209101157.q8ABvtn6071092@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] r1008 - 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: Mon, 10 Sep 2012 11:58:09 -0000 Author: beat Date: Mon Sep 10 11:57:55 2012 New Revision: 1008 Log: - Use tab instead of whitespaces Modified: trunk/www/libxul/Makefile Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Sat Sep 8 14:32:18 2012 (r1007) +++ trunk/www/libxul/Makefile Mon Sep 10 11:57:55 2012 (r1008) @@ -9,8 +9,8 @@ DISTVERSION= 10.0.7 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= firefox/releases/${DISTVERSION}esr/source -DISTNAME= firefox-${DISTVERSION}esr.source +MASTER_SITE_SUBDIR= firefox/releases/${DISTVERSION}esr/source +DISTNAME= firefox-${DISTVERSION}esr.source MAINTAINER?= gecko@FreeBSD.org COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 11 06:01:51 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 BFE241065672; Tue, 11 Sep 2012 06:01:51 +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 931C88FC15; Tue, 11 Sep 2012 06:01:51 +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 q8B61poj035421; Tue, 11 Sep 2012 06:01:51 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8B61poU035404; Tue, 11 Sep 2012 06:01:51 GMT (envelope-from edwin) Date: Tue, 11 Sep 2012 06:01:51 GMT Message-Id: <201209110601.q8B61poU035404@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/171534: www/firefox doesn't use system hunspell dictionary 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, 11 Sep 2012 06:01:51 -0000 Synopsis: www/firefox doesn't use system hunspell dictionary Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Tue Sep 11 06:01:50 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=171534 From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 11 18:38:38 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 9A0281065672 for ; Tue, 11 Sep 2012 18:38:38 +0000 (UTC) (envelope-from imb@protected-networks.net) Received: from sarah.protected-networks.net (sarah.protected-networks.net [IPv6:2001:470:1f07:4e1::1]) by mx1.freebsd.org (Postfix) with ESMTP id 6072F8FC17 for ; Tue, 11 Sep 2012 18:38:38 +0000 (UTC) Received: from toshi.auburn.protected-networks.net (toshi.auburn.protected-networks.net [202.12.127.84]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "Iain Butler", Issuer "RSA Class 2 Personal CA v2" (verified OK)) (Authenticated sender: imb@protected-networks.net) by sarah.protected-networks.net (Postfix) with ESMTPSA id BD2F86188 for ; Tue, 11 Sep 2012 14:38:37 -0400 (EDT) DomainKey-Signature: a=rsa-sha1; s=200509; d=protected-networks.net; c=nofws; q=dns; h=message-id:date:from:user-agent:mime-version:to:subject: references:in-reply-to:x-enigmail-version:openpgp: x-forwarded-message-id:content-type:content-transfer-encoding; b=XO83v3wJCCDmJ/nMVoPjTIrPbKqYzwtQ93ZrX/vXPbt0n21QQW5a82012rTCLJCXm xd7C+FO9eVzNflEq3zHK3+6qQabgPboHnHMV/67NUTk4jvVb+a8/Xdg9ci8QCyG Message-ID: <504F852C.1030100@protected-networks.net> Date: Tue, 11 Sep 2012 14:38:36 -0400 From: Michael Butler User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:15.0) Gecko/20120910 Thunderbird/15.0.1 MIME-Version: 1.0 To: gecko@freebsd.org References: <504F8364.2030501@protected-networks.net> In-Reply-To: <504F8364.2030501@protected-networks.net> X-Enigmail-Version: 1.4.3 OpenPGP: id=0442D492 X-Forwarded-Message-Id: <504F8364.2030501@protected-networks.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Subject: Fwd: libxul update breaks gecko-mediaplayer 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, 11 Sep 2012 18:38:38 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 FYI - -------- Original Message -------- Subject: libxul update breaks gecko-mediaplayer Date: Tue, 11 Sep 2012 14:31:00 -0400 From: Michael Butler To: avl@FreeBSD.org Just a "heads up" .. Apparently, the recent update to libxul 10.0.7 introduced an ABI change that breaks gecko-mediaplayer "const gchar*" versus "const gchar*&" :-( - From the compilation output: c++ -DHAVE_CONFIG_H -I. -I.. -fPIC - -DPACKAGE_LOCALE_DIR=\""/usr/local/share/locale"\" - -DPACKAGE_SRC_DIR=\""."\" -DPACKAGE_DATA_DIR=\""/usr/local/share"\" - -I/usr/local/include/libxul -fshort-wchar -I/usr/local/include/nspr - -DMOZ_NO_MOZALLOC -I/usr/local/include/glib-2.0 - -I/usr/local/include/dbus-1.0 -I/usr/local/include/dbus-1.0/include - -D_REENTRANT -I/usr/local/include/glib-2.0 -DMOZILLA_STRICT_API - -DXP_UNIX -I/usr/local/include -O2 -pipe -march=prescott - -fno-strict-aliasing -MT plugin.o -MD -MP -MF .deps/plugin.Tpo -c -o plugin.o plugin.cpp plugin.cpp: In function 'void setPreference(CPlugin*, const gchar*, const gchar*)': plugin.cpp:206: error: no matching function for call to 'nsIPrefBranch::PrefHasUserValue(const gchar*&, PRBool*)' /usr/local/include/libxul/nsIPrefBranch.h:75: note: candidates are: virtual nsresult nsIPrefBranch::PrefHasUserValue(const char*, bool*) *** [plugin.o] Error code 1 Stop in /usr/ports/www/gecko-mediaplayer/work/gecko-mediaplayer-1.0.0/src. *** [all-recursive] Error code 1 imb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (FreeBSD) iEYEARECAAYFAlBPhSwACgkQQv9rrgRC1JKsVwCgoMhZqHvu6M9rGejQcL5Rf0wM 6J8AnjJq8yd4UMSmb0UrKiWpj8Eu1UiB =R2+y -----END PGP SIGNATURE----- From owner-freebsd-gecko@FreeBSD.ORG Tue Sep 11 19:15:57 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 AD10D1065672 for ; Tue, 11 Sep 2012 19:15:57 +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 7374E8FC18 for ; Tue, 11 Sep 2012 19:15:57 +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 q8BJFsgi066349 for ; Tue, 11 Sep 2012 15:15:55 -0400 (EDT) (envelope-from andy@neu.net) Date: Tue, 11 Sep 2012 15:15:54 -0400 (EDT) From: AN To: gecko@FreeBSD.org Message-ID: User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Virus-Scanned: clamav-milter 0.97.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: Subject: nightly build fails 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, 11 Sep 2012 19:15:57 -0000 FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #19 r240241: Sat Sep 8 15:52:03 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 Built using base system clang (clang -v FreeBSD clang version 3.2 (trunk 162107) 20120817 Target: x86_64-unknown-freebsd10.0) error: error opening '.deps/jsanalyze.o.pp': Error opening output file '.deps/jsanalyze.o.pp' 7 warnings and 1 error generated. gmake[3]: *** [jsanalyze.o] Error 1 error: error opening '.deps/jsarray.o.pp': Error opening output file '.deps/jsarray.o.pp' error: error opening '.deps/jsapi.o.pp': Error opening output file '.deps/jsapi.o.pp' 7 warnings and 1 error generated. 7 warnings and 1 error generated. gmake[3]: *** [jsarray.o] Error 1 gmake[3]: *** [jsapi.o] Error 1 gmake[3]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-fdfaef738a00/js/src' gmake[2]: *** [libs_tier_js] Error 2 gmake[2]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-fdfaef738a00' gmake[1]: *** [tier_js] Error 2 gmake[1]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-fdfaef738a00' gmake: *** [default] Error 2 *** [do-build] Error code 1 Log: http://sebsauvage.net/paste/?09db54b53f03a5f8#MkAxaY0RtYxxFq44IpB4FP2QUh2MKMufPu4TEId3l1E= From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 12 07:32:47 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 3E417106566C for ; Wed, 12 Sep 2012 07:32:47 +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 D50098FC17 for ; Wed, 12 Sep 2012 07:32:46 +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 q8C7LTDp051574 for ; Wed, 12 Sep 2012 07:21:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8C7LNxF049472 for freebsd-gecko@freebsd.org; Wed, 12 Sep 2012 07:21:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 12 Sep 2012 07:21:23 GMT Message-Id: <201209120721.q8C7LNxF049472@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] r1009 - in trunk: Mk mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/firefox36/files www/libxul/files www/libxul19/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2012 07:32:47 -0000 Author: jbeich Date: Wed Sep 12 07:21:23 2012 New Revision: 1009 Log: use system dictionaries, too PR: ports/171534 Added: trunk/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/mail/thunderbird3/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/firefox-esr/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/firefox-nightly/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/firefox/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/firefox36/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp trunk/www/seamonkey/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Mon Sep 10 11:57:55 2012 (r1008) +++ trunk/Mk/bsd.gecko.mk Wed Sep 12 07:21:23 2012 (r1009) @@ -866,6 +866,10 @@ ${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp @${GREP} -lr 'PR_LoadLibrary.*\.so\.[0-9]' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -Ee '/PR_LoadLibrary/s/(\.so)\.[0-9]+/\1/' +.if ${MOZILLA} != "kompozer" + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${MOZSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp +.endif # handles mozilla pis scripts. gecko-moz-pis-patch: Added: trunk/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird-esr/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/mail/thunderbird3/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird3/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -344,6 +344,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, + NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(dictDirs)); Added: trunk/www/firefox-esr/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/www/firefox-nightly/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/www/firefox/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/www/firefox36/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox36/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -344,6 +344,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, + NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(dictDirs)); Added: trunk/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, Added: trunk/www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul19/files/patch-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -344,6 +344,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, (nsILocalFile**)&hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, + NS_GET_IID(nsISimpleEnumerator), getter_AddRefs(dictDirs)); Added: trunk/www/seamonkey/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-extensions-spellcheck-hunspell-src-mozHunspell.cpp Wed Sep 12 07:21:23 2012 (r1009) @@ -0,0 +1,15 @@ +--- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~ ++++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList() + } + } + ++ // load system hunspell dictionaries ++ nsIFile* hunDir; ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ true, &hunDir); ++ LoadDictionariesFromDir(hunDir); ++ + // find dictionaries from extensions requiring restart + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 12 07:40:19 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 570AF106566C; Wed, 12 Sep 2012 07:40:19 +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 2A2EA8FC17; Wed, 12 Sep 2012 07:40:19 +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 q8C7eJCF001621; Wed, 12 Sep 2012 07:40:19 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8C7eIPd001610; Wed, 12 Sep 2012 07:40:18 GMT (envelope-from edwin) Date: Wed, 12 Sep 2012 07:40:18 GMT Message-Id: <201209120740.q8C7eIPd001610@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/171566: www/libxul: ./jscompartment.h:394:8: error: visibility does not match previous declaration 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, 12 Sep 2012 07:40:19 -0000 Synopsis: www/libxul: ./jscompartment.h:394:8: error: visibility does not match previous declaration Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Wed Sep 12 07:40:17 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=171566 From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 12 09:14: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 EC33A1065673 for ; Wed, 12 Sep 2012 09:14:47 +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 B84448FC1B for ; Wed, 12 Sep 2012 09:14:46 +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 q8C9EjQD056258 for ; Wed, 12 Sep 2012 09:14:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8C9Eeqb053349 for freebsd-gecko@freebsd.org; Wed, 12 Sep 2012 09:14:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 12 Sep 2012 09:14:40 GMT Message-Id: <201209120914.q8C9Eeqb053349@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] r1010 - in trunk: Mk www/libxul www/libxul-esr www/libxul/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2012 09:14:48 -0000 Author: jbeich Date: Wed Sep 12 09:14:40 2012 New Revision: 1010 Log: make libxul match firefox/thunderbird naming scheme Added: trunk/www/libxul-esr/ - copied from r1009, trunk/www/libxul/ trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp - copied unchanged from r1009, trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp trunk/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in - copied unchanged from r1009, trunk/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in trunk/www/libxul/files/patch-xulrunner_installer_libxul.pc.in - copied unchanged from r1009, trunk/www/libxul/files/patch-xulrunner_installer_libxul.pc.in Replaced: trunk/www/libxul/ - copied from r1009, trunk/www/firefox/ trunk/www/libxul/Makefile - copied, changed from r1009, trunk/www/libxul/Makefile trunk/www/libxul/pkg-descr - copied unchanged from r1009, trunk/www/libxul/pkg-descr Deleted: trunk/www/libxul/Makefile.options trunk/www/libxul/Makefile.webplugins trunk/www/libxul/files/firefox.desktop.in trunk/www/libxul/files/patch-browser-app-nsBrowserApp.cpp trunk/www/libxul/pkg-message Modified: trunk/Mk/bsd.gecko.mk trunk/www/libxul-esr/Makefile Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Sep 12 07:21:23 2012 (r1009) +++ trunk/Mk/bsd.gecko.mk Wed Sep 12 09:14:40 2012 (r1010) @@ -14,7 +14,7 @@ # WITH_GECKO= libxul # # The valid backends are: -# libxul libxul19 +# libxul libxul-esr libxul19 # # See below for more details. # ======================= /USERS ================================ @@ -36,7 +36,7 @@ # Users should use the following syntax: # -# WITH_GECKO= libxul libxul19 +# WITH_GECKO= libxul libxul-esr 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 @@ -47,7 +47,7 @@ # # Ports should use the following: # -# USE_GECKO= libxul libxul19 +# USE_GECKO= libxul libxul-esr 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 @@ -59,7 +59,7 @@ # if ${GECKO}=="libxul19" # # Example: -# USE_GECKO= libxul libxul19 +# USE_GECKO= libxul libxul-esr libxul19 # # post-patch: # @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \ @@ -69,7 +69,7 @@ # has been chosen. # # Example: -# USE_GECKO= libxul libxul19 +# USE_GECKO= libxul libxul-esr libxul19 # # post-patch: # .if ${GECKO}=="libxul19" @@ -77,9 +77,10 @@ # ${MOZSRC}/configure # .endif -_GECKO_ALL= libxul libxul19 +_GECKO_ALL= libxul libxul-esr libxul19 libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so +libxul-esr_PLIST= ${LOCALBASE}/lib/libxul/libxul.so libxul19_PLIST= ${LOCALBASE}/lib/libxul/libxul.so .for gecko in ${_GECKO_ALL} Modified: trunk/www/libxul-esr/Makefile ============================================================================== --- trunk/www/libxul/Makefile Wed Sep 12 07:21:23 2012 (r1009) +++ trunk/www/libxul-esr/Makefile Wed Sep 12 09:14:40 2012 (r1010) @@ -22,7 +22,8 @@ unzip:${PORTSDIR}/archivers/unzip WRKSRC= ${WRKDIR}/mozilla-esr10 -CONFLICTS= mozilla-[0-9]* libxul-1.9.* +LATEST_LINK= libxul-esr +CONFLICTS= mozilla-[0-9]* libxul-1.9.* libxul-16.* USE_AUTOTOOLS= autoconf213:env WANT_GNOME= yes Copied and modified: trunk/www/libxul/Makefile (from r1009, trunk/www/libxul/Makefile) ============================================================================== --- trunk/www/libxul/Makefile Wed Sep 12 07:21:23 2012 (r1009, copy source) +++ trunk/www/libxul/Makefile Wed Sep 12 09:14:40 2012 (r1010) @@ -6,25 +6,27 @@ # PORTNAME= libxul -DISTVERSION= 10.0.7 +DISTVERSION= 16.0b2 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= firefox/releases/${DISTVERSION}esr/source -DISTNAME= firefox-${DISTVERSION}esr.source +MASTER_SITE_SUBDIR= firefox/releases/${DISTVERSION}/source +DISTNAME= firefox-${DISTVERSION}.source MAINTAINER?= gecko@FreeBSD.org COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps -BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ - nss>=3.13.1:${PORTSDIR}/security/nss \ - sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ +BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ + nss>=3.13.2:${PORTSDIR}/security/nss \ + sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip -WRKSRC= ${WRKDIR}/mozilla-esr10 -CONFLICTS= mozilla-[0-9]* libxul-1.9.* +WRKSRC= ${WRKDIR}/mozilla-beta +CONFLICTS= mozilla-[0-9]* libxul-1.9.* libxul-10.* USE_AUTOTOOLS= autoconf213:env +USE_PYTHON_BUILD=yes WANT_GNOME= yes USE_QT4= # empty QT_NONSTANDARD= yes @@ -49,6 +51,8 @@ MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js \ mozilla-plugin +OPTIONS_DEFINE= GSTREAMER + .include "${.CURDIR}/../../www/firefox/Makefile.options" .include @@ -71,10 +75,6 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif -.if !empty(CXX:M*clang++*) -CXXFLAGS+= -Wno-return-type-c-linkage -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/xulrunner/stub/nsXULStub.cpp Deleted: trunk/www/firefox/Makefile.options ============================================================================== --- trunk/www/firefox/Makefile.options Wed Sep 12 09:14:40 2012 (r1009) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,20 +0,0 @@ -# -*- makefile-bsdmake -*- - -OPTIONS_DEFINE+= DBUS DEBUG GNOME LIBPROXY LOGGING OPTIMIZED_CFLAGS -OPTIONS_DEFAULT+= DBUS GTK2 LOGGING OSS - -OPTIONS_SINGLE+= AUDIO -OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO - -OPTIONS_SINGLE+= TOOLKIT -OPTIONS_SINGLE_TOOLKIT= GTK2 QT4 - -OPTIONS_MULTI+= GNOME -OPTIONS_MULTI_GNOME= GCONF GIO GNOMEUI GNOMEVFS2 - -GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk -GNOMEUI_DESC?= libgnomeui support module -LIGHTNING_DESC?= Calendar extension -LOGGING_DESC?= Additional log messages -PGO_DESC?= Profile-Guided Optimization # move to bsd.options.desc.mk -LIBPROXY_DESC?= Proxy support via libproxy Deleted: trunk/www/firefox/Makefile.webplugins ============================================================================== --- trunk/www/firefox/Makefile.webplugins Wed Sep 12 09:14:40 2012 (r1009) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,230 +0,0 @@ -# -*- mode: makefile-bsdmake; tab-width: 4; -*- -# ex:ts=4 -# -# New ports collection makefile for: npapi infrastructure -# Date created: 27 June 2006 -# Whom: Andrew Pantyukhin -# -# $FreeBSD: ports/www/firefox/Makefile.webplugins,v 1.1 2009/01/10 02:45:41 mezz Exp $ -# $MCom: ports-stable/www/firefox/Makefile.webplugins,v 1.14 2008/11/12 17:55:09 mezz Exp $ -# - -# MAINTAINER= gnome@FreeBSD.org -# -# Documentation and examples: -# -# Makefile.webplugins will create symlinks automatically for each supported -# application that supports the webplugins framework. Also, it will remove -# these symlinks when the plug-in port is uninstalled. -# -# USE_WEBPLUGINS - Specify a list of applications that this plug-in -# port supports. For each of these applications, a -# symlink will be created in -# lib/browser_plugins/symlinks. See -# WEBPLUGINS_APPS_ALL_* below for the list of -# supported applications. -# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all -# applications) -# -# WEBPLUGINS_NAME - If your port installs files in ${WEBPLUGINS_DIR}, -# then you can tweak WEBPLUGINS_NAME to change the -# name of the directory -# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). -# Default: WEBPLUGINS_NAME=${PKGBASE} -# -# WEBPLUGINS_FILES - The plug-in files that are going to be linked -# in lib/browser_plugins/symlinks/*/. It cannot -# be empty or the port will set IGNORE. -# -# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be -# found. Each plug-in file in WEBPLUGINS_FILES -# must be found in WEBPLUGINS_DIR. If your port -# does not install in WEBPLUGINS_DIR, but in its own -# path, you will need to specify that here or -# symlinks will be created to non-existent files. -# Default: WEBPLUGINS_DIR=${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME} -# -# -# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any -# of the following: -# -# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.) -# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2) -# USE_WEBPLUGINS=linux (Supports linux-*) -# USE_WEBPLUGINS=opera webkit-gtk2 -# -# Example to add in Makefile and pkg-plist if the plug-in files are installled -# to WEBPLUGINS_DIR, and if your port does this manually: -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# post-install: -# ${MKDIR} ${WEBPLUGINS_DIR} -# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \ -# ${WEBPLUGINS_DIR} -# -# .include -# ------------------------------------------------------ -# -# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks -# in pkg-plist, because they will be removed automatically. -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# %%WEBPLUGINS_DIR%%/fooplugin.so -# %%WEBPLUGINS_DIR%%/fooplugin.xpi -# @dirrmtry %%WEBPLUGINS_DIR%% -# ------------------------------------------------------ -# -# Here is what it will look like when it creates the symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# ------------------------------------------------------ -# -# If your port uses libtool, and installs any *.a and *.la files, do not add -# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and -# *.xpi ONLY. -# -# Example to add in Makefile and pkg-plist if your port installs plug-ins in -# its own directory, and you need to set WEBPLUGINS_DIR. -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_DIR=${PREFIX}/lib/application -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# [...] -# -# .include -# ------------------------------------------------------ -# -# As for the pkg-plist, it should only include the actual files your -# port installs: -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# lib/application/fooplugin.a -# lib/application/fooplugin.la -# lib/application/fooplugin.so -# lib/application/fooplugin.xpi -# @dirrm lib/application -# ------------------------------------------------------ -# -# Here is what it will look like when it creates symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# ------------------------------------------------------ - -WEBPLUGINS_NAME?= ${PKGBASE} -WEBPLUGINS_FILES?= empty -WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \ - linux-flock-devel linux-mozilla \ - linux-nvu linux-opera linux-opera-devel \ - linux-seamonkey linux-seamonkey-devel \ - linux-sunbird linux-sunbird-devel -WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2 -WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \ - ${WEBPLUGINS_APPS_ALL_NATIVE} - -.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \ - ${USE_WEBPLUGINS} == "*" -USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} -.endif - -.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ - ${WEBPLUGINS_FILES} == "" -IGNORE= can't be installed: WEBPLUGINS_FILES is empty. Please, add plug-in files to it and check www/firefox/Makefile.webplugins for documentation -.endif - -.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} -_TEMP_APP_=${_TEMP_APP__} -_TEMP_FLAG_=0 -. for _TEMP_USE__ in ${USE_WEBPLUGINS} -_TEMP_USE_=${_TEMP_USE__} -. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ - ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ - ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) -_TEMP_FLAG_=1 -. endif -. endfor -. if ${_TEMP_FLAG_} -USE_WEBPLUGINS_EXP+= ${_TEMP_APP__} -. endif -.endfor - -WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} -WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} -WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} - -WEBPLUGINS_LIBDIR= ${LOCALBASE}/lib/browser_plugins -WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks -WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME} - -PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" - -_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} -_Q= 2>/dev/null || true -_WLD= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE},%D,} -_WLF= ${WEBPLUGINS_LINKFARMS:S,${LOCALBASE},%D,} -_WSD= ${WEBPLUGINS_SLDIR:S,^${LOCALBASE},%D,} - -webplugins-post-install: - @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - else \ - for _f in ${WEBPLUGINS_FILES}; do \ - if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - fi; \ - done; \ - fi; \ - for _d in ${WEBPLUGINS_LINKFARMS}; do \ - ${INSTALL} -d $${_d}; \ - for _l in ${_LNWF}; do \ - ${LN} -sf $${_l} $${_d}/ ${_Q}; \ - done; \ - done; \ - if [ "${PREFIX}" != "${LOCALBASE}" ]; then \ - ${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST}; \ - fi; \ - ${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}; \ - for _d in ${_WLF}; do \ - ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ - for _l in ${_LNWF}; do \ - ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \ - done; \ - for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \ - ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \ - done; \ - ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \ - done - @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST} - -post-install: webplugins-post-install Deleted: trunk/www/firefox/files/firefox.desktop.in ============================================================================== --- trunk/www/firefox/files/firefox.desktop.in Wed Sep 12 09:14:40 2012 (r1009) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,191 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=@MOZILLA_NAME@ Web Browser -Name[am]= -Name[ar]= -Name[az]=@MOZILLA_NAME@ Veb Səyyahı -Name[be]= -Name[bg]=Интернет браузър @MOZILLA_NAME@ -Name[bn]= -Name[bs]=@MOZILLA_NAME@ web preglednik -Name[ca]=Navegador web @MOZILLA_NAME@ -Name[cs]=Prohlížeč WWW @MOZILLA_NAME@ -Name[cy]=Y Porwr Gwe @MOZILLA_NAME@ -Name[da]=@MOZILLA_NAME@ - internetsurfning -Name[de]=@MOZILLA_NAME@ Webbrowser -Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@ -Name[en_CA]=@MOZILLA_NAME@ Web Browser -Name[en_GB]=@MOZILLA_NAME@ Web Browser -Name[es]=Navegador Web @MOZILLA_NAME@ -Name[et]=@MOZILLA_NAME@ veebibrauser -Name[eu]=@MOZILLA_NAME@ web arakatzailea -Name[fi]=@MOZILLA_NAME@, WWW-selain -Name[fr]=Navigateur Web @MOZILLA_NAME@ -Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@ -Name[gu]=એપીફની વૅબ બ્રાઉઝર -Name[he]=דפדפן @MOZILLA_NAME@ -Name[hi]= -Name[hr]=@MOZILLA_NAME@ Web preglednik -Name[hu]=@MOZILLA_NAME@ webböngésző -Name[id]=Web Browser @MOZILLA_NAME@ -Name[it]=Browser web @MOZILLA_NAME@ -Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ -Name[ko]=@MOZILLA_NAME@ 웹 브라우저 -Name[li]=@MOZILLA_NAME@ Web Browser -Name[lt]=@MOZILLA_NAME@ web naršyklė -Name[mk]=@MOZILLA_NAME@ веб прелистувач -Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസ‌ര് -Name[mn]=@MOZILLA_NAME@ веб хөтөч -Name[ms]=Pelungsur Web @MOZILLA_NAME@ -Name[nb]=@MOZILLA_NAME@ nettleser -Name[nl]=@MOZILLA_NAME@ Webbrowser -Name[nn]=@MOZILLA_NAME@ nettlesar -Name[no]=@MOZILLA_NAME@ nettleser -Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Name[pl]=Przeglądarka WWW @MOZILLA_NAME@ -Name[pt]=Navegador Web @MOZILLA_NAME@ -Name[pt_BR]=Navegador Web @MOZILLA_NAME@ -Name[ro]=Navigatorul @MOZILLA_NAME@ -Name[ru]=Веб-браузер @MOZILLA_NAME@ -Name[sk]= -Name[sl]=Spletni brskalnik @MOZILLA_NAME@ -Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web -Name[sr]= -Name[sr@Latn]=Veb čitač Spoznaja -Name[sv]=Webbläsaren @MOZILLA_NAME@ -Name[ta]=எபிபனி வலை உலாவி -Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi -Name[tr]=@MOZILLA_NAME@ Web Tarayıcı -Name[uk]=Переглядач web @MOZILLA_NAME@ -Name[vi]=Trình Duyệt Web @MOZILLA_NAME@ -Name[wa]=Betchteu waibe epiphany -Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器 -Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器 -GenericName=Web Browser -GenericName[ar]=متصفّح الانترنت -GenericName[az]=Veb Səyyahı -GenericName[be]=Вандроўнік па павуціньню -GenericName[bg]=Браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[bs]=Web preglednik -GenericName[ca]=Navegador web -GenericName[cs]=Prohlížeč WWW -GenericName[cy]=Porwr Gwe -GenericName[da]=Internetsurfning -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής Ιστοσελίδων -GenericName[en_CA]=Web Browser -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web @MOZILLA_NAME@ -GenericName[ga]=Brabhsálaí Lín -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Browser Web -GenericName[it]=Browser web -GenericName[ja]=GNOME ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[li]=Wèb Browser -GenericName[lt]=Web naršyklė -GenericName[mk]=Веб прелистувач -GenericName[mn]=Веб хөтөч -GenericName[ms]=Pelungsur Web -GenericName[nb]=Nettleser -GenericName[nl]=Web-browser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=WWW prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sq]=Shfletuesi Web -GenericName[sr]=Веб читач -GenericName[sr@Latn]=Veb čitač -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[th]=เว็บบราวเซอร์ -GenericName[tk]=Web Ahtarçysy -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Переглядач web-сторінок -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[zh_CN]=Web 浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Surf på internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте на веб -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Веб-браузер -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@ -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=@MOZILLA@ %u -Icon=@FIREFOX_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; Deleted: trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Wed Sep 12 09:14:40 2012 (r1009) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- browser/app/nsBrowserApp.cpp~ -+++ browser/app/nsBrowserApp.cpp -@@ -197,6 +197,7 @@ int main(int argc, char* argv[]) - TriggerQuirks(); - #endif - -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); - nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); - if (NS_FAILED(rv)) { - Output("Couldn't calculate the application directory.\n"); Copied: trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp (from r1009, trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Wed Sep 12 09:14:40 2012 (r1010, copy of r1009, trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp) @@ -0,0 +1,11 @@ +--- xulrunner/stub/nsXULStub.cpp~ ++++ xulrunner/stub/nsXULStub.cpp +@@ -202,6 +202,8 @@ main(int argc, char **argv) + char greDir[MAXPATHLEN]; + bool greFound = false; + ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/xulrunner", 0); ++ + #if defined(XP_MACOSX) + CFBundleRef appBundle = CFBundleGetMainBundle(); + if (!appBundle) Copied: trunk/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in (from r1009, trunk/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in Wed Sep 12 09:14:40 2012 (r1010, copy of r1009, trunk/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in) @@ -0,0 +1,9 @@ +--- xulrunner/installer/libxul-embedding.pc.in~ ++++ xulrunner/installer/libxul-embedding.pc.in +@@ -6,5 +6,5 @@ idldir=%idldir% + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% +-Libs: -L${sdkdir}/lib -lxpcomglue -ldl ++Libs: -L${sdkdir}/lib -L%%MOZ_LIBDIR%% -lxpcomglue + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% Copied: trunk/www/libxul/files/patch-xulrunner_installer_libxul.pc.in (from r1009, trunk/www/libxul/files/patch-xulrunner_installer_libxul.pc.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-xulrunner_installer_libxul.pc.in Wed Sep 12 09:14:40 2012 (r1010, copy of r1009, trunk/www/libxul/files/patch-xulrunner_installer_libxul.pc.in) @@ -0,0 +1,9 @@ +--- xulrunner/installer/libxul.pc.in.orig 2010-01-21 04:31:27.000000000 +0100 ++++ xulrunner/installer/libxul.pc.in 2010-06-21 19:39:57.000000000 +0200 +@@ -7,5 +7,5 @@ + Description: The Mozilla Runtime and Embedding Engine + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% +-Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom ++Libs: -L${sdkdir}/lib -L%%MOZ_LIBDIR%% -lxpcomglue_s -lxul -lxpcom + Cflags: -I${includedir} %WCHAR_CFLAGS% Copied: trunk/www/libxul/pkg-descr (from r1009, trunk/www/libxul/pkg-descr) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/pkg-descr Wed Sep 12 09:14:40 2012 (r1010, copy of r1009, trunk/www/libxul/pkg-descr) @@ -0,0 +1,7 @@ +Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications +that are as rich as Firefox and Thunderbird. It will provide mechanisms for +installing, upgrading, and uninstalling these applications. XULRunner will +also provide libxul, a solution which allows the embedding of Mozilla +technologies in other projects and products. + +WWW: http://developer.mozilla.org/en/docs/XULRunner Deleted: trunk/www/firefox/pkg-message ============================================================================== --- trunk/www/firefox/pkg-message Wed Sep 12 09:14:40 2012 (r1009) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,49 +0,0 @@ -====================================================================== - -smb:// issues (GNOMEVFS2 option): -Network group, machine, and share browsing does not work correctly. - -sftp:// (GNOMEVFS2 option): -Only sftp access using public key authentication works. To easily -setup public key authentication to "remote_host": - -ssh-keygen -t dsa -cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys" - -The SSH server on remote_host must allow pub key authentication. - -====================================================================== - -Firefox and HTML5 - -Certain functions used to display HTML5 elements need the sem module -on 7.x and 8.x releases. - -If your Firefox crashes with the following message while viewing a -HTML5 page: -"Bad system call (core dumped)" - -you need to load the sem module (kldload sem). - -To load sem on every boot put the following into your -/boot/loader.conf: -sem_load="YES" - -====================================================================== - -Any bug reports should be addressed to the maintainers at: - gecko@FreeBSD.org -You may also Cc: freebsd-ports@FreeBSD.org. Please do not send -bug reports to any other addresses. - -Please include the following information with any bug report: -* Output from 'uname -a'. -* Output from 'ident /usr/ports/www/firefox/Makefile' -* Where/when did the problem occur: configuring, building, or - running firefox -* How can you reproduce the problem? - -Thank you for your help in testing and reporting bugs, and we hope you -enjoy using Firefox. -The Maintainers (gecko@) -====================================================================== From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 12 09:51:17 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 EE0521065673 for ; Wed, 12 Sep 2012 09:51:16 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 8FB0F8FC1E for ; Wed, 12 Sep 2012 09:51:16 +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 q8C9pFke073610 for ; Wed, 12 Sep 2012 09:51:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8C9pAL2072479 for freebsd-gecko@freebsd.org; Wed, 12 Sep 2012 09:51:10 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 12 Sep 2012 09:51:10 GMT Message-Id: <201209120951.q8C9pAL2072479@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] r1011 - in trunk: Mk www/firefox www/seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Sep 2012 09:51:17 -0000 Author: jbeich Date: Wed Sep 12 09:51:09 2012 New Revision: 1011 Log: move remaining shared files to www/firefox Added: trunk/www/firefox/pkg-deinstall.in - copied, changed from r1010, trunk/www/seamonkey/pkg-deinstall.in trunk/www/firefox/pkg-install.in - copied, changed from r1010, trunk/www/seamonkey/pkg-install.in Deleted: trunk/www/seamonkey/pkg-deinstall.in trunk/www/seamonkey/pkg-install.in Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Sep 12 09:14:40 2012 (r1010) +++ trunk/Mk/bsd.gecko.mk Wed Sep 12 09:51:09 2012 (r1011) @@ -520,7 +520,6 @@ PLIST?= ${WRKDIR}/plist PLISTD?= ${WRKDIR}/plist_dirs PLISTF?= ${WRKDIR}/plist_files -MASTER_DIR?= ${.CURDIR}/../../www/seamonkey MOZ_PIS_DIR?= lib/${MOZILLA}/init.d @@ -529,9 +528,8 @@ MOZILLA_PLIST_DIRS?= bin lib PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall -MASTER_MOZDIR?= ${PORTSDIR}/www/seamonkey -PKGINSTALL_INC?= ${MASTER_MOZDIR}/pkg-install.in -PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in +PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/pkg-install.in +PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/pkg-deinstall.in EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ Copied and modified: trunk/www/firefox/pkg-deinstall.in (from r1010, trunk/www/seamonkey/pkg-deinstall.in) ============================================================================== Copied and modified: trunk/www/firefox/pkg-install.in (from r1010, trunk/www/seamonkey/pkg-install.in) ============================================================================== Deleted: trunk/www/seamonkey/pkg-deinstall.in ============================================================================== --- trunk/www/seamonkey/pkg-deinstall.in Wed Sep 12 09:51:09 2012 (r1010) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ -#!/bin/sh -# -# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.25 2008/07/26 19:07:07 ahze Exp $ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas () -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xDEINSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% - -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components/*.dat -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini -rm -f ${MOZDIR}/chrome/app-chrome.manifest -rm -rf ${MOZDIR}/updates -find %%MOZDIR%%/plugins/ -depth 1 -type l -delete > /dev/null 2>&1 -find %%MOZDIR%%/extensions/ -depth 1 -type l -delete > /dev/null 2>&1 - -exit 0 Deleted: trunk/www/seamonkey/pkg-install.in ============================================================================== --- trunk/www/seamonkey/pkg-install.in Wed Sep 12 09:51:09 2012 (r1010) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,38 +0,0 @@ -#!/bin/sh -# -# $MCom: ports/www/mozilla/pkg-install.in,v 1.26 2008/08/04 16:58:03 mezz Exp $ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas () -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -MOZBIN=${MOZDIR}/%%MOZILLA_BIN%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome - -echo "===> Building Chrome's registry..." -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -mkdir -p ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/component.reg - -cd ${MOZDIR} || exit 1 -if [ -f ${REGXPCOM} ]; then - ./run-mozilla.sh ${REGXPCOM} || true -fi -if [ -f ${REGCHROME} ]; then - ./run-mozilla.sh ${REGCHROME} || true -fi -if [ -f ${MOZBIN} -a "${1%-*}" = "nvu" ]; then - ./run-mozilla.sh ${MOZBIN} -register > /dev/null 2>&1 -fi -cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/extensions/ > /dev/null 2>&1 - -exit 0 From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 12 09:51:23 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 87F251065674 for ; Wed, 12 Sep 2012 09:51:23 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 0ED1E8FC21 for ; Wed, 12 Sep 2012 09:51:22 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q8C9pMT4074921 for ; Wed, 12 Sep 2012 09:51:22 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8C9pHXo074758 for freebsd-gecko@freebsd.org; Wed, 12 Sep 2012 09:51:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 12 Sep 2012 09:51:17 GMT Message-Id: <201209120951.q8C9pHXo074758@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] r1012 - 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: Wed, 12 Sep 2012 09:51:23 -0000 Author: jbeich Date: Wed Sep 12 09:51:16 2012 New Revision: 1012 Log: respect LOCALBASE when looking for system extensions /usr/local/lib/extensions /usr/local/share/extensions Not to be confused with /usr/local/lib/xpi where xpi-* ports install. Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Sep 12 09:51:09 2012 (r1011) +++ trunk/Mk/bsd.gecko.mk Wed Sep 12 09:51:16 2012 (r1012) @@ -863,6 +863,8 @@ @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \ s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ ${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp + @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \ + ${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp @${GREP} -lr 'PR_LoadLibrary.*\.so\.[0-9]' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -Ee '/PR_LoadLibrary/s/(\.so)\.[0-9]+/\1/' .if ${MOZILLA} != "kompozer" From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 12 20:45:05 2012 Return-Path: Delivered-To: freebsd-gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0F801065673 for ; Wed, 12 Sep 2012 20:45:04 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from hammer.pct.niksun.com (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AE1958FC12 for ; Wed, 12 Sep 2012 20:45:04 +0000 (UTC) Message-ID: <5050F443.6000607@FreeBSD.org> Date: Wed, 12 Sep 2012 16:44:51 -0400 From: Jung-uk Kim User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: freebsd-gecko@FreeBSD.org References: <504F8364.2030501@protected-networks.net> <504F852C.1030100@protected-networks.net> <5050F3B9.8010309@FreeBSD.org> In-Reply-To: <5050F3B9.8010309@FreeBSD.org> X-Enigmail-Version: 1.4.3 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Subject: Re: Fwd: libxul update breaks gecko-mediaplayer 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, 12 Sep 2012 20:45:05 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [Forgot to CC the list] On 2012-09-12 16:42:33 -0400, Jung-uk Kim wrote: >> Just a "heads up" .. > >> Apparently, the recent update to libxul 10.0.7 introduced an ABI >> change that breaks gecko-mediaplayer "const gchar*" versus >> "const gchar*&" :-( > >> - From the compilation output: > >> c++ -DHAVE_CONFIG_H -I. -I.. -fPIC >> -DPACKAGE_LOCALE_DIR=\""/usr/local/share/locale"\" >> -DPACKAGE_SRC_DIR=\""."\" >> -DPACKAGE_DATA_DIR=\""/usr/local/share"\" >> -I/usr/local/include/libxul -fshort-wchar >> -I/usr/local/include/nspr -DMOZ_NO_MOZALLOC >> -I/usr/local/include/glib-2.0 -I/usr/local/include/dbus-1.0 >> -I/usr/local/include/dbus-1.0/include -D_REENTRANT >> -I/usr/local/include/glib-2.0 -DMOZILLA_STRICT_API >> -DXP_UNIX -I/usr/local/include -O2 -pipe -march=prescott >> -fno-strict-aliasing -MT plugin.o -MD -MP -MF .deps/plugin.Tpo >> -c -o plugin.o plugin.cpp > >> plugin.cpp: In function 'void setPreference(CPlugin*, const >> gchar*, const gchar*)': > >> plugin.cpp:206: error: no matching function for call to >> 'nsIPrefBranch::PrefHasUserValue(const gchar*&, PRBool*)' >> /usr/local/include/libxul/nsIPrefBranch.h:75: note: candidates >> are: virtual nsresult nsIPrefBranch::PrefHasUserValue(const >> char*, bool*) *** [plugin.o] Error code 1 > >> Stop in >> /usr/ports/www/gecko-mediaplayer/work/gecko-mediaplayer-1.0.0/src. >> *** [all-recursive] Error code 1 > > I sent the attached patch to avl (maintainer). Also available from > here: > > http://people.freebsd.org/~jkim/gecko-mediaplayer.diff > > Jung-uk Kim -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAlBQ9EMACgkQmlay1b9qnVN+FwCdGZ9HRgie1UFSKRDynEziEDl6 214An1blQNauJxnr+Dl8JuflQ3Fsl+h0 =glNZ -----END PGP SIGNATURE----- From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 13 12:47:24 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 50631106564A for ; Thu, 13 Sep 2012 12:47:24 +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 E498E8FC16 for ; Thu, 13 Sep 2012 12:47:23 +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 q8DClGmO076566 for ; Thu, 13 Sep 2012 12:47: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 q8DClA8F075388 for freebsd-gecko@freebsd.org; Thu, 13 Sep 2012 12:47:10 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 13 Sep 2012 12:47:10 GMT Message-Id: <201209131247.q8DClA8F075388@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] r1013 - in trunk: Mk www/firefox www/firefox/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, 13 Sep 2012 12:47:24 -0000 Author: jbeich Date: Thu Sep 13 12:47:10 2012 New Revision: 1013 Log: move .in files under files/ directory Added: trunk/www/firefox/files/pkg-deinstall.in - copied, changed from r1012, trunk/www/firefox/pkg-deinstall.in trunk/www/firefox/files/pkg-install.in - copied, changed from r1012, trunk/www/firefox/pkg-install.in Deleted: trunk/www/firefox/pkg-deinstall.in trunk/www/firefox/pkg-install.in Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Sep 12 09:51:16 2012 (r1012) +++ trunk/Mk/bsd.gecko.mk Thu Sep 13 12:47:10 2012 (r1013) @@ -528,8 +528,8 @@ MOZILLA_PLIST_DIRS?= bin lib PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall -PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/pkg-install.in -PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/pkg-deinstall.in +PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-install.in +PKGDEINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-deinstall.in EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ Copied and modified: trunk/www/firefox/files/pkg-deinstall.in (from r1012, trunk/www/firefox/pkg-deinstall.in) ============================================================================== Copied and modified: trunk/www/firefox/files/pkg-install.in (from r1012, trunk/www/firefox/pkg-install.in) ============================================================================== Deleted: trunk/www/firefox/pkg-deinstall.in ============================================================================== --- trunk/www/firefox/pkg-deinstall.in Thu Sep 13 12:47:10 2012 (r1012) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ -#!/bin/sh -# -# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.25 2008/07/26 19:07:07 ahze Exp $ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas () -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xDEINSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% - -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components/*.dat -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini -rm -f ${MOZDIR}/chrome/app-chrome.manifest -rm -rf ${MOZDIR}/updates -find %%MOZDIR%%/plugins/ -depth 1 -type l -delete > /dev/null 2>&1 -find %%MOZDIR%%/extensions/ -depth 1 -type l -delete > /dev/null 2>&1 - -exit 0 Deleted: trunk/www/firefox/pkg-install.in ============================================================================== --- trunk/www/firefox/pkg-install.in Thu Sep 13 12:47:10 2012 (r1012) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,38 +0,0 @@ -#!/bin/sh -# -# $MCom: ports/www/mozilla/pkg-install.in,v 1.26 2008/08/04 16:58:03 mezz Exp $ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas () -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -MOZBIN=${MOZDIR}/%%MOZILLA_BIN%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome - -echo "===> Building Chrome's registry..." -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -mkdir -p ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/component.reg - -cd ${MOZDIR} || exit 1 -if [ -f ${REGXPCOM} ]; then - ./run-mozilla.sh ${REGXPCOM} || true -fi -if [ -f ${REGCHROME} ]; then - ./run-mozilla.sh ${REGCHROME} || true -fi -if [ -f ${MOZBIN} -a "${1%-*}" = "nvu" ]; then - ./run-mozilla.sh ${MOZBIN} -register > /dev/null 2>&1 -fi -cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/extensions/ > /dev/null 2>&1 - -exit 0 From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 13 12:47:28 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 D85861065670 for ; Thu, 13 Sep 2012 12:47: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 3FC148FC15 for ; Thu, 13 Sep 2012 12:47: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 q8DClRYi079745 for ; Thu, 13 Sep 2012 12:47: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 q8DClMbK077674 for freebsd-gecko@freebsd.org; Thu, 13 Sep 2012 12:47:22 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 13 Sep 2012 12:47:22 GMT Message-Id: <201209131247.q8DClMbK077674@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] r1014 - in trunk: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul-esr/files www/libxul/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2012 12:47:28 -0000 Author: jbeich Date: Thu Sep 13 12:47:21 2012 New Revision: 1014 Log: sync with bug 789693 Modified: 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-esr/files/patch-bug789693 trunk/www/libxul/files/patch-bug789693 trunk/www/seamonkey/files/patch-bug789693 Modified: trunk/mail/thunderbird-esr/files/patch-bug789693 ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-bug789693 Thu Sep 13 12:47:10 2012 (r1013) +++ trunk/mail/thunderbird-esr/files/patch-bug789693 Thu Sep 13 12:47:21 2012 (r1014) @@ -1,6 +1,6 @@ --- mozilla/toolkit/components/startup/nsAppStartup.cpp +++ mozilla/toolkit/components/startup/nsAppStartup.cpp -@@ -50,13 +50,14 @@ +@@ -50,17 +50,40 @@ #include #endif @@ -19,7 +19,33 @@ #endif #include "mozilla/Telemetry.h" -@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + using namespace mozilla; +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() #endif return timestamp; } @@ -29,41 +55,29 @@ 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; -+ +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), +#if defined(__NetBSD__) || defined(__OpenBSD__) -+ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) -+#else - if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++ sizeof(KINFO_PROC), ++ 1, +#endif - return 0; ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[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; +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- 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; -} @@ -74,24 +88,21 @@ - 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; -- ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &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); +- PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; return starttime; } + #else Modified: trunk/mail/thunderbird/files/patch-bug789693 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug789693 Thu Sep 13 12:47:10 2012 (r1013) +++ trunk/mail/thunderbird/files/patch-bug789693 Thu Sep 13 12:47:21 2012 (r1014) @@ -1,6 +1,6 @@ --- mozilla/toolkit/components/startup/nsAppStartup.cpp +++ mozilla/toolkit/components/startup/nsAppStartup.cpp -@@ -50,13 +50,14 @@ +@@ -50,18 +50,41 @@ #include #endif @@ -19,7 +19,34 @@ #endif #include "mozilla/Telemetry.h" -@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #include "mozilla/StartupTimeline.h" + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + #define kPrefLastSuccess "toolkit.startup.last_success" +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() #endif return timestamp; } @@ -29,41 +56,29 @@ 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; -+ +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), +#if defined(__NetBSD__) || defined(__OpenBSD__) -+ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) -+#else - if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++ sizeof(KINFO_PROC), ++ 1, +#endif - return 0; ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[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; +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- 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; -} @@ -74,24 +89,21 @@ - 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; -- ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &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); +- PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; return starttime; } + #else Modified: trunk/www/firefox-esr/files/patch-bug789693 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug789693 Thu Sep 13 12:47:10 2012 (r1013) +++ trunk/www/firefox-esr/files/patch-bug789693 Thu Sep 13 12:47:21 2012 (r1014) @@ -1,6 +1,6 @@ --- toolkit/components/startup/nsAppStartup.cpp +++ toolkit/components/startup/nsAppStartup.cpp -@@ -50,13 +50,14 @@ +@@ -50,17 +50,40 @@ #include #endif @@ -19,7 +19,33 @@ #endif #include "mozilla/Telemetry.h" -@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + using namespace mozilla; +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() #endif return timestamp; } @@ -29,41 +55,29 @@ 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; -+ +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), +#if defined(__NetBSD__) || defined(__OpenBSD__) -+ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) -+#else - if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++ sizeof(KINFO_PROC), ++ 1, +#endif - return 0; ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[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; +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- 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; -} @@ -74,24 +88,21 @@ - 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; -- ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &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); +- PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; return starttime; } + #else Modified: trunk/www/firefox-nightly/files/patch-bug789693 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug789693 Thu Sep 13 12:47:10 2012 (r1013) +++ trunk/www/firefox-nightly/files/patch-bug789693 Thu Sep 13 12:47:21 2012 (r1014) @@ -1,6 +1,6 @@ --- toolkit/components/startup/nsAppStartup.cpp +++ toolkit/components/startup/nsAppStartup.cpp -@@ -50,13 +50,14 @@ +@@ -50,18 +50,41 @@ #include #endif @@ -19,7 +19,34 @@ #endif #include "mozilla/Telemetry.h" -@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #include "mozilla/StartupTimeline.h" + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + #define kPrefLastSuccess "toolkit.startup.last_success" +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() #endif return timestamp; } @@ -29,41 +56,29 @@ 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; -+ +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), +#if defined(__NetBSD__) || defined(__OpenBSD__) -+ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) -+#else - if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++ sizeof(KINFO_PROC), ++ 1, +#endif - return 0; ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[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; +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- 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; -} @@ -74,24 +89,21 @@ - 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; -- ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &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); +- PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; return starttime; } + #else Modified: trunk/www/firefox/files/patch-bug789693 ============================================================================== --- trunk/www/firefox/files/patch-bug789693 Thu Sep 13 12:47:10 2012 (r1013) +++ trunk/www/firefox/files/patch-bug789693 Thu Sep 13 12:47:21 2012 (r1014) @@ -1,6 +1,6 @@ --- toolkit/components/startup/nsAppStartup.cpp +++ toolkit/components/startup/nsAppStartup.cpp -@@ -50,13 +50,14 @@ +@@ -50,18 +50,41 @@ #include #endif @@ -19,7 +19,34 @@ #endif #include "mozilla/Telemetry.h" -@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #include "mozilla/StartupTimeline.h" + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + #define kPrefLastSuccess "toolkit.startup.last_success" +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() #endif return timestamp; } @@ -29,41 +56,29 @@ 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; -+ +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), +#if defined(__NetBSD__) || defined(__OpenBSD__) -+ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) -+#else - if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++ sizeof(KINFO_PROC), ++ 1, +#endif - return 0; ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[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; +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- 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; -} @@ -74,24 +89,21 @@ - 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; -- ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &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); +- PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; return starttime; } + #else Modified: trunk/www/libxul-esr/files/patch-bug789693 ============================================================================== --- trunk/www/libxul-esr/files/patch-bug789693 Thu Sep 13 12:47:10 2012 (r1013) +++ trunk/www/libxul-esr/files/patch-bug789693 Thu Sep 13 12:47:21 2012 (r1014) @@ -1,6 +1,6 @@ --- toolkit/components/startup/nsAppStartup.cpp +++ toolkit/components/startup/nsAppStartup.cpp -@@ -50,13 +50,14 @@ +@@ -50,17 +50,40 @@ #include #endif @@ -19,7 +19,33 @@ #endif #include "mozilla/Telemetry.h" -@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + using namespace mozilla; +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() #endif return timestamp; } @@ -29,41 +55,29 @@ 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; -+ +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), +#if defined(__NetBSD__) || defined(__OpenBSD__) -+ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) -+#else - if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++ sizeof(KINFO_PROC), ++ 1, +#endif - return 0; ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[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; +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- 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; -} @@ -74,24 +88,21 @@ - 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; -- ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &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); +- PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; return starttime; } + #else Modified: trunk/www/libxul/files/patch-bug789693 ============================================================================== --- trunk/www/libxul/files/patch-bug789693 Thu Sep 13 12:47:10 2012 (r1013) +++ trunk/www/libxul/files/patch-bug789693 Thu Sep 13 12:47:21 2012 (r1014) @@ -1,6 +1,6 @@ --- toolkit/components/startup/nsAppStartup.cpp +++ toolkit/components/startup/nsAppStartup.cpp -@@ -50,13 +50,14 @@ +@@ -50,18 +50,41 @@ #include #endif @@ -19,7 +19,34 @@ #endif #include "mozilla/Telemetry.h" -@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #include "mozilla/StartupTimeline.h" + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + #define kPrefLastSuccess "toolkit.startup.last_success" +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() #endif return timestamp; } @@ -29,41 +56,29 @@ 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; -+ +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), +#if defined(__NetBSD__) || defined(__OpenBSD__) -+ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) -+#else - if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++ sizeof(KINFO_PROC), ++ 1, +#endif - return 0; ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[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; +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- 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; -} @@ -74,24 +89,21 @@ - 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; -- ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &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); +- PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; return starttime; } + #else Modified: trunk/www/seamonkey/files/patch-bug789693 ============================================================================== --- trunk/www/seamonkey/files/patch-bug789693 Thu Sep 13 12:47:10 2012 (r1013) +++ trunk/www/seamonkey/files/patch-bug789693 Thu Sep 13 12:47:21 2012 (r1014) @@ -1,6 +1,6 @@ --- mozilla/toolkit/components/startup/nsAppStartup.cpp +++ mozilla/toolkit/components/startup/nsAppStartup.cpp -@@ -50,13 +50,14 @@ +@@ -50,18 +50,41 @@ #include #endif @@ -19,7 +19,34 @@ #endif #include "mozilla/Telemetry.h" -@@ -836,41 +837,56 @@ CalculateProcessCreationTimestamp() + #include "mozilla/StartupTimeline.h" + ++#if defined(__NetBSD__) ++#undef KERN_PROC ++#define KERN_PROC KERN_PROC2 ++#define KINFO_PROC struct kinfo_proc2 ++#else ++#define KINFO_PROC struct kinfo_proc ++#endif ++ ++#if defined(XP_MACOSX) ++#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec ++#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec ++#elif defined(__DragonFly__) ++#define KP_START_SEC kp_start.tv_sec ++#define KP_START_USEC kp_start.tv_usec ++#elif defined(__FreeBSD__) ++#define KP_START_SEC ki_start.tv_sec ++#define KP_START_USEC ki_start.tv_usec ++#else ++#define KP_START_SEC p_ustart_sec ++#define KP_START_USEC p_ustart_usec ++#endif ++ + static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); + + #define kPrefLastSuccess "toolkit.startup.last_success" +@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() #endif return timestamp; } @@ -29,41 +56,29 @@ 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; -+ +- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; +- size_t buffer_size; +- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) +- return 0; ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_PID, ++ getpid(), +#if defined(__NetBSD__) || defined(__OpenBSD__) -+ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) -+#else - if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) ++ sizeof(KINFO_PROC), ++ 1, +#endif - return 0; ++ }; ++ u_int miblen = sizeof(mib) / sizeof(mib[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; +- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { +- free(proc); +- return 0; +- } +- 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; -} @@ -74,24 +89,21 @@ - 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; -- ++ KINFO_PROC proc; ++ size_t buffer_size = sizeof(proc); ++ if (sysctl(mib, miblen, &proc, &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); +- PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; +- starttime += proc->p_ustart_usec; +- free(proc); ++ PRTime starttime = static_cast(proc.KP_START_SEC) * PR_USEC_PER_SEC; ++ starttime += proc.KP_START_USEC; return starttime; } + #else From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 13 12:47:37 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 52242106564A for ; Thu, 13 Sep 2012 12:47:37 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id E85C98FC08 for ; Thu, 13 Sep 2012 12:47:36 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q8DClZa3082399 for ; Thu, 13 Sep 2012 12:47:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8DClUnk080683 for freebsd-gecko@freebsd.org; Thu, 13 Sep 2012 12:47:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 13 Sep 2012 12:47:30 GMT Message-Id: <201209131247.q8DClUnk080683@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] r1015 - in trunk/www: firefox-nightly firefox-nightly/files libxul seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2012 12:47:37 -0000 Author: jbeich Date: Thu Sep 13 12:47:30 2012 New Revision: 1015 Log: update Deleted: trunk/www/firefox-nightly/files/patch-bug787904 trunk/www/firefox-nightly/files/patch-bug789693 Modified: trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox-nightly/files/patch-bug783505 trunk/www/libxul/Makefile trunk/www/libxul/distinfo trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/firefox-nightly/Makefile Thu Sep 13 12:47:30 2012 (r1015) @@ -26,6 +26,7 @@ USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=yes +OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= # empty Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/firefox-nightly/Makefile.hgrev Thu Sep 13 12:47:30 2012 (r1015) @@ -1 +1 @@ -HGREV= 104498:36427d4b2cf6 +HGREV= 106949:f39786e8364d Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/firefox-nightly/distinfo Thu Sep 13 12:47:30 2012 (r1015) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/36427d4b2cf6.tar.bz2) = 204602a5866150bc943d5b59966c63b9ea8d7f8b5808a4da1a1d2da958370dcb -SIZE (firefox-nightly/36427d4b2cf6.tar.bz2) = 88616803 +SHA256 (firefox-nightly/f39786e8364d.tar.bz2) = a9fc964a2caa291d37d29a901718d70a30c48c276390579f8fcffe34748c3a53 +SIZE (firefox-nightly/f39786e8364d.tar.bz2) = 89130646 Modified: trunk/www/firefox-nightly/files/patch-bug783505 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug783505 Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/firefox-nightly/files/patch-bug783505 Thu Sep 13 12:47:30 2012 (r1015) @@ -28,3 +28,25 @@ } // Define an accessor for a read-only property that invokes a native getter +--- build/autoconf/gcc-pr39608.m4~ ++++ build/autoconf/gcc-pr39608.m4 +@@ -31,7 +31,6 @@ AC_LANG_RESTORE + + AC_MSG_RESULT($ac_have_gcc_pr39608) + if test "$ac_have_gcc_pr39608" = "yes"; then +- echo This compiler would fail to build firefox, plase upgrade. +- exit 1 ++ echo This compiler may fail to build firefox, plase upgrade. + fi + ]) +--- js/src/build/autoconf/gcc-pr39608.m4~ ++++ js/src/build/autoconf/gcc-pr39608.m4 +@@ -31,7 +31,6 @@ AC_LANG_RESTORE + + AC_MSG_RESULT($ac_have_gcc_pr39608) + if test "$ac_have_gcc_pr39608" = "yes"; then +- echo This compiler would fail to build firefox, plase upgrade. +- exit 1 ++ echo This compiler may fail to build firefox, plase upgrade. + fi + ]) Deleted: trunk/www/firefox-nightly/files/patch-bug787904 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug787904 Thu Sep 13 12:47:30 2012 (r1014) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- 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; Deleted: trunk/www/firefox-nightly/files/patch-bug789693 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug789693 Thu Sep 13 12:47:30 2012 (r1014) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,109 +0,0 @@ ---- toolkit/components/startup/nsAppStartup.cpp -+++ toolkit/components/startup/nsAppStartup.cpp -@@ -50,18 +50,41 @@ - #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" - #include "mozilla/StartupTimeline.h" - -+#if defined(__NetBSD__) -+#undef KERN_PROC -+#define KERN_PROC KERN_PROC2 -+#define KINFO_PROC struct kinfo_proc2 -+#else -+#define KINFO_PROC struct kinfo_proc -+#endif -+ -+#if defined(XP_MACOSX) -+#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec -+#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec -+#elif defined(__DragonFly__) -+#define KP_START_SEC kp_start.tv_sec -+#define KP_START_USEC kp_start.tv_usec -+#elif defined(__FreeBSD__) -+#define KP_START_SEC ki_start.tv_sec -+#define KP_START_USEC ki_start.tv_usec -+#else -+#define KP_START_SEC p_ustart_sec -+#define KP_START_USEC p_ustart_usec -+#endif -+ - static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); - - #define kPrefLastSuccess "toolkit.startup.last_success" -@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() - #endif - return timestamp; - } --#elif defined(XP_MACOSX) -+#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ -+ || defined(__NetBSD__) || defined(__OpenBSD__) - static PRTime - CalculateProcessCreationTimestamp() - { -- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; -- size_t buffer_size; -- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) -- return 0; -+ int mib[] = { -+ CTL_KERN, -+ KERN_PROC, -+ KERN_PROC_PID, -+ getpid(), -+#if defined(__NetBSD__) || defined(__OpenBSD__) -+ sizeof(KINFO_PROC), -+ 1, -+#endif -+ }; -+ u_int miblen = sizeof(mib) / sizeof(mib[0]); - -- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); -- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { -- free(proc); -- return 0; -- } -- 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)) -+ KINFO_PROC proc; -+ size_t buffer_size = sizeof(proc); -+ if (sysctl(mib, miblen, &proc, &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; -- } -- PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; -- starttime += proc->p_ustart_usec; -- free(proc); -+ PRTime starttime = static_cast(proc.KP_START_SEC) * PR_USEC_PER_SEC; -+ starttime += proc.KP_START_USEC; - return starttime; - } - #else Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/libxul/Makefile Thu Sep 13 12:47:30 2012 (r1015) @@ -6,7 +6,7 @@ # PORTNAME= libxul -DISTVERSION= 16.0b2 +DISTVERSION= 16.0b3 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= firefox/releases/${DISTVERSION}/source Modified: trunk/www/libxul/distinfo ============================================================================== --- trunk/www/libxul/distinfo Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/libxul/distinfo Thu Sep 13 12:47:30 2012 (r1015) @@ -1,2 +1,2 @@ -SHA256 (firefox-16.0b2.source.tar.bz2) = cb578278304815992144703de1a0d85fdadcf683cb501398c668be8cef9c2be6 -SIZE (firefox-16.0b2.source.tar.bz2) = 89195582 +SHA256 (firefox-16.0b3.source.tar.bz2) = e2bed046a55ec2b665c9b6c34b31b7ca8248bf5f7acc9f1e14df92e585f03108 +SIZE (firefox-16.0b3.source.tar.bz2) = 89184755 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/seamonkey/Makefile Thu Sep 13 12:47:30 2012 (r1015) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.13b1 +DISTVERSION= 2.13b2 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/seamonkey/distinfo Thu Sep 13 12:47:30 2012 (r1015) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.13b1.source.tar.bz2) = 7469a70c29ea5e7f41cd0ca7638739a53d4aa7dd1b5745e54189a7f35607af81 -SIZE (seamonkey-2.13b1.source.tar.bz2) = 112039009 +SHA256 (seamonkey-2.13b2.source.tar.bz2) = 5155525fa20867729dc7dbcf0ffb04ef351de3857f9f195bf9730896a3612fc6 +SIZE (seamonkey-2.13b2.source.tar.bz2) = 112028251 From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 13 17:20: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 05D60106566B for ; Thu, 13 Sep 2012 17:20: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 9AC1D8FC0A for ; Thu, 13 Sep 2012 17:20: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 q8DHKfLt021964 for ; Thu, 13 Sep 2012 17:20: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 q8DHKaXQ020437 for freebsd-gecko@freebsd.org; Thu, 13 Sep 2012 17:20:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 13 Sep 2012 17:20:36 GMT Message-Id: <201209131720.q8DHKaXQ020437@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] r1016 - in trunk: mail/thunderbird-esr/files www/firefox-esr/files www/libxul-esr/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, 13 Sep 2012 17:20:43 -0000 Author: jbeich Date: Thu Sep 13 17:20:35 2012 New Revision: 1016 Log: make clang3.2 choke on mismatched visibility early on (always) If you want benefits of gcc_hidden.h better use clang3.1. PR: ports/171566 Added: trunk/mail/thunderbird-esr/files/patch-clang32-visibility-hack trunk/www/firefox-esr/files/patch-clang32-visibility-hack trunk/www/libxul-esr/files/patch-clang32-visibility-hack Deleted: trunk/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack trunk/www/firefox-esr/files/patch-clang32-libc++-visibility-hack trunk/www/libxul-esr/files/patch-clang32-libc++-visibility-hack Deleted: trunk/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-clang32-libc++-visibility-hack Thu Sep 13 17:20:35 2012 (r1015) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,57 +0,0 @@ ---- 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-esr/files/patch-clang32-visibility-hack ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird-esr/files/patch-clang32-visibility-hack Thu Sep 13 17:20:35 2012 (r1016) @@ -0,0 +1,30 @@ +--- configure.in~ ++++ configure.in +@@ -3230,6 +3230,7 @@ EOF + ac_cv_have_visibility_class_bug, + [cat > conftest.c < conftest.c < conftest.c < -+#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-esr/files/patch-clang32-visibility-hack ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-clang32-visibility-hack Thu Sep 13 17:20:35 2012 (r1016) @@ -0,0 +1,20 @@ +--- configure.in~ ++++ configure.in +@@ -3230,6 +3230,7 @@ EOF + ac_cv_have_visibility_class_bug, + [cat > conftest.c < conftest.c < -+#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-esr/files/patch-clang32-visibility-hack ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul-esr/files/patch-clang32-visibility-hack Thu Sep 13 17:20:35 2012 (r1016) @@ -0,0 +1,20 @@ +--- configure.in~ ++++ configure.in +@@ -3230,6 +3230,7 @@ EOF + ac_cv_have_visibility_class_bug, + [cat > conftest.c < conftest.c < 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 54F13106566C for ; Fri, 14 Sep 2012 13:55:11 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id D75798FC16 for ; Fri, 14 Sep 2012 13:55:10 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q8EDt4lM042345 for ; Fri, 14 Sep 2012 13:55: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 q8EDsxcG041937 for freebsd-gecko@freebsd.org; Fri, 14 Sep 2012 13:54:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 14 Sep 2012 13:54:59 GMT Message-Id: <201209141354.q8EDsxcG041937@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] r1017 - trunk/www/libxul/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Sep 2012 13:55:11 -0000 Author: jbeich Date: Fri Sep 14 13:54:58 2012 New Revision: 1017 Log: add forgotten patch Added: trunk/www/libxul/files/patch-build_unix_run-mozilla.sh - copied unchanged from r1016, trunk/www/libxul-esr/files/patch-build_unix_run-mozilla.sh Copied: trunk/www/libxul/files/patch-build_unix_run-mozilla.sh (from r1016, trunk/www/libxul-esr/files/patch-build_unix_run-mozilla.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-build_unix_run-mozilla.sh Fri Sep 14 13:54:58 2012 (r1017, copy of r1016, trunk/www/libxul-esr/files/patch-build_unix_run-mozilla.sh) @@ -0,0 +1,12 @@ +--- build/unix/run-mozilla.sh.orig Tue Feb 14 19:56:54 2006 ++++ build/unix/run-mozilla.sh Fri Dec 8 15:49:48 2006 +@@ -443,6 +443,9 @@ + export MOZILLA_FIVE_HOME LD_LIBRARY_PATH + export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH + ++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox ++export MOZ_PLUGIN_PATH ++ + if [ $moz_debug -eq 1 ] + then + moz_debug_program ${1+"$@"} From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 14 13:58: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 E2C681065674 for ; Fri, 14 Sep 2012 13:58: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 7278A8FC0C for ; Fri, 14 Sep 2012 13:58: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 q8EDwnDU067947 for ; Fri, 14 Sep 2012 13:58: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 q8EDwiY6067502 for freebsd-gecko@freebsd.org; Fri, 14 Sep 2012 13:58:44 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 14 Sep 2012 13:58:44 GMT Message-Id: <201209141358.q8EDwiY6067502@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] r1018 - 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: Fri, 14 Sep 2012 13:58:51 -0000 Author: jbeich Date: Fri Sep 14 13:58:43 2012 New Revision: 1018 Log: respect PREFIX for system GRE registration Obtained from: MacPorts Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Fri Sep 14 13:54:58 2012 (r1017) +++ trunk/Mk/bsd.gecko.mk Fri Sep 14 13:58:43 2012 (r1018) @@ -863,6 +863,8 @@ @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \ s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ ${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp + @${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \ + ${MOZSRC}/xpcom/build/nsXPCOMPrivate.h @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \ ${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp @${GREP} -lr 'PR_LoadLibrary.*\.so\.[0-9]' ${WRKSRC} | ${XARGS} \