www-client/firefox - Fix misc crash issues via cairo, add musl support

3 files changed, 42 insertions, 10 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 51b89d1bd7b4..669aa7ff4353 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -297,7 +297,7 @@ DIST firefox-42.0-nl.xpi 451272 SHA256 a2470132d8b8a80b71471527a4c2468e7cd9e2440
 DIST firefox-42.0-nn-NO.xpi 447406 SHA256 4bff7cf5b4178a6d85da579ad1356af88d332d9b48cfbfaa067d51c8f190dd27 SHA512 0b6c8cc62dedbafe0d7e2010463d676908eb36f27045f0c8caa88ce9cf7315e919578d0b7b66fd523014ee5abf3f5162927e6af411eaf151ed35d3afcf67d303 WHIRLPOOL 1baef82c6956dd36a56f2021c1847ed90d8ad5f83e3bed6a7d5141ad4901b238650a5e01af266a5b54a56f447039c5fd07a1587a1efa253018da2996344dc85b
 DIST firefox-42.0-or.xpi 533314 SHA256 c3f211d325a7bac64c71b239ccc95918153f5d5ae987b29031245bf7475eb329 SHA512 f4a2fc595163a15ad787c39cac8f26a6802f51549dfbf74955bd659298dcd59298fd55d567ca751e6c98cdc87ef683b0627b3f44d025197ad4c14f5a127bfa87 WHIRLPOOL 895f9d419a92ceddb74fe884948006158886da1ef06a4f53ced6172a30a28edfeac37440a4b28b34444fb6da6e582b2e644e2f290c3bb218cd1ba22eb3ba5b58
 DIST firefox-42.0-pa-IN.xpi 507205 SHA256 af2e3dec61be29064b9a72846fd1148f0ff02e7e2290a3ed60077e932cdb614a SHA512 615c5940db69e973199fcf8d914bf6b099edd4b79f58aa3226f76eda9b0fd6e045e0936f278afb5f69c4dec0ffb88297281a26540a94d1a772701ad7ae89dc36 WHIRLPOOL bdd4a03fbafdf21fec296cf65b5576cf7fbdc3e2c6e2318739033acfe3ebbf9e0553d95e80f5b63067a66a35f2957824a0fbaac6054659838765e665275915b1
-DIST firefox-42.0-patches-02.tar.xz 6424 SHA256 6c8a89c75ea4a359bf720f011e1bb856b653cd6676767b33ccb9d2f807a089e3 SHA512 d40266c98aa5bfeed243e3bd42f9146bc73492bd20bd07ac4941df83793a7e3a832220b65fc8c9eeb5f3a00089087251a2b758df5fc0d3dd3403468ec0b9eb53 WHIRLPOOL 93356507e31a5dca653a5fcc844c24acc1de6b2a01f3dbd7227c1e23eda4e8799a59cf1a50bb49b721249cb82c744d49f4671bfb7188275101c6de955afdb149
+DIST firefox-42.0-patches-0.3.tar.xz 13360 SHA256 8f1b592454695a27cd8ab6a234705d73363af0a5ecc5e64c30072def05fd5fc8 SHA512 4aa1ab7b8482b2d6af35cc293443678eb3c33a6eb2577fc0553ec94b3c3a3cbd7c322d50c004ac646296491fe1f67f5d199635750b0c50cc4f0742af704a9cac WHIRLPOOL e755b9fd4da821e8d0490e138531dcc55e9c9dd6ebbbf33771fffda9fe932df79c1d26dc8ad6b6dc9e8a444ee47659f7ef90846dc076299793db4726be06b94e
 DIST firefox-42.0-pl.xpi 403227 SHA256 34498568481fc7d720742e2add62e0ea55c6150bf90abc3040186ca5d26881f2 SHA512 9faccaeb287eb5ba36d8303046bc36e6716d39766669821956e789fc8dfe830cb9985f0fc06f1566ff68498cfac6d0c1ff8622c404e79b2389b011d4e30fbeb4 WHIRLPOOL 29cbacd46f7fe86f8a62d1123baf8564de11aa8825ac04d66ef0f17fa838fb6b40cfd50fe0b232c6c451e2240b58f7fc50d7b99287876549151ae5cd55056133
 DIST firefox-42.0-pt-BR.xpi 468096 SHA256 b0c9a80cd76142fd9886fd70a141dc0d8e4203e8fbdb72b649c84ee3b0d373bf SHA512 7518e2fa20857a71156980c5e4e3884f89f6bf737596a667ef4d2168b7b0549bcd712a50c0a90123e858d5d63baf4cad8e769300c18e9d55c44837f1bcdb463c WHIRLPOOL 64387553add0cc66c9b518acc2b5c5d97b4dfb050d709972cc1d895eaf8c20d942c523ac44d927a44b45f6808e89427b5bad186226a64f3bdffb92270520968c
 DIST firefox-42.0-pt-PT.xpi 448920 SHA256 63b5e59bd240b67fe683618b9be9d824ae8f77133d8345889b32ba0930d77687 SHA512 d64c8a4d4eb6d541f20f288b332fea15d09d89153ac2e110942bcc8a753fc758ab643b52096fd77424c1f0a86fd517d1a3998f37b106976fe9b7abf0b033e74a WHIRLPOOL 93a1643c66bd92c00f1100a935404dc95d90b0d08fde99cf008815cd7d447a3b2308e5d37f38ad19f5eafaaba2343c2249259e8f668dad07ab3ec90cbf344441
