From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qx39L-0001od-3q for garchives@archives.gentoo.org; Fri, 26 Aug 2011 20:37:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21F0B21C1D3; Fri, 26 Aug 2011 20:37:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D07B421C1D3 for ; Fri, 26 Aug 2011 20:37:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4919D1B4028 for ; Fri, 26 Aug 2011 20:37:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9A0E380040 for ; Fri, 26 Aug 2011 20:37:02 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <99ae6425e4655e85ef937e1ead0fa3fc872d2a56.nirbheek@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/Manifest www-client/firefox/firefox-6.0.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 99ae6425e4655e85ef937e1ead0fa3fc872d2a56 Date: Fri, 26 Aug 2011 20:37:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 22740babaf99ae80380cab62973badb2 commit: 99ae6425e4655e85ef937e1ead0fa3fc872d2a56 Author: Nirbheek Chauhan gentoo org> AuthorDate: Fri Aug 26 20:14:59 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Fri Aug 26 20:14:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D99ae6425 firefox: merge fixes from tree --- www-client/firefox/Manifest | 2 +- www-client/firefox/firefox-6.0.ebuild | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 31ab9b5..592ddac 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -84,4 +84,4 @@ DIST firefox-6.0-zh-CN.xpi 241868 RMD160 1e9d0b6594cbdc= 151b92456030a5cb40f0916f3 DIST firefox-6.0-zh-TW.xpi 242787 RMD160 13e3b2decf59ff0cb2e69b2f10e446e= 37c63f5f5 SHA1 33d8a06b0775780beadfa836883db3149afa60de SHA256 5b5d3cd6ee= 368007415b82e338204d3fe658291f4f4d454fcc1efc7e93d0563c DIST firefox-6.0-zu.xpi 233159 RMD160 64e3f5fdb78c9f343d3de05f8604e531b6= 7f8f8c SHA1 0cfc262f1f6172f6fa5b8e82f7856d53a1f110c4 SHA256 7e6aa854e7e60= 6f00c8e238c11c634b5fd5d068156840736b5997ecb6f6ad6d9 DIST firefox-6.0.source.tar.bz2 67919174 RMD160 b1f586d4e9889f3b5449c00e= 4bf3340d3dcca0da SHA1 abcb3cc3907d5217726f457085d00b3995fb469b SHA256 cc3= fb554ca02358e000502a1023d5ba01e6d18ae30c719f5a3b1ce1ad8334973 -EBUILD firefox-6.0.ebuild 11000 RMD160 b966b2207c18d9f848496aaa29727216e= d8c0d94 SHA1 c206ddc194ed2449b8d332d04f61df7019fec831 SHA256 1f0fa688cf39= 80e1c7cba8c89b305cb2f5ebccbdf4097f62bff8be4f895a7b2e +EBUILD firefox-6.0.ebuild 11207 RMD160 f74185105043b11f3bba71c64d0cf8e4a= 52658ca SHA1 21989b75054815c032c1db29cd129c517b6af1e5 SHA256 f365fb689f92= e9df2a806d4356cb0d6d311b45d5acdc72332c1ea1fc0c628a71 diff --git a/www-client/firefox/firefox-6.0.ebuild b/www-client/firefox/f= irefox-6.0.ebuild index 7578c11..710aeb0 100644 --- a/www-client/firefox/firefox-6.0.ebuild +++ b/www-client/firefox/firefox-6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-5.0-r2.ebu= ild,v 1.4 2011/08/13 17:26:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-6.0.ebuild= ,v 1.2 2011/08/23 19:35:58 polynomial-c Exp $ =20 EAPI=3D"3" VIRTUALX_REQUIRED=3D"pgo" @@ -34,7 +34,7 @@ RDEPEND=3D" >=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.10 >=3Ddev-libs/nspr-4.8.8 - >=3Ddev-libs/glib-2.26 + >=3Ddev-libs/glib-2.26:2 >=3Dmedia-libs/mesa-7.10 media-libs/libpng[apng] dev-libs/libffi @@ -255,14 +255,19 @@ src_configure() { if use amd64 || use x86; then append-flags -mno-avx fi - fi + fi } =20 src_compile() { if use pgo; then addpredict /root addpredict /etc/gconf - addpredict /dev/dri + # Firefox tries to dri stuff when it's run, see bug 380283 + shopt -s nullglob + local cards=3D$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/= /:/g') + shopt -u nullglob + test -n "${cards}" && addpredict "${cards}" + CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" \ MOZ_MAKE_FLAGS=3D"${MAKEOPTS}" \ Xemake -f client.mk profiledbuild || die "Xemake failed"