summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2003-04-08 12:13:17 +0000
committerMarinus Schraal <foser@gentoo.org>2003-04-08 12:13:17 +0000
commitc68065e8928750180518e55e394a5f8d5cf3b467 (patch)
tree280474f01b2e3bd594d794a5cdedee7dabaf039a /app-office/abiword
parentAdd patch for libtool-1.4.3 and autoconf-2.13 that cannot find sed (diff)
downloadhistorical-c68065e8928750180518e55e394a5f8d5cf3b467.tar.gz
historical-c68065e8928750180518e55e394a5f8d5cf3b467.tar.bz2
historical-c68065e8928750180518e55e394a5f8d5cf3b467.zip
dep fix
Diffstat (limited to 'app-office/abiword')
-rw-r--r--app-office/abiword/ChangeLog6
-rw-r--r--app-office/abiword/abiword-1.1.4.ebuild11
2 files changed, 12 insertions, 5 deletions
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 8d2a30208813..5cf7afff0886 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for app-office/abiword
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.31 2003/04/01 16:21:26 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.32 2003/04/08 12:13:17 foser Exp $
*abiword-1.1.4 (31 Mar 2003)
+ 08 Apr 2003; foser <foser@gentoo.org> abiword-1.1.4.ebuild :
+ Moved the fribidi lib from app-text to dev-libs
+ fixed ebuild to reflect the move
+
01 Apr 2003; foser <foser@gentoo.org> abiword-1.1.4.ebuild :
Added patch for configure to make the wv tests work
diff --git a/app-office/abiword/abiword-1.1.4.ebuild b/app-office/abiword/abiword-1.1.4.ebuild
index 9fde1aa8e374..1eeb63e2c112 100644
--- a/app-office/abiword/abiword-1.1.4.ebuild
+++ b/app-office/abiword/abiword-1.1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.1.4.ebuild,v 1.2 2003/04/01 16:21:26 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.1.4.ebuild,v 1.3 2003/04/08 12:13:17 foser Exp $
inherit eutils
@@ -22,7 +22,7 @@ DEPEND="virtual/x11
>=dev-libs/libole2-0.2.4-r1
>=x11-libs/gtk+-2
>=app-text/wv-0.7.5
- >=app-text/fribidi-0.10.4
+ >=dev-libs/fribidi-0.10.4
jpeg? ( >=media-libs/jpeg-6b-r2 )
perl? ( >=dev-lang/perl-5.6 )
( xml2? >=dev-libs/libxml2-2.4.10 : dev-libs/expat )
@@ -45,6 +45,9 @@ src_unpack() {
# April 1st 2003 <foser@gentoo.org>
cd ${S}
epatch ${FILESDIR}/${P}-wv_configure_fooling.patch
+
+ cd ${S}/src/af/ev/
+ epatch ${FILESDIR}/${P}-gcc2_fix.patch
}
src_compile() {
@@ -58,9 +61,9 @@ src_compile() {
&& myconf="${myconf} --enable-gnome" \
|| myconf="${myconf} --disable-gnome"
- econf ${myconf} --with-sys-wv || die
+ CFLAGS="${CFLAGS} `glib-config --cflags`" econf ${myconf} --with-sys-wv || die
- emake all-recursive || die
+ CFLAGS="${CFLAGS} `glib-config --cflags`" emake all-recursive || die
}
src_install() {