[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, dev-lang/spidermonkey/files/

[gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, dev-lang/spidermonkey/files/

[Ian Stakenvicius]

commit:     d37a2d1733c181d1db5794ae9a1a8b1ce27d080d
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 30 15:57:34 2012 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 15:57:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=d37a2d17

disabled webrtc for ppc and ppc64 to match in-tree ff17-r1 for bug 444780

---
 .../files/spidermonkey-1.8.7-jsversion.patch       |   11 +++++++++++
 www-client/firefox/Manifest                        |    2 +-
 www-client/firefox/firefox-17.0-r2.ebuild          |    8 ++++++++
 3 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/dev-lang/spidermonkey/files/spidermonkey-1.8.7-jsversion.patch b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-jsversion.patch
new file mode 100644
index 0000000..22f4d08
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.7-jsversion.patch
@@ -0,0 +1,11 @@
+--- a/js/src/dist/include/jsversion.h	2012-04-06 17:24:51.000000000 -0400
++++ b/js/src/dist/include/jsversion.h	2012-10-12 16:52:50.000000000 -0400
+@@ -41,7 +41,7 @@
+  * JS configuration macros.
+  */
+ #ifndef JS_VERSION
+-#define JS_VERSION 185
++#define JS_VERSION 187
+ #endif
+ 
+ /*

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 0e7a44c..4318ddb 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -92,4 +92,4 @@ DIST firefox-17.0-zh-CN.xpi 304250 SHA256 111256e6a6960aaf8c737d24a024b5c2613196
 DIST firefox-17.0-zh-TW.xpi 305437 SHA256 a11e96586b0e880a04a3d32f6a9251e8555b61eede0faa32b8c2365bb821ad76 SHA512 a0c898909c3eba9d3284ee867135d12d1fabd1345bcd8bb6f4dc33d60984d9727a4a948232c643567985c8321f3fb093e95f03f09a034342bff6e0ff4a954b77 WHIRLPOOL 250faef25402876df45c84e3ed579643175fec217187bfa1b949817aed337d538c78ca61d857dee27a4697732eefc925e79f448c5a29a0b16fad493d48f033dd
 DIST firefox-17.0-zu.xpi 296594 SHA256 52a3f87725cda80949d9d57c47f59d066ae7cf833de047681851401b97401229 SHA512 d75937a4d31321527b6b3682f73bbacb94fd7721f88151b8ee93f3e4dbb7eaffc459e6e0f9ff2a38734d9f0b10b7fff2d0f032f0d1dd7260bfb2ada2d880887b WHIRLPOOL 0d4a421a44eabf46168a328dda6edc1d90aab77bee64a5b1992ee49ce2c9b08935300fdace8a7f86db11eebff094b3d097782583c374bcd65bd16b8faf26d96b
 DIST firefox-17.0.source.tar.bz2 90780755 SHA256 7f05658701be88505747ea3537546b98a1c0e74ba23ba428d754ea838a192348 SHA512 2f5d4242d4cb2488d35a961bfd62a87cfdda7b119c8c502ce9cff54b0ce71f1f34016f30383284b424e8904c9c75a543cfcae0e2d40b7eed7cd0e4e55fdf6f55 WHIRLPOOL e837fc455ae55f045cc8d3e67683c52da6b3f71d0867b13e9d7d78b709127d0dd1e9a25832f64fb84880dc391433f7acde49067210093b6286059eb683a6e7cb
-EBUILD firefox-17.0-r2.ebuild 11716 SHA256 9a1038767459f4563b737d45e4a4c2b2734b466ff2dd7689278d274aab981ec5 SHA512 f0fb503d5ca99a14ccd3ea67c50454fc1caeab408a9987c3e2cd1e8b67aec48963f53a80dcf24d305c39af049b16ef6be6a1312e95e0351f0a0ce1788c8b304e WHIRLPOOL a31f97135386578fbf410cca9e507d2672a041821b8e0cc5387d2874ae32e9846adcd736cafbe628d15d45fbfa5541c9ac6715aaa3bd76c02fe58e5fbe203d07
+EBUILD firefox-17.0-r2.ebuild 11967 SHA256 75994af3ebc31311f298e560a09e6aa5f2826bf7708bf7111da3260b28d26774 SHA512 c1fb823ad1b7565dc4d41cecbfdc01427dd1195532f3e673b9cf09a978b4c9b1216d6f6262d31d3bb1c0e385e555353ad8e5b3de7ac850ab84529494ff2129b0 WHIRLPOOL 1b90b63ec6cb58de1d82ad15d888cc5990e8fedc7c4d4d79aa357b318b2192a952048b91de6d25dd8c182af458f2f2d3713c75ee5ebaa59abb2f8aa3bc6bc7b6

diff --git a/www-client/firefox/firefox-17.0-r2.ebuild b/www-client/firefox/firefox-17.0-r2.ebuild
index b739677..ec40ef1 100644
--- a/www-client/firefox/firefox-17.0-r2.ebuild
+++ b/www-client/firefox/firefox-17.0-r2.ebuild
@@ -228,6 +228,11 @@ src_configure() {
 	mozconfig_use_enable jit methodjit
 	mozconfig_use_enable jit tracejit
 
+	# Disable webrtc for arches that it doesn't support, bug 444780
+	if use ppc || use ppc64 ; then
+		mozconfig_annotate '' --disable-webrtc
+	fi
+
 	# Allow for a proper pgo build
 	if use pgo; then
 		echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
@@ -246,6 +251,9 @@ src_configure() {
 }
 
 src_compile() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	export LDFLAGS="${LDFLAGS} -Wl,-rpath=${MOZILLA_FIVE_HOME}"
+
 	if use pgo; then
 		addpredict /root
 		addpredict /etc/gconf