public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, profiles/, www-client/firefox/files/
@ 2012-06-13 14:02 Nirbheek Chauhan
  0 siblings, 0 replies; 2+ messages in thread
From: Nirbheek Chauhan @ 2012-06-13 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     294ef67fb2557d6f87eea525aedf93ad82f526d6
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 13 14:01:31 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 14:01:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=294ef67f

Update firefox beta and aurora builds

* Aurora build doesn't have the FreeBSD patches yet, they collide with the
  NetBSD patches upstream

---
 profiles/package.mask                              |    2 +-
 www-client/firefox/Manifest                        |   13 ++++++++-----
 ....patch => firefox-14.0_beta7-gst-aac-mp3.patch} |    0
 ...h => firefox-14.0_beta7-gst-youtube-h264.patch} |    0
 ..._alpha2-r1.ebuild => firefox-14.0_beta7.ebuild} |   10 +++++-----
 ...alpha2-r1.ebuild => firefox-15.0_alpha2.ebuild} |    9 +++++----
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index f713ac0..6c713b6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -9,4 +9,4 @@
 =www-client/seamonkey-2.7*
 
 # Mask nightlies
-=www-client/firefox-14*
+=www-client/firefox-15*

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 974f369..d66d1a0 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,5 +1,5 @@
-AUX firefox-14.0_alpha2-gst-aac-mp3.patch 2454 RMD160 47fe9e90b2d5acf6f25d4641b983a5a077d89a57 SHA1 234ccafcb7df3f55d4cee6f776a01987068bb685 SHA256 ef3e6539d292629a52a592cecd90a23562480d7280cfd3883d4407ad06e418a7
-AUX firefox-14.0_alpha2-gst-youtube-h264.patch 1437 RMD160 48daef08188b9862cef5af9192f029347a7a0a9b SHA1 03bde68c29b6acd50e4b6b6eac5fa2c12053b216 SHA256 9b871769727e6d16939c55695b4f08c6b460c3f6cf5bce46ce429f40c4801669
+AUX firefox-14.0_beta7-gst-aac-mp3.patch 2454 RMD160 47fe9e90b2d5acf6f25d4641b983a5a077d89a57 SHA1 234ccafcb7df3f55d4cee6f776a01987068bb685 SHA256 ef3e6539d292629a52a592cecd90a23562480d7280cfd3883d4407ad06e418a7
+AUX firefox-14.0_beta7-gst-youtube-h264.patch 1437 RMD160 48daef08188b9862cef5af9192f029347a7a0a9b SHA1 03bde68c29b6acd50e4b6b6eac5fa2c12053b216 SHA256 9b871769727e6d16939c55695b4f08c6b460c3f6cf5bce46ce429f40c4801669
 AUX gentoo-default-prefs.js-1 821 RMD160 13a7be3a165b7059e51fab2cc7fc8d31a82260eb SHA1 333339c4deb4fd41527fd87e1acf0af12cf1007c SHA256 16259ec24a231d1d60097c8d892caa80d2703ba5be72304f6da55cfce1b329de
 AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
 DIST firefox-10.0-patches-0.8.tar.xz 18456 RMD160 bdd93792d2f95b049de82f3f71108f098c4a167a SHA1 faedecffae34df7ca2086ffae7cb1a25f3ae76a4 SHA256 ec333d90aed209e22a2b2049b8483e8fac62b7ed5b664a0b6255769c4bb90e5d
@@ -174,8 +174,11 @@ DIST firefox-13.0-zh-CN.xpi 273138 RMD160 8bfcbf511e4c899767021091a463ee6dbc5742
 DIST firefox-13.0-zh-TW.xpi 274059 RMD160 3b98f036f4e21ab941aabd0d78a896b51626336e SHA1 65dbca96ac33b1c4f6c15ff8c40a04d5c8a397db SHA256 20af0bdeac9fc590cbef9334261d5e82f72ea9945bc872f0825a7a83a86aa6f0
 DIST firefox-13.0-zu.xpi 261910 RMD160 cc5892e61c30e38aaadcffda0cf0239a74711514 SHA1 eaa135f95e99d60b80b464811d04b831bf414bb5 SHA256 fd120c3d6092288b8c0f70bc37de9d719f7faa515ac46cd9ea0ac963c7aaebe6
 DIST firefox-13.0.source.tar.bz2 79605635 RMD160 8dbb9ef17fb5a47f3ae53ae9626e7668116111c7 SHA1 f90608874a54883b9fbb90b8d6dd3dc75a305572 SHA256 dc801286e752ba3c2006caa0728024cb5b92460d9a3a1636c111c1f4f4f50b55
