From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: net-libs/xulrunner/files/, www-client/firefox/, net-libs/xulrunner/, ...
Date: Mon, 28 Mar 2011 19:11:44 +0000 (UTC) [thread overview]
Message-ID: <251e8af35ff4eeb16cc73a2f974a9eb938dd873c.anarchy@gentoo> (raw)
commit: 251e8af35ff4eeb16cc73a2f974a9eb938dd873c
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 19:11:54 2011 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 19:11:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=251e8af3
make gconf support optional
---
net-libs/xulrunner/Manifest | 3 +-
.../files/mozilla-2.0-gconf-config-update.patch | 25 ++++++++++++++++++++
...ulrunner-2.0.ebuild => xulrunner-2.0-r1.ebuild} | 6 ++++-
www-client/firefox/Manifest | 3 +-
.../files/mozilla-2.0-gconf-config-update.patch | 25 ++++++++++++++++++++
...firefox-4.0-r1.ebuild => firefox-4.0-r3.ebuild} | 7 +++--
6 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 35e7fde..7b7b21c 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,4 +1,5 @@
+AUX mozilla-2.0-gconf-config-update.patch 827 RMD160 9de17d272f6e5899f79d713b965537f66d17db79 SHA1 5f575306bec598b1ff31dccccf42fd87de25c36c SHA256 d9c53a9a728cd4e350fb4a55ab6a0783b38e4c695946b63574e7179a84c346c8
AUX xulrunner-default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83949f8f8236e2081d SHA1 403da9dd65662e5c4dd34299214e04cb6f80575e SHA256 78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f
DIST xulrunner-2.0-patches-1.3.tar.bz2 63693 RMD160 aaa6901e5dc94cbe88a2e0b5cfacbf7325ef97d2 SHA1 e3968f710e018b2c0ce017cea3e9152d157cd39b SHA256 f91949ef2cc61d9d7f7ccd242c3b0da730acb99e68a612d6ff3dfa9e7fd2aa25
-EBUILD xulrunner-2.0.ebuild 5472 RMD160 b04bb737d4b6be437982ef5c03f055e2ae0da838 SHA1 c58406dcc7861301834455bce8b3cb1c2378a241 SHA256 f2d74ba33a0aea5e55734418e0335ab10c19a3a7e8c9be87ec38217a6d3be1d0
+EBUILD xulrunner-2.0-r1.ebuild 5606 RMD160 38e5541f3a0be7190cfd2afab97731c05d4bd99f SHA1 50476a55e479eb1432e6f8d648c8f310e596128f SHA256 df2feda76380fef8a5dfa8ddbb0e8ab3a698c06ea3a0c6309a188114d6ef6833
diff --git a/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch b/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch
new file mode 100644
index 0000000..464e1e1
--- /dev/null
+++ b/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -5701,16 +5701,21 @@ then
+
+ AC_SUBST(MOZ_ENABLE_GIO)
+ AC_SUBST(MOZ_GIO_CFLAGS)
+ AC_SUBST(MOZ_GIO_LIBS)
+
+ dnl ========================================================
+ dnl = GConf support module
+ dnl ========================================================
++ MOZ_ARG_DISABLE_BOOL(gconf,
++ [ --disable-gconf Disable Gconf support ],
++ MOZ_ENABLE_GCONF=,
++ MOZ_ENABLE_GCONF=force)
++
+ if test "$MOZ_ENABLE_GCONF"
+ then
+ PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
+ MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
+ MOZ_ENABLE_GCONF=1
+ ],[
+ if test "$MOZ_ENABLE_GCONF" = "force"
+ then
diff --git a/net-libs/xulrunner/xulrunner-2.0.ebuild b/net-libs/xulrunner/xulrunner-2.0-r1.ebuild
similarity index 96%
rename from net-libs/xulrunner/xulrunner-2.0.ebuild
rename to net-libs/xulrunner/xulrunner-2.0-r1.ebuild
index 402b912..10ce611 100644
--- a/net-libs/xulrunner/xulrunner-2.0.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0-r1.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SLOT="1.9"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+crashreporter +ipc system-sqlite +webm"
+IUSE="+crashreporter gconf +ipc system-sqlite +webm"
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
# More URIs appended below...
@@ -33,6 +33,7 @@ RDEPEND="
>=dev-libs/nss-3.12.9
>=dev-libs/nspr-4.8.7
>=dev-libs/glib-2.26
+ gconf? ( >=gnome-base/gconf-1.2.1:2 )
x11-libs/pango[X]
media-libs/libpng[apng]
system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
@@ -65,6 +66,8 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"
+ epatch "${FILESDIR}"/mozilla-2.0-gconf-config-update.patch
+
# Allow user to apply any additional patches without modifing ebuild
epatch_user
@@ -126,6 +129,7 @@ src_configure() {
mozconfig_annotate '' --enable-safe-browsing
mozconfig_annotate '' --with-system-png
mozconfig_use_enable system-sqlite
+ mozconfig_use_enable gconf
# Finalize and report settings
mozconfig_final
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index c3ec07d..2513aec 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -3,6 +3,7 @@ AUX fix-preferences-gentoo.patch 426 RMD160 83075ec3c2e4c39ba298096bd08447bb94ca
AUX icon/firefox-1.5-unbranded.desktop 258 RMD160 32ebb016d6a4d3d2728c031f3b3762796e02f5d3 SHA1 69820d445d06b90d7ac35ffd39dad5926caa0862 SHA256 f2bf5c237a5c56b443c20fd16d3da429bf3b99e9fe27b661a1a462aa46ed25d3
AUX icon/firefox-1.5.desktop 255 RMD160 4ef1cf548f11057274620b82f0728958a3424bea SHA1 6a440f817072fb60516c1a1d999dffb6d3fa1583 SHA256 9bf6e1264d986c68d64831d166ed6b506bff6df8b56d21bfc166aee09cbc753f
AUX icon/firefox.desktop 276 RMD160 92a5671cd09e399b3330c4be31b7ac7583747031 SHA1 b757763670a00982f3cb38b8d41d7faa6eee3818 SHA256 06565ade11b6e4b448cf10339696c43f31e73cb6824491094bb6e0ab902c7cf5
+AUX mozilla-2.0-gconf-config-update.patch 827 RMD160 9de17d272f6e5899f79d713b965537f66d17db79 SHA1 5f575306bec598b1ff31dccccf42fd87de25c36c SHA256 d9c53a9a728cd4e350fb4a55ab6a0783b38e4c695946b63574e7179a84c346c8
DIST firefox-4.0-af.xpi 220420 RMD160 ee8e95bbaf9e548082aca0a8029edc4cc6557afd SHA1 3a2da0b247983cdcf20a14faa2e3c1b6e3906264 SHA256 d4062ced61ccb4f1c37ee6c8793675e1c5da4d2a5e91ddf4c2d9f36561353492
DIST firefox-4.0-ak.xpi 222040 RMD160 0ba8ab5ec79abafe126a8045844e4839a772d1e8 SHA1 4979d5ecfdd90a723d95984f57b07ddc6ed2df57 SHA256 4a050f68c9f4c51f89bb946c2aec22b5e81ae6b8a1835f601fc747c692e4dc37
DIST firefox-4.0-ar.xpi 241600 RMD160 d22109a623f83319d64e16bba931bdecc7b71831 SHA1 d4bc970bcb8ccc6c0a5ff6cbcce157727261756e SHA256 be5d98d19c926861dd545bad492043983cd709f409cb88eb1931bd82ca816c79
@@ -80,4 +81,4 @@ DIST firefox-4.0-uk.xpi 260129 RMD160 4a7cda6a1ae6dd31d3b089b05e6bc4f85d0b0a3e S
DIST firefox-4.0-vi.xpi 239966 RMD160 94f90afd4a26b6f9b220a1f096f4259f1c4339ed SHA1 7b5602a5b9e0e67b31b27bc125eb3a62e0c71319 SHA256 9927c8bd3bbd796805bd70eb5a4b37d113715333542b7a262623e0f09b8aa2a6
DIST firefox-4.0-zu.xpi 227605 RMD160 56d91ea40c9983dc28db96af51a18cdd0b22a50d SHA1 a73c237b85bbb17924a2a2fc8499db380caa0f03 SHA256 474dfa2edf6cd692dbc05c9569d263ea326b02d91feb335a1e2e360117f524ae
DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83949f8f8236e2081d SHA1 403da9dd65662e5c4dd34299214e04cb6f80575e SHA256 78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f
-EBUILD firefox-4.0-r1.ebuild 8003 RMD160 6d4d7df9b8870dfd1cc957ed1cfef3bfd64c20d8 SHA1 4404cfb21b7d59588a17c0f573b922a2bce2e046 SHA256 8bd2a68ced58bffd0791168e3c7cada64474495e1ae3793dea455ce29ed0e4e4
+EBUILD firefox-4.0-r3.ebuild 8087 RMD160 e13930e8edc9455e20c2d5318f86e98fcf6e65f1 SHA1 5adb8e73464dc5a8c9cb93038c0ca170dddcb6f7 SHA256 e60278f8dcac1fc28e1823d9bb3f61e215d2d7dfbcfb10d87ee3896910e73e48
diff --git a/www-client/firefox/files/mozilla-2.0-gconf-config-update.patch b/www-client/firefox/files/mozilla-2.0-gconf-config-update.patch
new file mode 100644
index 0000000..464e1e1
--- /dev/null
+++ b/www-client/firefox/files/mozilla-2.0-gconf-config-update.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -5701,16 +5701,21 @@ then
+
+ AC_SUBST(MOZ_ENABLE_GIO)
+ AC_SUBST(MOZ_GIO_CFLAGS)
+ AC_SUBST(MOZ_GIO_LIBS)
+
+ dnl ========================================================
+ dnl = GConf support module
+ dnl ========================================================
++ MOZ_ARG_DISABLE_BOOL(gconf,
++ [ --disable-gconf Disable Gconf support ],
++ MOZ_ENABLE_GCONF=,
++ MOZ_ENABLE_GCONF=force)
++
+ if test "$MOZ_ENABLE_GCONF"
+ then
+ PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
+ MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
+ MOZ_ENABLE_GCONF=1
+ ],[
+ if test "$MOZ_ENABLE_GCONF" = "force"
+ then
diff --git a/www-client/firefox/firefox-4.0-r1.ebuild b/www-client/firefox/firefox-4.0-r3.ebuild
similarity index 98%
rename from www-client/firefox/firefox-4.0-r1.ebuild
rename to www-client/firefox/firefox-4.0-r3.ebuild
index a52bd85..aab2019 100644
--- a/www-client/firefox/firefox-4.0-r1.ebuild
+++ b/www-client/firefox/firefox-4.0-r3.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +ipc system-sqlite +webm"
+IUSE="bindist gconf +ipc system-sqlite +webm"
REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
# More URIs appended below...
@@ -35,11 +35,11 @@ RDEPEND="
>=dev-libs/nss-3.12.9
>=dev-libs/nspr-4.8.7
>=dev-libs/glib-2.26
- >=gnome-base/gconf-1.2.1:2
+ gconf? ( >=gnome-base/gconf-1.2.1:2 )
media-libs/libpng[apng]
x11-libs/pango[X]
system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
- ~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=]
+ ~net-libs/xulrunner-${XUL_PV}[wifi=,libnotify=,system-sqlite=,webm=,gconf=]
webm? ( media-libs/libvpx
media-libs/alsa-lib )"
@@ -137,6 +137,7 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"
+ epatch "${FILESDIR}"/mozilla-2.0-gconf-config-update.patch
epatch "${FILESDIR}"/fix-preferences-gentoo.patch
# Allow user to apply any additional patches without modifing ebuild
next reply other threads:[~2011-03-28 19:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-28 19:11 Jory Pratt [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-05-26 11:52 [gentoo-commits] proj/mozilla:master commit in: net-libs/xulrunner/files/, www-client/firefox/, net-libs/xulrunner/, Jory Pratt
2011-02-08 1:31 Jory Pratt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=251e8af35ff4eeb16cc73a2f974a9eb938dd873c.anarchy@gentoo \
--to=anarchy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox