[gentoo-commits] proj/mozilla:master commit in: eclass/, www-client/firefox/

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     c139b8900a5f6bfb66de3bbbde170d72a3356920
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 00:08:25 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 00:08:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=c139b890

bump firefox-46 to beta11, patch to allow system-harfbuzz and system-graphite2

 eclass/mozconfig-v6.46.eclass                      | 14 +++++---
 www-client/firefox/Manifest                        |  4 +--
 ...6.0_beta6.ebuild => firefox-46.0_beta11.ebuild} | 41 +++++++---------------
 3 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/eclass/mozconfig-v6.46.eclass b/eclass/mozconfig-v6.46.eclass
index 9400121..7cb2322 100644
--- a/eclass/mozconfig-v6.46.eclass
+++ b/eclass/mozconfig-v6.46.eclass
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 #
-# @ECLASS: mozconfig-v6.45.eclass
+# @ECLASS: mozconfig-v6.46.eclass
 # @MAINTAINER:
 # mozilla team <mozilla@gentoo.org>
 # @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
@@ -84,7 +84,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v3
 
 # use-flags common among all mozilla ebuilds
 IUSE="${IUSE} dbus debug +ffmpeg +jemalloc3 neon pulseaudio selinux startup-notification system-cairo
-	system-icu system-jpeg system-libevent system-sqlite system-libvpx"
+	system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx"
 
 # some notes on deps:
 # gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
@@ -124,6 +124,7 @@ RDEPEND=">=app-text/hunspell-1.2
 	system-libevent? ( =dev-libs/libevent-2.0*:0= )
 	system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] )
 	system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc,svc(-)] )
+	system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite2,icu] >=media-gfx/graphite2-1.3.8 )
 "
 
 if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
@@ -191,8 +192,9 @@ DEPEND="app-arch/zip
 RDEPEND+="
 	selinux? ( sec-policy/selinux-mozilla )"
 
-# ensure REQUIRED_USE is set just in case += fails otherwise
-: ${REQUIRED_USE:=""}
+# force system-icu if system-harfbuzz is selected, to avoid potential ABI issues
+REQUIRED_USE="
+	system-harfbuzz? ( system-icu )"
 
 # only one of gtk3 or qt5 should be permitted to be selected, since only one will be used.
 [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]] && [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]] && \
@@ -209,7 +211,7 @@ RDEPEND+="
 #
 # Example:
 #
-# inherit mozconfig-v5.33
+# inherit mozconfig-v6.46
 #
 # src_configure() {
 # 	mozconfig_init