-DIST firefox-14.0-patches-0.1.tar.xz 9832 RMD160 70d23bc9e3860c405126bcb3a1365e81fd46fce6 SHA1 71a3c33ffa4423db46c4758690424e33a7f386da SHA256 9490723fc44e89dbf541d3427796cdab1a9398e43f869a30e35455c7fb5ee8b5
-DIST firefox-14.0a2_7f3c5dd8e78f.source.tar.bz2 81112940 RMD160 e5412ebb1fbe471b04aeba1ad18b579224c9e2b4 SHA1 8ba004b4b6a8b31fba50c12926113e141ac917fd SHA256 c02f8e267d61ad9be7837645bf02b71a3df125c681a4a639abbfdad73b75e466
+DIST firefox-14.0-patches-0.2.tar.xz 11904 RMD160 63951363d88da2c77ba6d6cdc52a7b2a0a76592f SHA1 5758f74c307d2059d6c54658136b6ccd484c3dac SHA256 0a056263037cc8481521948efb7a947d6ccefa35e945c899b426ae2d91ba02c0
+DIST firefox-14.0b7.source.tar.bz2 82426700 RMD160 55a7118b3213945677e8bf3d97a8869ab0be7211 SHA1 9550e9f30e1e967ae5c84bf2752640ed5b715850 SHA256 3eb9ed6b12c7d77dae55a942f0911e54c8bb4e86453a6c1b3308ba27ef0768a1
+DIST firefox-15.0-patches-0.1.tar.xz 6660 RMD160 e91cc5fcbe3fb35dc53e930d3b97bf5cd2b439b6 SHA1 2afbe928a25f75b65cd52eb9361460ab50da6b46 SHA256 04ed66367039f172dd72aca0c774eef6a016f8a1bd86b286997bee37430bbeee
+DIST firefox-15.0a2_8a3042764de7.source.tar.bz2 81578584 RMD160 fdd90c38615a47e46e824ef27b10fa1e945f8b71 SHA1 1734dafe9055f2788baee07cfbee4c60f94049e7 SHA256 c99631579a5e7ff7869e489e8d7e659652d448469d153ba5ecbe251c79168781
 EBUILD firefox-10.0.5.ebuild 10770 RMD160 7d64c4c002d67c3fe3a5e64894ac585a188a83f4 SHA1 ee4ad9e22a4fef64ea28742c5122bfaa06327f96 SHA256 9d26129721352967e0ed2560a475bfcf66e0531c135007b635f7efc8b72ba3f2
 EBUILD firefox-13.0.ebuild 11072 RMD160 33edb80cf6bfee4e0766004c3487238d64b3ca19 SHA1 ac77d0538582492768b0a45ce6b9aa6b445dda8c SHA256 24f9693228005257e5f95d2dabc23a6f8ef34d384c5345a4ea335255ea5cd8ff
-EBUILD firefox-14.0_alpha2-r1.ebuild 11475 RMD160 7a6d2b65f2698736aa1acf99dde3b00d4ea59bbf SHA1 1f87a0029232479a170a2d9e54ca4fe083cb7321 SHA256 cff2d627e28e6f2eacd4fe742dd93a98f23961dccd7f66b77dd0aa1d69892fea
+EBUILD firefox-14.0_beta7.ebuild 11491 RMD160 cae9405cce24bc75ad4123e16a1f8c56712aa35a SHA1 885764b07726d04692e86f4656622cad8c2f146e SHA256 015dac82f4d6aae751f440d053df7f749c448c8bc1be510924b62c69fb623853
+EBUILD firefox-15.0_alpha2.ebuild 11511 RMD160 1f0c51f97fe362c483a78928d3f15e5bc4aa7bab SHA1 108d9c0d4bc97917ff21fdec7d1580894e69d743 SHA256 7fc377d0da492e75186d0de9c9712dab354bfab9daf884c059707c3b8388f81d

diff --git a/www-client/firefox/files/firefox-14.0_alpha2-gst-aac-mp3.patch b/www-client/firefox/files/firefox-14.0_beta7-gst-aac-mp3.patch
similarity index 100%
rename from www-client/firefox/files/firefox-14.0_alpha2-gst-aac-mp3.patch
rename to www-client/firefox/files/firefox-14.0_beta7-gst-aac-mp3.patch

