PATCH_VER 1.0. Add 9210_all_XFree86-4.3.0-arm32-compiler.h.patch (#52707), 9215_all_xorg-x11-6.7.0-char-bit-and-ia64-asm-page.patch (fd.o #601, fd.o #605), 9220_all_xorg-x11-6.7.0-install-vera-italic.patch, 9225_all_xorg-x11-6.7.0-install-xfree86-lst.patch (fd.o #531), 9230_all_xorg-x11-6.7.0-try-tcp-without-local-and-fix-ipv6-xdmauth-segfault.patch (fd.o #546, NetBSD #25098), 9235_all_xorg-x11-6.7.0-libxf86config-monitor-freq-fix.patch (RH #120950), 9240_all_xorgconfig-naming-xkb-font-path-fixes.patch.

4 files changed, 39 insertions, 7 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 60cd749789da..b4a000a5b0c4 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.46 2004/06/03 06:33:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.47 2004/06/03 07:30:25 spyderous Exp $
+
+  03 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
+  PATCH_VER 1.0. This patchset should get xorg-x11-6.7.0 ready to go stable on
+  all archs that have tested it. Many of them have already stabled it, so I'm
+  holding some non-crucial patches out for 6.7.0-r1.
+  
+  -Add 9210_all_XFree86-4.3.0-arm32-compiler.h.patch (#52707) from
+  netwinder.org. This fixes compiles for the ARM architecture.
+  -Add 9215_all_xorg-x11-6.7.0-char-bit-and-ia64-asm-page.patch to remove a
+  compiler-intrinsic define since it dies on makedepend otherwise (fd.o #601),
+  and fix the IA64 build (broken because it includes kernel header asm/page.h,
+  which doesn't work with -ansi) (fd.o #605).
+  -Add 9220_all_xorg-x11-6.7.0-install-vera-italic.patch to install VeraIt.ttf.
+  It was getting left out. Patch from xorg CVS by Eric Anholt.
+  -Add 9225_all_xorg-x11-6.7.0-install-xfree86-lst.patch (fd.o #531) to install
+  xfree86.lst. This should fix some XKB problems.
+  -Add 9230_all_xorg-x11-6.7.0-try-tcp-without-local-and-fix-ipv6-xdmauth-
+  segfault.patch to make XOpenDisplay try tcp connection if local fails (fd.o
+  #546), and fix Xlib segfaults with IPv6 if compiled with HASXDMAUTH (NetBSD
+  #25098).
+  -Add 9235_all_xorg-x11-6.7.0-libxf86config-monitor-freq-fix.patch from RH.
+  This prevents writing out the HorizSync/VertRefresh lines commented out, which
+  forces all default X config files written out by this library to rely on DDC.
+  Poor assumption that DDC is always available. Patch by Mike Harris.
+  -Add 9240_all_xorgconfig-naming-xkb-font-path-fixes.patch to do a few things:
+    - Clean up server name changes from TM branch
+    - Set default XKB rules file name correctly
+    - Use default font path from Imake configuration for the default font path
+      in generated xorg.conf files.
+    - Use path variables from Imake configuration for paths to files, in case
+      vendor has configured them to install somewhere other than the defaults.
+    Patch from xorg CVS by Alan Coopersmith.
 
   03 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild:
   Fix typo in xrender.pc generation, includ to include.
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index d569e943a572..c67b0d98ec53 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,4 +1,4 @@
-MD5 690d7fb83e6ba9befb174c70e22130f2 ChangeLog 7695
+MD5 b46ae77f78ecbddcb637e46938f1cb19 ChangeLog 9715
 MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232
-MD5 6be7ea6dba3bc53ee7b97f38cfba8c7b xorg-x11-6.7.0.ebuild 40662
-MD5 086afe432124eabb3d1964e91a432a57 files/digest-xorg-x11-6.7.0 904
+MD5 3891ff3137ca69e7d151f71615432f21 xorg-x11-6.7.0.ebuild 40662
+MD5 763be7d84792d2e50ddafe861cdaee04 files/digest-xorg-x11-6.7.0 904
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0 b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0
index 6cb12563092c..47eaeeb20a38 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0
@@ -3,7 +3,7 @@ MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
 MD5 2d091e7ca01bddd12a99f4d37b3b0234 xorg-x11-6.7.0-files-0.2.tar.bz2 9169
-MD5 c322dbae61a256b8369d07a01d3625c4 xorg-x11-6.7.0-patches-0.7.tar.bz2 81218
+MD5 ff9c7ffc80c69ff6df906fcffaaa3b1a xorg-x11-6.7.0-patches-1.0.tar.bz2 89638
 MD5 22465263bae7a2e9f5ad77e172cf1ab5 X11R6.7.0-src1.tar.gz 30039655
 MD5 6ef4e8f7647a28f080c10ea1bcf01f79 X11R6.7.0-src2.tar.gz 5739983
 MD5 4c7144786522bbce383b21ace72bf669 X11R6.7.0-src3.tar.gz 10855793
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
index ba54a3260bf5..85fb1f280411 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0.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/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.48 2004/06/03 06:33:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.49 2004/06/03 07:30:25 spyderous Exp $
 
 # This is a snapshot of the XORG-RELEASE-1 branch.
 
@@ -65,7 +65,7 @@ IUSE="3dfx 3dnow cjk debug doc hardened ipv6 mmx nls pam pie sdk sse static"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.2"
-PATCH_VER="0.7"
+PATCH_VER="1.0"
 #RENDER_VER="0.8"
 # Needed for xrender.pc in addition to external libs
 XRENDER_VER="0.8.4"