diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-03-26 02:36:05 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-03-26 02:36:05 +0000 |
| commit | 0a8070fbe6a89b458469b6ddba795dd58d78b24b (patch) | |
| tree | dd1e43ab013fdaf90b740af2f43465aa3a45ddde /dev-util | |
| parent | bumping new ver to stable. old ver is undownloadable. (diff) | |
| download | gentoo-2-0a8070fbe6a89b458469b6ddba795dd58d78b24b.tar.gz gentoo-2-0a8070fbe6a89b458469b6ddba795dd58d78b24b.tar.bz2 gentoo-2-0a8070fbe6a89b458469b6ddba795dd58d78b24b.zip | |
fixes to bug #17530
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/gnustep-back/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/gnustep-back/gnustep-back-0.8.3.ebuild | 32 |
2 files changed, 25 insertions, 12 deletions
diff --git a/dev-util/gnustep-back/ChangeLog b/dev-util/gnustep-back/ChangeLog index 222db2b5503b..18230eb91769 100644 --- a/dev-util/gnustep-back/ChangeLog +++ b/dev-util/gnustep-back/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for dev-util/gnustep-back # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-back/ChangeLog,v 1.7 2003/02/15 01:01:02 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-back/ChangeLog,v 1.8 2003/03/26 02:36:05 liquidx Exp $ *gnustep-back-0.8.3 (04 Feb 2003) + 26 Mar 2003; Alastair Tse <liquidx@gentoo.org> gnustep-back-0.8.3.ebuild: + remove xft support if xft1 is not detected + 14 Feb 2003; Nick Hadaway <raker@gentoo.org> gnustep-back-0.8.3.ebuild : DEPEND update as suggested by Zhen Lin on bug #15687 diff --git a/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild b/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild index 8899e35ee297..bed386cc112f 100644 --- a/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild +++ b/dev-util/gnustep-back/gnustep-back-0.8.3.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/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild,v 1.5 2003/02/28 16:54:59 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/gnustep-back/gnustep-back-0.8.3.ebuild,v 1.6 2003/03/26 02:36:05 liquidx Exp $ inherit base @@ -11,23 +11,33 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="x86 -ppc -sparc" DEPEND="=dev-util/gnustep-gui-${PV}* - >=media-libs/tiff-3.5.7 - >=media-libs/jpeg-6b-r2 + >=media-libs/tiff-3.5.7 + >=media-libs/jpeg-6b-r2 x11-base/xfree" S=${WORKDIR}/${P} PATCHES="${FILESDIR}/${P}.xft1.patch" src_compile() { . /usr/GNUstep/System/Makefiles/GNUstep.sh - ./configure \ + ./configure \ --prefix=/usr/GNUstep \ - --with-jpeg-library=/usr/lib \ - --with-jpeg-include=/usr/include \ - --with-tiff-library=/usr/lib \ - --with-tiff-include=/usr/include \ - --with-x \ - || die "configure failed" - make || die + --with-jpeg-library=/usr/lib \ + --with-jpeg-include=/usr/include \ + --with-tiff-library=/usr/lib \ + --with-tiff-include=/usr/include \ + --with-x || die "configure failed" + + # if we don't have Xft1, then we don't do Xft support at all + # only gnustep-back > 0.8.4 has Xft2 support + if [ ! -f "/usr/X11R6/include/X11/Xft1/Xft.h" ]; then + sed "s,^#define HAVE_XFT.*,#undef HAVE_XFT,g" config.h > config.h.new + sed "s,^#define HAVE_UTF8.*,#undef HAVE_UTF8,g" config.h.new > config.h + + sed "s,^WITH_XFT=.*,WITH_XFT=no," config.make > config.make.new + sed "s,-lXft,," config.make.new > config.make + fi + + make || die } src_install () { |