diff --git a/www-client/firefox/files/firefox-14.0_alpha2-gst-youtube-h264.patch b/www-client/firefox/files/firefox-14.0_beta7-gst-youtube-h264.patch
similarity index 100%
rename from www-client/firefox/files/firefox-14.0_alpha2-gst-youtube-h264.patch
rename to www-client/firefox/files/firefox-14.0_beta7-gst-youtube-h264.patch

diff --git a/www-client/firefox/firefox-14.0_alpha2-r1.ebuild b/www-client/firefox/firefox-14.0_beta7.ebuild
similarity index 97%
copy from www-client/firefox/firefox-14.0_alpha2-r1.ebuild
copy to www-client/firefox/firefox-14.0_beta7.ebuild
index b650d36..8549aa9 100644
--- a/www-client/firefox/firefox-14.0_alpha2-r1.ebuild
+++ b/www-client/firefox/firefox-14.0_beta7.ebuild
@@ -9,10 +9,10 @@ MOZ_ESR=""
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
 MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
-gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
-nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
-te th tr uk vi zh-CN zh-TW zu)
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mn
+mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE
+sw ta ta-LK te th tr uk vi zh-CN zh-TW zu)
 
 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
 MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-14.0-patches-0.1"
+PATCH="${PN}-14.0-patches-0.2"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"

diff --git a/www-client/firefox/firefox-14.0_alpha2-r1.ebuild b/www-client/firefox/firefox-15.0_alpha2.ebuild
similarity index 98%
rename from www-client/firefox/firefox-14.0_alpha2-r1.ebuild
rename to www-client/firefox/firefox-15.0_alpha2.ebuild
index b650d36..2316d74 100644
--- a/www-client/firefox/firefox-14.0_alpha2-r1.ebuild
+++ b/www-client/firefox/firefox-15.0_alpha2.ebuild
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-14.0-patches-0.1"
+PATCH="${PN}-15.0-patches-0.1"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
@@ -58,7 +58,7 @@ RDEPEND="
 	gstreamer? (
 		>=media-libs/gstreamer-0.10.33:0.10
 		>=media-libs/gst-plugins-base-0.10.33:0.10 )
