summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2004-05-30 13:37:31 +0000
committerHanno Böck <hanno@gentoo.org>2004-05-30 13:37:31 +0000
commit2d919eb61e02cc64b683793a83994fa3db0270fe (patch)
tree769d2cacf4e6951a52b9bfa44bb2a73e7b15ac00 /net-www/galeon
parent added gcc 3.4 fix. thanks to Malcolm Lashley for submitting it. (Manifest re... (diff)
downloadgentoo-2-2d919eb61e02cc64b683793a83994fa3db0270fe.tar.gz
gentoo-2-2d919eb61e02cc64b683793a83994fa3db0270fe.tar.bz2
gentoo-2-2d919eb61e02cc64b683793a83994fa3db0270fe.zip
various small galeon fixes
Diffstat (limited to 'net-www/galeon')
-rw-r--r--net-www/galeon/ChangeLog8
-rw-r--r--net-www/galeon/files/galeon-gcc34-fix.gzbin0 -> 290 bytes
-rw-r--r--net-www/galeon/galeon-1.3.14a.ebuild13
3 files changed, 18 insertions, 3 deletions
diff --git a/net-www/galeon/ChangeLog b/net-www/galeon/ChangeLog
index 6e0e38993f45..fbd78c2a26a7 100644
--- a/net-www/galeon/ChangeLog
+++ b/net-www/galeon/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-www/galeon
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.83 2004/05/12 12:55:08 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/ChangeLog,v 1.84 2004/05/30 13:37:31 hanno Exp $
+
+ 30 May 2004; Hanno Boeck <hanno@gentoo.org> +files/galeon-gcc34-fix.gz,
+ galeon-1.3.14a.ebuild:
+ Fix compilation with gcc 3.4.
+ Add support for mozilla 1.7-rc-versions.
+ Marked stable x86.
12 May 2004; Alexander Gabert <pappy@gentoo.org> galeon-1.2.12.ebuild:
removed hardened-gcc logic
diff --git a/net-www/galeon/files/galeon-gcc34-fix.gz b/net-www/galeon/files/galeon-gcc34-fix.gz
new file mode 100644
index 000000000000..854dbc52c62b
--- /dev/null
+++ b/net-www/galeon/files/galeon-gcc34-fix.gz
Binary files differ
diff --git a/net-www/galeon/galeon-1.3.14a.ebuild b/net-www/galeon/galeon-1.3.14a.ebuild
index 1fb201c527d9..8231ce79bf60 100644
--- a/net-www/galeon/galeon-1.3.14a.ebuild
+++ b/net-www/galeon/galeon-1.3.14a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 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.14a.ebuild,v 1.1 2004/03/28 14:46:25 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.14a.ebuild,v 1.2 2004/05/30 13:37:31 hanno Exp $
inherit gnome2 debug libtool
@@ -11,7 +11,7 @@ RESTRICT="nomirror"
IUSE=""
LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~ia64 ~amd64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~ia64 ~amd64"
SLOT="0"
S=${WORKDIR}/${P%%a}
@@ -45,6 +45,11 @@ pkg_setup () {
fi
}
+src_unpack() {
+ unpack ${A}
+ epatch ${FILESDIR}/galeon-gcc34-fix.gz
+}
+
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
@@ -54,6 +59,10 @@ src_compile() {
elibtoolize
+ if [ `echo ${moz_ver} | grep 1.7rc` ]
+ then
+ moz_ver="trunk"
+ fi
local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
local myconf="--disable-werror"