| 1 |
commit: 154b584915f1dda8b6dfb99fd774915bc512bc92 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 29 19:26:12 2011 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 29 19:26:12 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=154b5849 |
| 7 |
|
| 8 |
seamonkey: Added patch to make gconf optional. |
| 9 |
|
| 10 |
--- |
| 11 |
www-client/seamonkey/Manifest | 3 ++- |
| 12 |
www-client/seamonkey/seamonkey-2.1_beta2.ebuild | 15 ++++++++------- |
| 13 |
2 files changed, 10 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest |
| 16 |
index 8e50d77..debfaf5 100644 |
| 17 |
--- a/www-client/seamonkey/Manifest |
| 18 |
+++ b/www-client/seamonkey/Manifest |
| 19 |
@@ -1,4 +1,5 @@ |
| 20 |
AUX 2.1/seamonkey-2.1b1-configure-fix.patch 690 RMD160 854bf17b5b5b5806c4936f80fbbd971e822a88e0 SHA1 10c39ddf76e3638fced4e48bbc2443b4eb88078c SHA256 f4b4a786ff743e9618d663832fbe7f21b36b0f84e1bf04cd0dae106da18fd2f4 |
| 21 |
+AUX 2.1/seamonkey-2.1b2-gconf-config-update.patch 1569 RMD160 e237530c4d95de84aa295927fd1c703d8a54b9a9 SHA1 6f78524f88fd7b3f4fef4eec1666eabe96c89992 SHA256 9da47f2752f7bb353297b93be3aaecf2d6004af3c91717d22e35a347ee6cf2a2 |
| 22 |
AUX 2.1/seamonkey-2.1b2-system-cairo-fixup.patch 3364 RMD160 e823edc67c7d0984fed7645b09c417b93eb663ed SHA1 62b3f66be453a2fb13e2504858849aaef72bbb44 SHA256 fac11adcee4f506a005725a5741f55ba55810f7bcfc82fce5fba4317c84f4be5 |
| 23 |
AUX 2.1/seamonkey-libnotify07.patch 1117 RMD160 d9258ba252d3c94e8ac706424e94f055b278b499 SHA1 22502e4414f125efbada4812116f1e189c749782 SHA256 05ed978e07d1d74b38c53b205f98cc502dc6ce31cb04a21ad5f20a7a2fb5bdac |
| 24 |
AUX 2.1/xulrunner-libpng15.diff 446 RMD160 a6b43dde909929befa6b7ec38f0fb51d0ddf4ac5 SHA1 6e9dd65b774022111c6723bda5341acadef8b040 SHA256 ece56d83be83178bc05bcd3b11251624371522d2db932974f4a6e72f49857e51 |
| 25 |
@@ -24,4 +25,4 @@ DIST seamonkey-2.1b2-ru.xpi 885903 RMD160 7a2a6d60609521013fe2380d5ab67f59490730 |
| 26 |
DIST seamonkey-2.1b2-sk.xpi 835935 RMD160 6ab9dcc723d2bb147a23d84532eaf13ca94eea07 SHA1 b3ef9378fd13566bd3443f9e3507c7ba96a8391a SHA256 78a5a655567e4fed278911b99443c23c671065a6a864aebfbb29fbafa4fae0f0 |
| 27 |
DIST seamonkey-2.1b2-sv-SE.xpi 867156 RMD160 6d3ca2aab099e6bc6c57c641b20a1ab10751a31e SHA1 ec46f7c052ed388d3022ad7ffeb4c6a6c0e8b0aa SHA256 abb1bff1771543d6202fc520f66acec930be02dec1d2c75b329b96955ec6815c |
| 28 |
DIST seamonkey-2.1b2.source.tar.bz2 83425193 RMD160 d7a9a61fd470a58e19f4e9b2d2c7a00eaf1362ac SHA1 c94fd66240fd9d77a73fdeec271131c23fd6cf98 SHA256 9f9e59303b1d39dc97aa943f49018a572d41b5e566c66e176f1f012e2e9d898a |
| 29 |
-EBUILD seamonkey-2.1_beta2.ebuild 9803 RMD160 e3ce63315f5593ac199542d8f3ac0b6199be74c1 SHA1 c08369a38f332835aecf6f2f771322ab9bf1ed96 SHA256 26a55525b54cc839c2cc01fb762f35ba96f092535287eb0998fc3b06f7b8ccae |
| 30 |
+EBUILD seamonkey-2.1_beta2.ebuild 9938 RMD160 d25cfd907b05a60add6f2e5783f6bdfa45b7dcf9 SHA1 8c9c3737078166fa0a5501b149ac72e7448fb99f SHA256 3f19c147f4528374ac731d3bdca8f3eb179b8a7135334d904b896313efa7e8b3 |
| 31 |
|
| 32 |
diff --git a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild |
| 33 |
index 5a7ddbb..879e6de 100644 |
| 34 |
--- a/www-client/seamonkey/seamonkey-2.1_beta2.ebuild |
| 35 |
+++ b/www-client/seamonkey/seamonkey-2.1_beta2.ebuild |
| 36 |
@@ -41,7 +41,7 @@ HOMEPAGE="http://www.seamonkey-project.org" |
| 37 |
|
| 38 |
SLOT="0" |
| 39 |
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" |
| 40 |
-IUSE="+alsa +chatzilla +composer +crypt ldap +mailclient +roaming +webm" |
| 41 |
+IUSE="+alsa +chatzilla +composer +crypt gconf ldap +mailclient +roaming +webm" |
| 42 |
|
| 43 |
SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 |
| 44 |
http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.bz2 |
| 45 |
@@ -70,7 +70,7 @@ RDEPEND=">=sys-devel/binutils-2.16.1 |
| 46 |
>=dev-libs/nspr-4.8.7 |
| 47 |
>=media-libs/libpng-1.4.1[apng] |
| 48 |
>=x11-libs/pango-1.14.0[X] |
| 49 |
- |
| 50 |
+ gconf? ( >=gnome-base/gconf-1.2.1:2 ) |
| 51 |
crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) ) |
| 52 |
webm? ( media-libs/libvpx |
| 53 |
media-libs/alsa-lib )" |
| 54 |
@@ -145,6 +145,7 @@ src_prepare() { |
| 55 |
if has_version \>=media-libs/libpng-1.5.0 ; then |
| 56 |
epatch "${FILESDIR}"/2.1/xulrunner-libpng15.diff |
| 57 |
fi |
| 58 |
+ epatch "${FILESDIR}"/2.1/${PN}-2.1b2-gconf-config-update.patch |
| 59 |
|
| 60 |
if use crypt && use mailclient ; then |
| 61 |
mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail |
| 62 |
@@ -165,16 +166,15 @@ src_prepare() { |
| 63 |
sed -i -e s:MOZ_JAVAXPCOM\=1::g ${S}/mozilla/xulrunner/confvars.sh \ |
| 64 |
|| die "sed javaxpcom" |
| 65 |
|
| 66 |
- eautoreconf |
| 67 |
- cd "${S}"/mozilla || die |
| 68 |
- eautoreconf |
| 69 |
- cd "${S}"/mozilla/js/src || die |
| 70 |
- |
| 71 |
# Disable gnomevfs extension |
| 72 |
sed -i -e "s:gnomevfs::" "${S}/"suite/confvars.sh \ |
| 73 |
|| die "Failed to remove gnomevfs extension" |
| 74 |
|
| 75 |
eautoreconf |
| 76 |
+ cd "${S}"/mozilla || die |
| 77 |
+ eautoreconf |
| 78 |
+ cd "${S}"/mozilla/js/src || die |
| 79 |
+ eautoreconf |
| 80 |
} |
| 81 |
|
| 82 |
src_configure() { |
| 83 |
@@ -211,6 +211,7 @@ src_configure() { |
| 84 |
mozconfig_annotate '' --enable-canvas |
| 85 |
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} |
| 86 |
|
| 87 |
+ mozconfig_use_enable gconf |
| 88 |
mozconfig_use_enable ldap |
| 89 |
mozconfig_use_enable ldap ldap-experimental |
| 90 |
mozconfig_use_enable mailclient mailnews |
Archives