-	system-sqlite? ( >=dev-db/sqlite-3.7.11[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
+	system-sqlite? ( >=dev-db/sqlite-3.7.12.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] )
 	webm? ( >=media-libs/libvpx-1.0.0
 		media-libs/alsa-lib )
 	crashreporter? ( net-misc/curl )
@@ -75,7 +75,7 @@ DEPEND="${RDEPEND}
 
 # No source releases for alpha|beta
 if [[ ${PV} =~ alpha ]]; then
-	CHANGESET="7f3c5dd8e78f"
+	CHANGESET="8a3042764de7"
 	SRC_URI="${SRC_URI}
 		http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
 	S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
@@ -143,7 +143,7 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"
 
-	epatch "${FILESDIR}"/${P}-gst-*.patch
+	epatch "${FILESDIR}"/${PN}*-gst-*.patch
 
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
@@ -205,6 +205,7 @@ src_configure() {
 	mozconfig_annotate '' --enable-safe-browsing
 	mozconfig_annotate '' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi
+	# TODO: --enable-system-pixman
 	mozconfig_annotate 'Missing features' --disable-system-cairo
 
 	# Other ff-specific settings



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, profiles/, www-client/firefox/files/
@ 2012-07-18 11:52 Nirbheek Chauhan
  0 siblings, 0 replies; 2+ messages in thread
From: Nirbheek Chauhan @ 2012-07-18 11:52 UTC (permalink / raw
  To: gentoo-commits

commit:     65d2be7fede0608615d8d12e9c0c6c22a2547340
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 09:51:59 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Jul 18 11:52:01 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=65d2be7f

firefox: bump to 15.0_beta1

* Patches were ported, but need verification

---
 profiles/package.mask                              |    2 +-
 www-client/firefox/Manifest                        |    7 +++--
 .../firefox-15.0_beta1-fix-packager-xargs-rm.patch |   20 ++++++++++++++++++
 ...5.0_alpha2.ebuild => firefox-15.0_beta1.ebuild} |   22 ++++++++++++-------
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 25280a0..9cc1296 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -6,4 +6,4 @@
 #
 
 # Mask nightlies
-=www-client/firefox-15*
+=www-client/firefox-16.0_alpha*

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 72820d6..4d500c7 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,5 +1,6 @@
 AUX firefox-14.0_beta7-gst-aac-mp3.patch 2454 SHA256 ef3e6539d292629a52a592cecd90a23562480d7280cfd3883d4407ad06e418a7 SHA512 ecd4b594371b6ff00980fd79959805e87e2f54deb5b790c246c7e592b5c29e7e847c3a9863730c891532a5180c67937e73f8474aa3e4a16b94a35ba4e29624ad WHIRLPOOL cc977bd7cc1b48162e906ad4541592b153d9a0434c8d608fdb2b281ba143385a95808135e967876813435a31caf323f4f0b28bc6751d5285969d7c6dfe46874e
 AUX firefox-14.0_beta7-gst-youtube-h264.patch 1437 SHA256 9b871769727e6d16939c55695b4f08c6b460c3f6cf5bce46ce429f40c4801669 SHA512 b5964f9e569281209db492d27f6f1c12fb316fd52bb67e624ed438a3c005018f1c5554f6c976ab226541dc86a3ac47e26a07146c1cf9f549685d03605e217909 WHIRLPOOL 928bb7abe481188ad229fd833fd282e388cbf65166477c65e166f0af83784e4d3219cc4d2b8127df2cad13213d1cecfbb26afe9f6dc2059618c7f7c39c52fd6a
+AUX firefox-15.0_beta1-fix-packager-xargs-rm.patch 1250 SHA256 e3eb098642cbdcb5b02d2ee52ae7d13b4989e41dc789e4c0f9aea9f071aa0895 SHA512 f161953e01ccb2db73727db79362164fa35763f5785bf82e087a57bf1f83bb755bde9a96b905649c351489545923515548b46cad39acdc09210e960a9b691714 WHIRLPOOL 57cf2e4eb21762c70ae0c2d3cc2a8d165eaf165756b8b37c7327ab25a95e2a3916d81590cd95dd42104330034beb11e61953cfab0486652f3c304c15321b29bf
 AUX gentoo-default-prefs.js-1 821 SHA256 16259ec24a231d1d60097c8d892caa80d2703ba5be72304f6da55cfce1b329de SHA512 b63542c51edfe0158ce487b317ea6d36ffc17cf8457534adb6aa3f613d9a027f4285c9dcf76eb1b96de6bbc10ba09948fa6c081e00cfb25ca47450cbc32923f2 WHIRLPOOL 770d4b15f1b142ee1f59ce47f7b6d9e4bf4adb20a8a9fc104ea7d6c2481edb0d685c2e672008dbd869d92e8b24ea6ad8efdb4180421ff19ae88d0a9f6f752121
 AUX icon/firefox.desktop 276 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5 SHA512 3ab9aa94d3006518fb154c887e9be99fd372a75ac128b8d37debe5d72f26fb7103dd36f75bb6111750e93d520b730a29a8118805fe84be8f3021e4528c0ec47e WHIRLPOOL 9722c40c167bb1a76e7a81e3b1aedbb3cd10a09e00361fe1678883feff33e1d9ce31379f150a757d8b2667715175c2bbc16a714164d02210b4284ee91a25f8f5
 DIST firefox-10.0-patches-0.9.tar.xz 19120 SHA256 55841946b9b74d68c70323feb9dfcca2570b22c5b979417e4a26c37e3c355c9f
@@ -177,8 +178,8 @@ DIST firefox-14.0.1-zh-CN.xpi 279886 SHA256 4d924b9efe324c58b65ed301faaabeb5a223
 DIST firefox-14.0.1-zh-TW.xpi 280804 SHA256 b518709a1fa973bdccf643e24d76e32b7db6a1f492e4c583ff3ce51f3dc235b2 SHA512 29162834b48dd4c5bbf1798a88e47ea00f5d4cc983b00d1cef3146485f991aae6f8bec598d3760d401197face6abf2fa164fbd17792de8d3e64c838b11e7ec14 WHIRLPOOL 7714477ce0cc681e269d1627ff89ed69b23d5feee6966776a9f1fcc6b902bda3033058ac8d9c20709adf7d872df8c94630111043818ac74f5cc3b8594eb74949
 DIST firefox-14.0.1-zu.xpi 268032 SHA256 4fa27fe75f4e2c8e15f670d21af6d24778a0fa8deda1e96ad132abb5a816ede5 SHA512 242bffb940d2d4f31b1174ea9df106f3e009f77117929d713818b72f4a4c4b6245298a6b2126bae51b3d591d4e51156c2d9e279b1b15cca70668266e9a881671 WHIRLPOOL 59df4d74d7ab20d4a8c808c32d7fa88fc19a52381b4b2e65ffa78dac55f29b3800c6a1ac681093379b0cab28fdb5c313e4034c567af7be98d8c97a2fe309021d
 DIST firefox-14.0.1.source.tar.bz2 82478218 SHA256 c21988f0207b678376c3d96f647aadf6d694e836f0b5c933ec15d93b75ea89aa SHA512 1d7c5f7138858fcc97bdcbc305b2a68f0210d75b9cf2eb1a5cd1825752c6a5d84cdd91fa2f3abdb200f38b7a295f3415d99225e5dd2517aec9522b4628c4f323 WHIRLPOOL 7fa571f5eda005969f1b99ecd451892cad3bdd09592044190788a5428a0c0cc3c20b8b7b4e4669a592c3011531a7ccb7877fd26f4878891caf30b64969c1a71c
-DIST firefox-15.0-patches-0.1.tar.xz 6660 SHA256 04ed66367039f172dd72aca0c774eef6a016f8a1bd86b286997bee37430bbeee
-DIST firefox-15.0a2_8a3042764de7.source.tar.bz2 81578584 SHA256 c99631579a5e7ff7869e489e8d7e659652d448469d153ba5ecbe251c79168781
+DIST firefox-15.0-patches-0.2.tar.xz 8240 SHA256 bf423c92ddde2cc60a70585104bb97ec951b633ce4cf3a64f3c187447d526d31 SHA512 1f3fab3988750a5fd93f26293a9bff4cd2ee2ad83bfaad9667eefb6f7987899601969c6697640b3cbec4e7c2bfb7f1da1895fa8bce4fa825cba4269b6d7e7b84 WHIRLPOOL 76a8e5ba4cc45d2e4016cdec37b08a7d491b02fdd3b697c5c4dc7c241b140a49dedf0d5566715bb0aa0460ece4bf4bfc5256c9f541611bb8d6c0eee2aa9673b4
+DIST firefox-15.0b1.source.tar.bz2 83457653 SHA256 07e5b0907925148608643d28ef37e9a5be290ca3212dc1e5c2897dd9a1d970dd SHA512 c6cbbf9d9a14e53e6203716bd20ccaa10c198cbd45fc608280b5809ff8c095a4090394ca83c068e81dabb16de539bac7680131b30f8cc2096d362ad8afb45a23 WHIRLPOOL 6f4543fa012b66018677b6d4fc01ef5983599f2f30b98e47e276c4c7179ff7682aaaba3fc3145b63eb0ad4048b9a12603d94b86d144405d801d217e1bcb4adbe
 EBUILD firefox-10.0.6.ebuild 10714 SHA256 1f03e3ab5474e9265cb23c916ca48ffa02ff6bbd3f0045aa6dce2737d8256b7d SHA512 13b91d410654e3318eaaf4015c59fcf740f75bbae2a4eda98c48e7663b0e581c5bc9c6282bb499bb10159119467b757a73a40eba655367a7e5c1a8099b46b08a WHIRLPOOL c6a25110739d6633b0a856cf59d740276534fb0e0f31e8d043ed3257fa89ae23a90692ca9c0e05f13a2ca45a35e5ed910366e3c3b463ee4246e01c9e91407125
 EBUILD firefox-14.0.1.ebuild 11435 SHA256 2849e8ad042ad9b9b0d4ae0fc9a8b6b512a626bf9192b5f9d18da2d260356318 SHA512 9d89525e192a19de74d6fc6ca4289c39895182285b1fa143211b057007d9ca596120dda8574aa831b98db82d548a2807499b5ed499794b15c534703be41286a9 WHIRLPOOL 339b89aa6574c18d88d0decfa69d3aa6cf4644176c36c193efe2eaf5651c0cb04ecac508d8bac4eb31c6d69ce9ac57ecf615f0e20bda7d9159313be6dc25a064
-EBUILD firefox-15.0_alpha2.ebuild 11274 SHA256 23c0d5557441e8f90d8dba34cc26a2f08c59b93e63aff76ec37b760ec443aa3e SHA512 6c6c49a5d8e51ec0d95eefe155b0ce1a4af2baa2633388f16c4760aacaa34759a1c9434ebcfeaf49e834f56e6bd70c1576f3e46709164d86e3d4197d4cc03d09 WHIRLPOOL 28655ab08c7446623537e501a73228a5747440bddc789cefd63c8063569151564a9da748380b1b7c2a9bef3064c406be6de776b4006d521b793579ea13429605
+EBUILD firefox-15.0_beta1.ebuild 11560 SHA256 13f4dc574ee4f34119c648def9c989c5e3bc23755ed70b91588fa5e73b03fbbf SHA512 dea1b40bd0fa832a2781fd15fec46204d61a0f00328e2c3fb0666f22594a4178b7e6b547fb3c36804405abcdb1f3ba3e9581be0d642ca9dcad87a3e2bee7027a WHIRLPOOL dc1250ee6fc6c2b4e01453281bc969d9a6923cd336fc7338fe9c2fd924623b1ed8886a1600c042b2517666ff41aec5a7de15a1a1722c58f4988b552abd3dd669

diff --git a/www-client/firefox/files/firefox-15.0_beta1-fix-packager-xargs-rm.patch b/www-client/firefox/files/firefox-15.0_beta1-fix-packager-xargs-rm.patch
new file mode 100644
index 0000000..f57f1dd
--- /dev/null
+++ b/www-client/firefox/files/firefox-15.0_beta1-fix-packager-xargs-rm.patch
@@ -0,0 +1,20 @@
+--- mozilla-beta/toolkit/mozapps/installer/packager.mk.orig	2012-07-18 14:29:37.566158085 +0530
++++ mozilla-beta/toolkit/mozapps/installer/packager.mk	2012-07-18 14:29:52.824158912 +0530
+@@ -920,7 +920,7 @@
+ 	if test -f $(DIST)/include/xpcom-config.h; then \
+ 	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ 	fi
+-	find $(DIST)/sdk -name "*.pyc" | xargs rm
++	find $(DIST)/sdk -name "*.pyc" | xargs rm -f
+ 	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
+ 	(cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
+ 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+@@ -941,7 +941,7 @@
+ 	(cd $(DIST)/host/bin && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin && tar -xf -)
+ 	$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/sdk
+-	find $(DIST)/sdk -name "*.pyc" | xargs rm
++	find $(DIST)/sdk -name "*.pyc" | xargs rm -f
+ 	(cd $(DIST)/sdk && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DIST)/$(MOZ_APP_NAME)-sdk/sdk && tar -xf -)
+ 	$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/include

diff --git a/www-client/firefox/firefox-15.0_alpha2.ebuild b/www-client/firefox/firefox-15.0_beta1.ebuild
similarity index 93%
rename from www-client/firefox/firefox-15.0_alpha2.ebuild
rename to www-client/firefox/firefox-15.0_beta1.ebuild
index f5a6a40..d1c27e1 100644
--- a/www-client/firefox/firefox-15.0_alpha2.ebuild
+++ b/www-client/firefox/firefox-15.0_beta1.ebuild
@@ -9,10 +9,10 @@ MOZ_ESR=""
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
 MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
-gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
-nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
-te th tr uk vi zh-CN zh-TW zu)
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mn
+mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE
+sw ta ta-LK te th tr uk vi zh-CN zh-TW zu )
 
 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
 MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
