diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2004-04-19 02:02:43 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-04-19 02:02:43 +0000 |
| commit | 26c38507e4e2d4b52ed585c130151b16110b4635 (patch) | |
| tree | 5dcc976f5b9651f0faf17319599e07eeabdd927f /x11-base/xfree | |
| parent | Initial Ebuild thanks to Lukasz Strzygowski <lucass@gentoo.pl> in bug 46270 (... (diff) | |
| download | gentoo-2-26c38507e4e2d4b52ed585c130151b16110b4635.tar.gz gentoo-2-26c38507e4e2d4b52ed585c130151b16110b4635.tar.bz2 gentoo-2-26c38507e4e2d4b52ed585c130151b16110b4635.zip | |
PATCH_VER 2.1.25.3. Add 9017_amd64_4.3.0-IncludeSharedObjectInNormalLib.patch from 4.3.0-r6, fixes 64-bit issues with libraries.
Diffstat (limited to 'x11-base/xfree')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xfree/files/digest-xfree-4.3.0-r5 | 2 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.0-r5.ebuild | 14 |
3 files changed, 17 insertions, 5 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 0f080b40525a..c57ef9790eea 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xfree # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.320 2004/04/19 00:39:55 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.321 2004/04/19 02:02:43 spyderous Exp $ + + 18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild: + PATCH_VER 2.1.25.3. Add 9017_amd64_4.3.0-IncludeSharedObjectInNormalLib.patch + from 4.3.0-r6, fixes 64-bit issues with libraries. 18 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild, xfree-4.3.99.902-r2.ebuild: diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r5 b/x11-base/xfree/files/digest-xfree-4.3.0-r5 index 83860e693144..b74eace81389 100644 --- a/x11-base/xfree/files/digest-xfree-4.3.0-r5 +++ b/x11-base/xfree/files/digest-xfree-4.3.0-r5 @@ -5,7 +5,7 @@ MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091 MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018 MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919 MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241 -MD5 8b650cbfb46d41f395452a8e7736c07b XFree86-4.3.0-patches-2.1.25.3.tar.bz2 551080 +MD5 9ee964dea387f6fc4efa982f4bf57b34 XFree86-4.3.0-patches-2.1.25.4.tar.bz2 552227 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild index 61fc6e11eeac..7bb9003e4a65 100644 --- a/x11-base/xfree/xfree-4.3.0-r5.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r5.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/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.7 2004/04/08 05:56:25 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.8 2004/04/19 02:02:43 spyderous Exp $ # Make sure Portage does _NOT_ strip symbols. We will do it later and make sure # that only we only strip stuff that are safe to strip ... @@ -48,7 +48,7 @@ fi # Are we using a snapshot ? USE_SNAPSHOT="no" -PATCH_VER="2.1.25.3" +PATCH_VER="2.1.25.4" FT2_VER="2.1.3" XCUR_VER="0.3.1" SISDRV_VER="311003-1" @@ -65,7 +65,7 @@ SRC_PATH="mirror://xfree/${BASE_PV}/source" HOMEPAGE="http://www.xfree.org" # Misc patches we may need to fetch .. -X_PATCHES="http://dev.gentoo.org/~seemant/extras/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 +X_PATCHES="http://dev.gentoo.org/~spyderous/xfree/patchsets/${PV}/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 http://www.cpbotha.net/files/dri_resume/xfree86-dri-resume-v8.patch" X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz @@ -262,6 +262,14 @@ src_unpack() { mv -f ${PATCH_DIR}/7500* ${PATCH_DIR}/excluded fi + # 9017 fixes many 64-bit issues with non-PIC libs + # patch 9017 overlaps 9015 and 9016 and is applied instead + if [ "${ARCH}" = "amd64" ] + then + mv -f ${PATCH_DIR}/9015* ${PATCH_DIR}/excluded + mv -f ${PATCH_DIR}/9016* ${PATCH_DIR}/excluded + fi + # This was formerly applied if USE=debug, but it causes builds # to randomly die (spyderous). mv -f ${PATCH_DIR}/0120* ${PATCH_DIR}/excluded |