diff options
| author |   Saleem Abdulrasool <compnerd@gentoo.org> | 2008-04-18 21:29:14 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@gentoo.org> | 2008-04-18 21:29:14 +0000 |
| commit | 4258e13de0fd24f34faebfdb76f4f5706979bace (patch) | |
| tree | b6a0d736cacc7aa2220e1a11ef2e33410edec456 /x11-base | |
| parent | Revision bump to drop libtool .la files. (diff) | |
| download | gentoo-2-4258e13de0fd24f34faebfdb76f4f5706979bace.tar.gz gentoo-2-4258e13de0fd24f34faebfdb76f4f5706979bace.tar.bz2 gentoo-2-4258e13de0fd24f34faebfdb76f4f5706979bace.zip | |
add patch to fix building with new automake
(Portage version: 2.1.5_rc2, RepoMan options: --force)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch | 13 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 4265dfaa5e01..c46e8b79bc48 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.320 2008/04/10 06:37:00 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.321 2008/04/18 21:29:13 compnerd Exp $ + + 18 Apr 2008; Saleem Abdulrasool <compnerd@gentoo.org> + +files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch, + xorg-server-1.4.0.90-r3.ebuild: + Add patch to fix building against newer autotools. Fixes bug #217128. 10 Apr 2008; Donnie Berkholz <dberkholz@gentoo.org>; xorg-server-1.3.0.0-r5.ebuild, xorg-server-1.4.0.90-r3.ebuild: diff --git a/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch b/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch new file mode 100644 index 000000000000..3d34b34285bf --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch @@ -0,0 +1,13 @@ +--- configure.ac.orig 2008-04-17 16:53:09.000000000 -0500 ++++ configure.ac 2008-04-17 16:53:29.000000000 -0500 +@@ -1962,7 +1962,9 @@ + + AC_SUBST([DIX_CFLAGS]) + +-AC_SUBST([libdir exec_prefix prefix]) ++AC_SUBST([libdir]) ++AC_SUBST([exec_prefix]) ++AC_SUBST([prefix]) + + # Man page sections - used in config utils & generating man pages + XORG_MANPAGE_SECTIONS diff --git a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild b/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild index 4398a737e3df..24874e47354b 100644 --- a/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild +++ b/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild,v 1.3 2008/04/10 06:37:00 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild,v 1.4 2008/04/18 21:29:13 compnerd Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -293,6 +293,7 @@ PATCHES=" ${FILESDIR}/1.4-0007-CVE-2007-6429-Don-t-spuriously-reject-8bpp-shm-pix.patch ${FILESDIR}/1.4-0008-CVE-2007-6429-Always-test-for-size-offset-wrapping.patch ${FILESDIR}/1.4-0009-Don-t-break-grab-and-focus-state-for-a-window-when-r.patch + ${FILESDIR}/xorg-server-1.4.0.90-automake-1.10.1-fixup.patch " pkg_setup() { |