fix xft-quality.diff for 4.2.1

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 10425223bf2feff33253ad5a59aa25af3cd468bb..6e17860428ff807024744cbd6064d51157593249 100644 (file)
--- 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 v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.48 2002/10/20 20:40:12 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.49 2002/10/20 23:00:14 azarah Exp $
+
+  21 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild :
+
+  Update bit that applies Xft quality hack, and also fix patch to apply
+  against 4.2.1.  This closes bug #9383.
 
   20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild :
 

diff --git a/x11-base/xfree/files/4.2.1/xft-quality.diff b/x11-base/xfree/files/4.2.1/xft-quality.diff
index a9ed1fe5fdb5834b56a58a8130d7d971a749b9b3..fa0d6e395fff117aed517fbef42c83919529a363 100644 (file)
--- a/x11-base/xfree/files/4.2.1/xft-quality.diff
+++ b/x11-base/xfree/files/4.2.1/xft-quality.diff
@@ -1,13 +1,6 @@
 diff -urN Xft.orig/xftfreetype.c Xft/xftfreetype.c
 --- Xft.orig/xftfreetype.c     Thu Dec 13 10:26:00 2001
 +++ Xft/xftfreetype.c  Wed Mar  6 00:23:19 2002
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.16 2001/12/13 17:26:00 keithp Exp $
-+ * $XFree86: xc/lib/Xft1/xftfreetype.c,v 1.1.1.1 2002/02/15 01:26:16 keithp Exp $
-  *
-  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-  *
 @@ -236,7 +236,7 @@
                if (_XftFontDebug() & XFT_DBG_GLYPH)
                    printf ("Set face size to %d (%d)\n", 
@@ -20,13 +13,6 @@ diff -urN Xft.orig/xftfreetype.c Xft/xftfreetype.c
 diff -urN Xft.orig/xftglyphs.c Xft/xftglyphs.c
 --- Xft.orig/xftglyphs.c       Sat Nov 17 01:22:45 2001
 +++ Xft/xftglyphs.c    Wed Mar  6 00:23:19 2002
-@@ -1,5 +1,5 @@
- /*
-- * $XFree86: xc/lib/Xft/xftglyphs.c,v 1.14 2001/11/17 08:22:45 keithp Exp $
-+ * $XFree86: xc/lib/Xft1/xftglyphs.c,v 1.1.1.1 2002/02/15 01:26:16 keithp Exp $
-  *
-  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
-  *
 @@ -124,7 +124,7 @@
        }
        else

diff --git a/x11-base/xfree/xfree-4.2.1.ebuild b/x11-base/xfree/xfree-4.2.1.ebuild
index 266ebab10d1c5a8e4690dff9bc7403eca768754e..529aa93654336bdbc57e8626c48234f66668869a 100644 (file)
--- a/x11-base/xfree/xfree-4.2.1.ebuild
+++ b/x11-base/xfree/xfree-4.2.1.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.ebuild,v 1.19 2002/10/20 20:40:12 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1.ebuild,v 1.20 2002/10/20 23:00:14 azarah Exp $
 
 IUSE="sse nls mmx truetype 3dnow 3dfx"
 
@@ -280,8 +280,9 @@ src_unpack() {
        echo "#define HasFontconfig YES" >> config/cf/host.def
 
        # Apply Xft quality patch from http://www.cs.mcgill.ca/~dchest/xfthack/
+#      einfo "Applying Xft quality hack..."
 #      cd ${S}/lib/Xft
-#      cat ${FILESDIR}/${PVR}/xft-quality.diff | patch -p1 || die
+#      cat ${FILESDIR}/${PVR}/xft-quality.diff | patch -p1 > /dev/null || die
 }
 
 src_compile() {