@@ -25,7 +25,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-15.0-patches-0.1"
+PATCH="${PN}-15.0-patches-0.2"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
 MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
@@ -142,7 +142,10 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/firefox"
 
-	epatch "${FILESDIR}"/${PN}*-gst-*.patch
+	# Allow AAC and H.264 files to be played using <audio> and <video>
+	epatch "${FILESDIR}"/${PN}*-gst*.patch
+	# Don't error out if there's no *.pyc files to clean
+	epatch "${FILESDIR}"/${PN}-15.0_beta1-fix-packager-xargs-rm.patch
 
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
@@ -176,6 +179,11 @@ src_prepare() {
 		-i "${S}"/config/system-headers \
 		-i "${S}"/js/src/config/system-headers || die "Sed failed"
 
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
 	eautoreconf
 }
 
@@ -204,8 +212,6 @@ src_configure() {
 	mozconfig_annotate '' --enable-safe-browsing
 	mozconfig_annotate '' --with-system-png
 	mozconfig_annotate '' --enable-system-ffi
-	# TODO: --enable-system-pixman
-	mozconfig_annotate 'Missing features' --disable-system-cairo
 
 	# Other ff-specific settings
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}



^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-07-18 11:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-13 14:02 [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, profiles/, www-client/firefox/files/ Nirbheek Chauhan
  -- strict thread matches above, loose matches on Subject: below --
2012-07-18 11:52 Nirbheek Chauhan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox