From: Nirbheek Chauhan <nirbheek@gentoo.org>
Date: Wed, 24 Aug 2011 07:29:10 +0000 (+0000)
Subject: Fix access violation, bug 380283
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5f9423f9bb24adcb54c6bd89075d91ded8f39151;p=gentoo.git

Fix access violation, bug 380283

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
---

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index ff1ae706efda..0335a88ca48c 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.85 2011/08/23 19:28:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.86 2011/08/24 07:29:10 nirbheek Exp $
+
+  24 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> firefox-6.0.ebuild:
+  Fix access violation, bug 380283
 
   23 Aug 2011; Lars Wendler <polynomial-c@gentoo.org> firefox-3.6.17.ebuild,
   firefox-3.6.18.ebuild, firefox-3.6.20.ebuild:
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index a49fb2cfd292..2fe1b90fc70e 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
@@ -395,23 +395,23 @@ EBUILD firefox-3.6.12.ebuild 9391 RMD160 e4a7c868b69c1b61cd4cc2bceb145a22f9d76db
 EBUILD firefox-3.6.17.ebuild 9457 RMD160 87aeb3bf4d643606bc5a7b28c7ff63212a44ff35 SHA1 71516a0857953a6d231c5953fc4186883b5816a4 SHA256 945e452a82e6fa461fea00246cf863d9c8b289f91b5f5923d3e5f904bb7e857a
 EBUILD firefox-3.6.18.ebuild 9465 RMD160 84a8de9c0a13e62007f88591a6a768f155a6595b SHA1 0ea7ee12802594c273aa0b848c10dc29b7078e52 SHA256 cd11c9741842705252f57ce2f5ab302e86e409a157888cb183e8749c966a1ca9
 EBUILD firefox-3.6.20.ebuild 9465 RMD160 95d65812e1c5caf46def2d7c13b82ebe5b8472eb SHA1 02cbd69561de211da4c2828e2c8033acd0f0bd33 SHA256 1f8fa800ae3767c93972cda7e520376c683fd672dff622d7263e8e81d9f51afc
-EBUILD firefox-6.0.ebuild 11001 RMD160 671ca4e53091b9d589664e3f5e9ed7dca1c9fd46 SHA1 6cf08c06944e045788fad3b5674e6d76bd7bc4c9 SHA256 f7d1a83381730722f82d5a1f18e3d06893bee81f181fb94e8e978deb4639271d
-MISC ChangeLog 130995 RMD160 7733c4b5712ffa4d37413e63025f4d2a6c1aa535 SHA1 5c1ab50a952086c6017f3d0fc81bd3327e82777f SHA256 fba4c8ac09b3c1f0883e2070e494ea31d4717b97b0f8daee6683f2e69eb58707
+EBUILD firefox-6.0.ebuild 11203 RMD160 c4100b41199395cb743322c3d218b80a581d5f38 SHA1 e9fc4bd736fefe304dfcfaedc18a32d3774b40d7 SHA256 4801462df54eff768be96783cb0217bd95cb5ce2a26aad7685ae5672ba7f55d7
+MISC ChangeLog 131101 RMD160 f9b582367230880805453f34d4459c1fb35ae35b SHA1 b38e93c51b7fb6930d89f9731ff72fed4353f906 SHA256 a1fb78878d47a9ce6fce34e021cd7f1fc9b8edd0e327955ba3c423fb035b276e
 MISC metadata.xml 1122 RMD160 4028e1b660b858422928b08d0d3845de593f3cc6 SHA1 e1e17e049e8c43ef623489286a2f18daf138b69c SHA256 6247938b53e6989b21cdd4aaf8409f09bda3837caad2ecfed3aeb146c35a437a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOVAElAAoJEPiazRVxLXTFcHcP/jOlPPFR3d5lnjPnrmH6K9FC
