diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-03-21 22:59:12 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-03-21 22:59:12 +0000 |
| commit | c04e3e69108962cbb8f837c139766f21a7fa7300 (patch) | |
| tree | 2642c3a9200aa7dd89af41bd17807ceee41a2058 /x11-base | |
| parent | updated to 0.13.0. (diff) | |
| download | gentoo-2-c04e3e69108962cbb8f837c139766f21a7fa7300.tar.gz gentoo-2-c04e3e69108962cbb8f837c139766f21a7fa7300.tar.bz2 gentoo-2-c04e3e69108962cbb8f837c139766f21a7fa7300.zip | |
small fixor
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xfree/files/digest-xfree-4.2.0-r8 | 5 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.2.0-r8.ebuild | 12 |
3 files changed, 18 insertions, 6 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 6a29ef6b3cd4..80e343a5104f 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.6 2002/03/14 23:52:56 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.7 2002/03/21 22:59:12 azarah Exp $ + + 21 Mar 2002; Martin Schlemmer <azarah@gentoo.org> : + + Add gcc-3.x compile patch. Also resolve the mkfontdir issue in + pkg_postinst(), closing bug #996. *xfree-4.2.0-r8 (15 Mar 2002) diff --git a/x11-base/xfree/files/digest-xfree-4.2.0-r8 b/x11-base/xfree/files/digest-xfree-4.2.0-r8 index 9b0811d7be84..de7fcc928ba3 100644 --- a/x11-base/xfree/files/digest-xfree-4.2.0-r8 +++ b/x11-base/xfree/files/digest-xfree-4.2.0-r8 @@ -1,6 +1,7 @@ +MD5 2d5c738854c7cc0378ae457b09a029f4 4.2.0-libGLU-bad-extern.patch 1463 +MD5 19a91692fdb4fa3d2797f57beebee34a 4.2.0-xlib-i18n-module.patch 3970 +MD5 5684153cb1f84875fb3535e3263dc447 4.2.0-zlib-security.patch 1391 MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25961532 MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23227328 MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9306679 -MD5 19a91692fdb4fa3d2797f57beebee34a 4.2.0-xlib-i18n-module.patch 3970 -MD5 5684153cb1f84875fb3535e3263dc447 4.2.0-zlib-security.patch 1391 MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606 diff --git a/x11-base/xfree/xfree-4.2.0-r8.ebuild b/x11-base/xfree/xfree-4.2.0-r8.ebuild index b1ec7e039709..a3bbf3993a33 100644 --- a/x11-base/xfree/xfree-4.2.0-r8.ebuild +++ b/x11-base/xfree/xfree-4.2.0-r8.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Maintainer: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r8.ebuild,v 1.1 2002/03/14 23:52:57 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r8.ebuild,v 1.2 2002/03/21 22:59:12 azarah Exp $ MY_V="`echo ${PV} |sed -e 's:\.::g'`" S=${WORKDIR}/xc @@ -17,6 +17,7 @@ SRC_URI="$SRC_PATH0/X${MY_V}src-1.tgz $SRC_PATH1/X${MY_V}src-3.tgz ftp://ftp.xfree86.org/pub/XFree86/4.2.0/fixes/4.2.0-xlib-i18n-module.patch ftp://ftp.xfree86.org/pub/XFree86/4.2.0/fixes/4.2.0-zlib-security.patch + ftp://ftp.xfree86.org/pub/XFree86/4.2.0/fixes/4.2.0-libGLU-bad-extern.patch http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz" # NOTE: 4.2.0-xlib-i18n-module.patch is ONLY for XFree86 4.2.0 @@ -41,9 +42,12 @@ src_unpack () { # resolve bug #794 # NOTE: 4.2.0-xlib-i18n-module.patch is ONLY for XFree86 4.2.0 # 4.2.0-zlib-security.patch is also ONLY for XFree86 4.2.0 + # 4.2.0-libGLU-bad-extern.patch same here .. fixes gcc-3.x compile + # errors cd ${WORKDIR} patch -p0 < ${DISTDIR}/${PV}-xlib-i18n-module.patch || die patch -p0 < ${DISTDIR}/${PV}-zlib-security.patch || die + patch -p0 < ${DISTDIR}/${PV}-libGLU-bad-extern.patch || die cd ${S} cp ${FILESDIR}/${PVR}/site.def config/cf/host.def @@ -147,11 +151,13 @@ src_install() { pkg_preinst() { #this changed from a file to a symlink - rm -rf /usr/X11R6/lib/X11/XftConfig + rm -rf ${ROOT}/usr/X11R6/lib/X11/XftConfig } pkg_postinst() { + env-update echo ">>> Making font dirs..." - find /usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1 -exec mkfontdir {} ';' + find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1 \ + -exec /usr/X11R6/bin/mkfontdir {} ';' } |