@@ -340,6 +342,8 @@ mozconfig_config() {
 	mozconfig_use_with system-jpeg
 	mozconfig_use_with system-icu
 	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
 
 	# Modifications to better support ARM, bug 553364
 	if use neon ; then

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 6232e95..a5d0593 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -79,5 +79,5 @@ DIST firefox-45.0.1-xh.xpi 429734 SHA256 638b3ac560c1e61f410ff8ee53125e58d6a0fe7
 DIST firefox-45.0.1-zh-CN.xpi 469931 SHA256 69dcf93c1e3ea55d248834f653d2d80706a1c91038f745b183f9f670116728e2 SHA512 21ad24eb635321ddf979217181c6f8c42b673ffc266e35d22078508ac7d6857986955299070b01ffb9a45938d3bf19905ce24c7ca4fc759b040491a8a4c2d4a8 WHIRLPOOL eeed1f803a52558dfe48a0eab30dfbcad69652ff748355e76dcd6d0e7ad2bffbc74e9f91a12945aed08d668ae9cc09c57d634101ed29543bd3ec9ae1704fa8bc
 DIST firefox-45.0.1-zh-TW.xpi 460795 SHA256 b5ed300a15623e1f8207e5b566864f2cba8772ddcec5fff460b8b37e5a9f2cbd SHA512 7ee83363c5f5b0317d50ba1ba90ad910a8e01a2d83ea3da0ba1a533bca413e32f4220dbc2ccdc2cdbb75dbcf7b23fa5c32a6fa5f9bec9416b6d06f188a5f061e WHIRLPOOL cc114e9aad479dec70eecf03c42c6f17965cdf96bec90011f4287d8bd2c865eefcc8fe040c28ce2812173922f53cc938cfeaad18e851b1f5f72b893e5f7dd3d8
 DIST firefox-45.0.1.source.tar.xz 184009616 SHA256 d1814ac6d8cd687696bd0d98da3bb525f6df11fe655e0d668742b21fca57d9c8 SHA512 ff28116aff3dd07bf9c43724c7870cac8e4764639c5ee1248cc1003a4f6005f86b823a0f7969425970e2aeba3eca22e4aa88fa3c5d912c253373d398257d8438 WHIRLPOOL 10bf50ca841136a91410ea71de577f97b7a29c56258882a4a48d68ac872ad49bf0f900b8d5a2f19172346229bc83ffbfc87d5cf29080f3589b8fd372ffc2ca55
-DIST firefox-46.0-patches-0.3.tar.xz 14376 SHA256 3db42f35a0b86e8b1621bbc3f499f4b6d3f317728faa468f7acfe2ec34162ef9 SHA512 e593bc6751cd88e6e004012292d8ff39008e5ed46bcea73702f88365ec714e17f468ba4c297e06b07052706ff98a13dca69b4a05b4f2c45f7070d2b1fd4571bd WHIRLPOOL 6179d9f4e8e3a2c66632e15db3a4db4a79b8ea7c7a92d15754438f6fb5a38ad09c852e047952c99d37cff8f42b4ffc1ddbd4df6e8855a1d800561306d1320779
-DIST firefox-46.0b6.source.tar.xz 187289468 SHA256 9a265fa8a236b1f0f0878f667b4fd5f2b6931bddaffc2c4d8337b34f4e1be926 SHA512 b4f53fd59014f85f8c2ff0d115873a4ee4d75df0511168fe8489ed2ce20c178f218cd91f9d0b50d06b32eb482b4b9ef4a6e13996ea401646b626a22b0d190dc4 WHIRLPOOL f857c0320e2c66c34a230044926f2d01ca09939c8059ab2c764922a53c91e96ae442d992397c1044698fc32f1fb0c8b6a581a79970bce53f4fb049180dbd4b09
+DIST firefox-46.0-patches-0.5.tar.xz 17936 SHA256 3cb7ff10083760c77bf770491866b90b46e1c09d694ab82bb7e39a8acd5e0d0f SHA512 b593fbad7c2e14c27fbfb084e82bcbf6f52e7054da0f14c2ac50ef973d4ed21881cf6c077a41e5b5976c5f4c6f78dc7d1965cbffd9c6b6f5c09aa48690742026 WHIRLPOOL 556408b387516eef4ff34b2374d8f8160ba213980826f9ef0380c9179881eaa6cbb37e06f02e918e0eec4ef31c4ecd480f02268adcf0ba4b7ca53c865eddccec
+DIST firefox-46.0b11.source.tar.xz 186867400 SHA256 8f6e197d19a377187e37043d25aba97ce7ac5da930ea538cbec67cd5a2700d4b SHA512 38d4205de5b90d881598bffd9c7e5cab55995243d7039975447223a9f477ad438e32690d841617c50265fd1ada2f16ea555224c61ecd56f97a299895723d6708 WHIRLPOOL 8d10f8c6cc43df0eb9a8c5db4783256ef682e778d9723bd377ab259d07e9113a41780172bf0582d07ec08422e6b7ca6b7223cc5102820eee4d1a7c6c940c2541

diff --git a/www-client/firefox/firefox-46.0_beta6.ebuild b/www-client/firefox/firefox-46.0_beta11.ebuild
similarity index 93%
rename from www-client/firefox/firefox-46.0_beta6.ebuild
rename to www-client/firefox/firefox-46.0_beta11.ebuild
index 6dd062f..7e8f883 100644
--- a/www-client/firefox/firefox-46.0_beta6.ebuild
+++ b/www-client/firefox/firefox-46.0_beta11.ebuild
@@ -27,11 +27,11 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-46.0-patches-0.3"
+PATCH="${PN}-46.0-patches-0.5"
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 
-MOZCONFIG_OPTIONAL_GTK2ONLY=1
 #MOZCONFIG_OPTIONAL_QT5=1 -- fails to build so leave it off until the code can be patched
+MOZCONFIG_OPTIONAL_GTK2ONLY=1
 MOZCONFIG_OPTIONAL_WIFI=1
 MOZCONFIG_OPTIONAL_JIT="enabled"
 
@@ -47,39 +47,24 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist egl hardened +hwaccel pgo selinux +gmp-autoupdate test"
 RESTRICT="!bindist? ( bindist )"
 
-# More URIs appended below...
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCH}.tar.xz )
 SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz
+	${PATCH_URIS[@]}"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
-# Mesa 7.10 needed for WebGL + bugfixes
 RDEPEND="
 	>=dev-libs/nss-3.23
 	>=dev-libs/nspr-4.12
 	selinux? ( sec-policy/selinux-mozilla )"
 
 DEPEND="${RDEPEND}
-	pgo? (
-		>=sys-devel/gcc-4.5 )
-	amd64? ( ${ASM_DEPEND}
-		virtual/opengl )
-	x86? ( ${ASM_DEPEND}
-		virtual/opengl )"
-
-## No source releases for alpha|beta
-#if [[ ${PV} =~ alpha ]]; then
-#	CHANGESET="8a3042764de7"
-#	SRC_URI="${SRC_URI}
-#		https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz"
-#	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-#else
-	S="${WORKDIR}/firefox-${MOZ_PV}"
-	SRC_URI="${SRC_URI}
-		${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-#fi
+	pgo? ( >=sys-devel/gcc-4.5 )
+	amd64? ( ${ASM_DEPEND} virtual/opengl )
+	x86? ( ${ASM_DEPEND} virtual/opengl )"
+
+S="${WORKDIR}/firefox-${MOZ_PV}"
 
 QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
 
@@ -134,9 +119,6 @@ src_prepare() {
 	eapply "${WORKDIR}/firefox"
 #		"${FILESDIR}"/${PN}-45-qt-widget-fix.patch
 
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
 	# Enable gnomebreakpad
 	if use debug ; then
 		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
@@ -168,6 +150,9 @@ src_prepare() {
 	sed '/^MOZ_DEV_EDITION=1/d' \
 		-i "${S}"/browser/branding/aurora/configure.sh || die
 
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
 	eautoreconf
 
 	# Must run autoconf in js/src