-WlHukA8Kd6CdrrhfMdFDxSuh1saAqoNfy08fZCYGBGuMT24JeYnNmuhyUlAdZc50
-yJGvpRa8RyMfzRIqCMqzm/NggVaQYhsssUdG+PQOCHBBsg4ocuUQl8zbdXDA/feV
-LTnrizATMRNZ1+mFTWsDB2nIMuIn3amSpA5BlWuPH3BNDx9NTVGlAI6orXBCsB9Y
-8bF4Cj3OfzVJ1932yckBR6IL29Odgc1BjAjIqoefoIhoCVR2wDbqLPL7FxlU8riU
-YTn/JEyw738go33txhuzuxlbjuaKWRPbRNEtQHOa6GGvsruzkcblWTNxzNaeREAx
-ox2fpbAtrFlLAge8B00+HBY75ISBgXDCl2On9byREpBAQchGtFXqATQy/QqRikLh
-8QJ1ysSffJOYL47WcPyMe0crSCYfzrB395CFD4mMLw4T6yw0juJgWobCyzoGVfo9
-ZknFc7v+Kk6+bOG0hfWNArND+noyjX0PzzUlVnhsjbwwlEuaGGuzMR7PRL2DgL8p
-FPvzPwm784rfxxdENjHzTc+Idg2reI/eFTDfAMhJg5aTui0yQ0lrwv1iNJGs+D/W
-kWWcY5F9jlhzbm1yMnKXYGLkobftGhK5rqJTDztyomfWHBr1lry+s/B9VKCGMZlF
-Llmvy7+gLigEQJxKnc+x
-=0XR2
+iQIcBAEBAgAGBQJOVKiBAAoJEO/kOhxWD91k3xYP/iw3zs6JFPCuBLoSvH3+R5UL
+QYtfGqINxf/NdQfsWkqIBsn0mOHXD1cXWJquLl3P71mNG7IbYOhv35JTwxYapAjj
+AMn3Ozcp92C1JVMitZoU4KklOHC4hAYXS74lUGWcVKick41lGmYX0eBoxzPub7wz
+M4Eudfg+jUhBNVhDhTx437rJ+Zev7bKZjphdUQSdSnllYTLGwn/R40GshkFcO/wY
+0ClIErD8K8wNgeM6w9bvpbwO2uAbh+jIdD9e+5f09PGRDhllDYCGr6zK/sRdijmn
+P2nGM/N8u/i4yIdNXMmF9rl0wvRq5nx43v05YPaAGyBLa/RjpP4G54FSr/oSjXbZ
+mjtIBevdAwMPxpT340NbC/V1eVuOOe1AzYikwZhTUyzseb+QlkHtBACKomGWww2T
+YfC3cP8tUvcmkhsTNCuWpkVwavs8IAeF1w7nAw4/HAKU1WVJOgUJbMrpXFaIJWZz
+KEKUNGKXEicqnz7DAVCmGkCVBFL9cteKgNRwvb3bp34yp/WW/mZ2/mobsQMgDjCz
+ARftN0K9EKgBkTQKfNn//SrfUXqX4C0dvLENyYfqVDaR+EtbKSBlwTa9AyD3Rmwj
+5DWfTqrHdXLLrUIpPNOEz1SeHB8Jpp2yTSz7ZcSTwWfUYNlOb9CMIT6iLIh+szwP
+5griUr8ELuAIiQfvkEBx
+=2Tfu
 -----END PGP SIGNATURE-----
diff --git a/www-client/firefox/firefox-6.0.ebuild b/www-client/firefox/firefox-6.0.ebuild
index 55ccc2530e5f..7e22ef47f723 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-6.0.ebuild,v 1.2 2011/08/23 19:35:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-6.0.ebuild,v 1.3 2011/08/24 07:29:10 nirbheek Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
@@ -34,7 +34,7 @@ RDEPEND="
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.10
 	>=dev-libs/nspr-4.8.8
-	>=dev-libs/glib-2.26
+	>=dev-libs/glib-2.26:2
 	>=media-libs/mesa-7.10
 	media-libs/libpng[apng]
 	dev-libs/libffi
@@ -262,7 +262,12 @@ 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=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g')
+		shopt -u nullglob
+		test -n "${cards}" && addpredict "${cards}"
+
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 		MOZ_MAKE_FLAGS="${MAKEOPTS}" \
 		Xemake -f client.mk profiledbuild || die "Xemake failed"