summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD.M.D. Ljungmark <spider@gentoo.org>2003-12-22 00:20:21 +0000
committerD.M.D. Ljungmark <spider@gentoo.org>2003-12-22 00:20:21 +0000
commit76561c54ff9544dc03b02996953e8cb43b5a81c0 (patch)
tree53e5055bbb7791407727d6e12b1298f2a76dde0b /net-www/galeon
parentAttempts to fix #34721. (diff)
downloadhistorical-76561c54ff9544dc03b02996953e8cb43b5a81c0.tar.gz
historical-76561c54ff9544dc03b02996953e8cb43b5a81c0.tar.bz2
historical-76561c54ff9544dc03b02996953e8cb43b5a81c0.zip
Fixing intltool + XML::Parser incompabilities. Version mismatch override.
Diffstat (limited to 'net-www/galeon')
-rw-r--r--net-www/galeon/ChangeLog5
-rw-r--r--net-www/galeon/Manifest10
-rw-r--r--net-www/galeon/galeon-1.3.11a.ebuild10
3 files changed, 18 insertions, 7 deletions
diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 1133ddbd3b6d..62cf0ce19af9 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-www/galeon
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.73 2003/12/20 17:59:19 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.74 2003/12/22 00:20:04 spider Exp $
+
+ 22 Dec 2003; <spider@gentoo.org> galeon-1.3.11a.ebuild:
+ fixing with intltool XML-Parser incompabilities.
*galeon-1.3.11a (20 Dec 2003)
diff --git a/net-www/galeon/Manifest b/net-www/galeon/Manifest
index fd34c3240d92..c32d928bf569 100644
--- a/net-www/galeon/Manifest
+++ b/net-www/galeon/Manifest
@@ -1,10 +1,10 @@
+MD5 3833a31835223d6558a1169dbbf0262f ChangeLog 11131
MD5 6ec6747e6679fac5954a78068f6604b7 galeon-1.3.10.ebuild 1682
-MD5 65878082657174288f56cfc67f5ce905 galeon-1.3.11a.ebuild 1606
-MD5 7b7dd09b0d642dd338cfa53a5d9822bd ChangeLog 11020
+MD5 0b16bf0efa30392ce1b5079aea60ef94 galeon-1.3.11a.ebuild 1882
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
MD5 59ca1a1e92c8aca51986e7fe458bd0d9 galeon-1.2.12.ebuild 3571
-MD5 436b77780200d51a954cfa3fc77e9e2d files/digest-galeon-1.2.12 66
-MD5 db8a0894d9e2b9bbd8ad10e2a10e0928 files/digest-galeon-1.3.10 67
+MD5 c72506690307bdae2ceec562ac7fdbd9 files/galeon-1.2.7-google-UTF8.patch 1594
MD5 ae742c626affcc36e9763f8f56b81689 files/digest-galeon-1.3.11a 68
+MD5 db8a0894d9e2b9bbd8ad10e2a10e0928 files/digest-galeon-1.3.10 67
MD5 f4cef0104387767ea14b057e4fcd0cdc files/galeon-1.3.10-gcc2_fixes.patch 1262
-MD5 c72506690307bdae2ceec562ac7fdbd9 files/galeon-1.2.7-google-UTF8.patch 1594
+MD5 436b77780200d51a954cfa3fc77e9e2d files/digest-galeon-1.2.12 66
diff --git a/net-www/galeon/galeon-1.3.11a.ebuild b/net-www/galeon/galeon-1.3.11a.ebuild
index febe3f13c96b..d5fd764ce489 100644
--- a/net-www/galeon/galeon-1.3.11a.ebuild
+++ b/net-www/galeon/galeon-1.3.11a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.11a.ebuild,v 1.2 2003/12/20 18:01:18 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.11a.ebuild,v 1.3 2003/12/22 00:20:04 spider Exp $
inherit gnome2 debug libtool
@@ -31,6 +31,7 @@ RDEPEND="virtual/x11
DEPEND="${RDEPEND}
dev-util/pkgconfig
+ dev-perl/XML-Parser
dev-util/intltool
>=sys-devel/gettext-0.11"
@@ -44,8 +45,15 @@ pkg_setup () {
}
src_compile() {
+ # even when we have the XML-Parser module there may be a version mismatch
+ # this line will force the use of local intltool when compiling, avoiding mismatch
+ # remove this when we have all users at the same version as upstream.
+ intltoolize --force
+
elibtoolize
+
+
local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
local myconf="--disable-werror"