diff --git a/www-client/firefox/files/gentoo-default-prefs.js-2 b/www-client/firefox/files/gentoo-default-prefs.js-2
new file mode 100644
index 000000000000..ad8cbb5dd4e8
--- /dev/null
+++ b/www-client/firefox/files/gentoo-default-prefs.js-2
@@ -0,0 +1,21 @@
+pref("app.update.enabled",                 false);
+pref("app.update.autoInstallEnabled",      false);
+pref("browser.display.use_system_colors",  true);
+pref("browser.link.open_external",         3);
+pref("general.smoothScroll",               true);
+pref("general.autoScroll",                 false);
+pref("browser.tabs.tabMinWidth",           15);
+pref("browser.backspace_action",           0);
+pref("browser.urlbar.hideGoButton",        true);
+pref("accessibility.typeaheadfind",        true);
+pref("browser.shell.checkDefaultBrowser",  false); 
+pref("browser.EULA.override",              true); 
+pref("general.useragent.vendor", "Gentoo");
+pref("intl.locale.matchOS", true);
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+pref("extensions.autoDisableScopes", 0);
+pref("layout.css.dpi", 0);
+pref("layers.acceleration.force-enabled",              true);
+pref("webgl.force-enabled",              true);
+
+
diff --git a/www-client/firefox/firefox-42.0.ebuild b/www-client/firefox/firefox-42.0-r2.ebuild
index dcbba2489966..4f7f2cd03f7d 100644
--- a/www-client/firefox/firefox-42.0.ebuild
+++ b/www-client/firefox/firefox-42.0-r2.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-42.0-patches-02"
+PATCH="${PN}-42.0-patches-0.3"
 MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases"
 
 MOZCONFIG_OPTIONAL_GTK3=1
@@ -57,7 +57,7 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 # Mesa 7.10 needed for WebGL + bugfixes
 RDEPEND="
 	>=dev-libs/nss-3.20.1
-	>=dev-libs/nspr-4.10.10
+	>=dev-libs/nspr-4.10.10-r1
 	selinux? ( sec-policy/selinux-mozilla )"
 
 DEPEND="${RDEPEND}
@@ -68,7 +68,7 @@ DEPEND="${RDEPEND}
 	x86? ( ${ASM_DEPEND}
 		virtual/opengl )"
 
-# No source releases for alpha
+# No source releases for alpha|beta
 if [[ ${PV} =~ alpha ]]; then
 	CHANGESET="8a3042764de7"
 	SRC_URI="${SRC_URI}
@@ -79,6 +79,19 @@ else
 	SRC_URI="${SRC_URI}
 		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
 fi
+#elif [[ ${PV} =~ beta ]]; then
+#	S="${WORKDIR}/mozilla-beta"
+#	SRC_URI="${SRC_URI}
+#		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+#else
+#	SRC_URI="${SRC_URI}
+#		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+#	if [[ ${MOZ_ESR} == 1 ]]; then
+#		S="${WORKDIR}/mozilla-esr${PV%%.*}"
+#	else
+#		S="${WORKDIR}/mozilla-release"
+#	fi
+#fi
 
 QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
 
@@ -196,6 +209,9 @@ src_configure() {
 	mozconfig_init
 	mozconfig_config
 
+	# We want rpath support to prevent unneeded hacks on different libc variants
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
+
 	# It doesn't compile on alpha without this LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
 
@@ -291,7 +307,7 @@ src_install() {
 	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
 
 	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
+	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
 		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
 		|| die
 
@@ -382,11 +398,6 @@ PROFILE_EOF
 	use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
 					 -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
 					|| die "sparc sed failed"; }
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
-	doins "${T}"/10${PN} || die
 }
 
 pkg_preinst() {