From 785644b25fc079758e7b4832bdea9d49e787f6a1 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Tue, 5 Nov 2002 20:01:54 +0000 Subject: [PATCH] fix missing bracket in xf86.h --- x11-base/xfree/ChangeLog | 5 ++++- .../110_all_4.2.1-xf86_h-missing-bracket-fix.patch | 10 ++++++++++ x11-base/xfree/xfree-4.2.1-r1.ebuild | 6 +++++- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 x11-base/xfree/files/4.2.1-r1/110_all_4.2.1-xf86_h-missing-bracket-fix.patch diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index eeec61cfa2ca..8cb215306408 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.58 2002/11/05 12:56:16 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.59 2002/11/05 20:01:54 azarah Exp $ 5 Nov 2002; Martin Schlemmer xfree-4.2.1-r1.ebuild : @@ -11,6 +11,9 @@ Also see http://www.geocrawler.com/archives/3/3/2001/9/100/6633199/ Added patch 109_ppc_4.2.1-xterm-eightBitInput-fix.patch. + Fix unterminated bracket in xf86.h, closing bug #10271, thanks Gerk! + Added patch 110_all_4.2.1-xf86_h-missing-bracket-fix.patch. + 4 Nov 2002; Martin Schlemmer xfree-4.2.1-r1.ebuild : Do not apply 107_all_4.2.1-gcc32-internal-compiler-error.patch for diff --git a/x11-base/xfree/files/4.2.1-r1/110_all_4.2.1-xf86_h-missing-bracket-fix.patch b/x11-base/xfree/files/4.2.1-r1/110_all_4.2.1-xf86_h-missing-bracket-fix.patch new file mode 100644 index 000000000000..730b609c57c0 --- /dev/null +++ b/x11-base/xfree/files/4.2.1-r1/110_all_4.2.1-xf86_h-missing-bracket-fix.patch @@ -0,0 +1,10 @@ +--- xc/programs/Xserver/hw/xfree86/common/xf86.h.orig 2002-11-05 21:20:47.000000000 +0200 ++++ xc/programs/Xserver/hw/xfree86/common/xf86.h 2002-11-05 21:18:56.000000000 +0200 +@@ -51,6 +51,7 @@ + if (xf86GetFlipPixels()) { \ + pScreen->whitePixel = (pScreen->whitePixel) ? 0 : 1; \ + pScreen->blackPixel = (pScreen->blackPixel) ? 0 : 1; \ ++ } \ + } \ + while (0) + diff --git a/x11-base/xfree/xfree-4.2.1-r1.ebuild b/x11-base/xfree/xfree-4.2.1-r1.ebuild index df8952b9edea..a361e05631b5 100644 --- a/x11-base/xfree/xfree-4.2.1-r1.ebuild +++ b/x11-base/xfree/xfree-4.2.1-r1.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/x11-base/xfree/xfree-4.2.1-r1.ebuild,v 1.5 2002/11/05 12:56:16 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r1.ebuild,v 1.6 2002/11/05 20:01:54 azarah Exp $ IUSE="sse nls mmx truetype 3dnow 3dfx" @@ -221,6 +221,10 @@ src_unpack() { patch -p1 < ${FILESDIR}/${PVR}/109_ppc_4.2.1-xterm-eightBitInput-fix.patch \ > /dev/null || die fi + # Fix unterminated bracket in xf86.h, closing bug #10271 + einfo " 110_all_4.2.1-xf86_h-missing-bracket-fix.patch.bz2..." + patch -p1 < ${FILESDIR}/${PVR}/110_all_4.2.1-xf86_h-missing-bracket-fix.patch \ + > /dev/null || die ebegin "Done with patching"; eend 0 # Update the Savage Driver -- 2.26.2