PATCH_VER 0.2.10. Add 0450_all_6.8.0-set-default-xkbmodel-to-pc105.patch. In the...

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 3ee14cc3bedd86bf6e9883813717217e454949e8..0f2733bab540fa6ec5b366bb913f2b201267b0fd 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.228 2004/12/05 01:28:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.229 2004/12/05 01:35:56 spyderous Exp $
+
+  04 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  PATCH_VER 0.2.10. Add 0450_all_6.8.0-set-default-xkbmodel-to-pc105.patch. In
+  the old 'keyboard' driver, pc105 was the default. Restore the new 'kbd'
+  driver to the same. This is from upstream CVS. It may fix some bugs relating
+  to certain keys not working. Add
+  0455_all_6.8.0-prevent-keyboard-hardware-repeat.patch. (fd.o #1651) Filter
+  out autorepeat scancodes from the keyboard, because X does this already.
+  This is from upstream CVS. Add
+  6200_all_6.8.0-fix-glxquerycontextinfo-libgl-segfault.patch. (fd.o #1672)
+  Ian Romanick: the request structure for this case is never allocated, so we
+  write through an uninitialized pointer if glx version > 1.2. This is from
+  upstream CVS. Move 9930_all_6.8.1-xpm-secfix-CAN-2004-0914.patch from
+  xpm-secfix-thomas.diff in FILESDIR. Add
+  9930_all_6.8.1-xpm-secfix-CAN-2004-0914.patch. (fd.o #1924, #71842) The new
+  sanity checks prevent using file names that start with a "/" which along
+  with other checks wouldn't let you use libXpm to write files that aren't in
+  or beneath the process's current working directory. This breaks GIMP's xpm
+  plugin, among other things. Add 9945_all_6.8.1-xmodmap-overflows.patch.
+  (fd.o #1818) Fix overflow in xmodmap. A less user-visible change is the
+  switch from PatchChangelog to the DESCRIPTIONS file, which aims to describe
+  the reason for every patch being applied. It's far from complete, but it's
+  something.
 
   04 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
   -xorg-x11-6.8.0-r2.ebuild:

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 03dcc205c9ed0c9e832708423cac408e0b8c5382..b9433cf7691c3467e9c4ba95d2cbaa18065518be 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,13 +1,13 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 398036bb9c0b024279b79de650d294f9 xorg-x11-6.7.0-r2.ebuild 38087
 MD5 186fd28bc746a6e98ae52356c8246348 xorg-x11-6.8.0-r1.ebuild 41341
-MD5 dd1aa60683de7762437cb27dee1fe2dd ChangeLog 51714
+MD5 82855b545c6807a2509e06602f408484 ChangeLog 53218
 MD5 b45f1c127c54662901d9e88a9dc7ad1e xorg-x11-6.7.0-r3.ebuild 38105
 MD5 1ad6566a5ebfc982d9f8567214e5b7e5 xorg-x11-6.8.0-r3.ebuild 39794
-MD5 5fd1e30b5fe575663ed1fc8985ce53fc xorg-x11-6.8.0-r4.ebuild 51839
+MD5 c2612b0520744c7da7764f2cccd52459 xorg-x11-6.8.0-r4.ebuild 51796
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908
-MD5 a6850644ded20651b79ce5028eba6747 files/digest-xorg-x11-6.8.0-r4 908
+MD5 3e98e451e65ec681fb8b2fcc65431cf3 files/digest-xorg-x11-6.8.0-r4 909

diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4
index f1dafb32527cd655ae8bd173dcb5a2a3e31f3227..28d20612bd774097cfc3a64697e6ffd28a25e562 100644 (file)
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4
@@ -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 8e8905cf6863546481ec52f1101b6984 xorg-x11-6.8.0-files-0.6.tar.bz2 10139
-MD5 707f36ff4452ffc5187b2b91330eef50 xorg-x11-6.8.0-patches-0.2.9.tar.bz2 150924
+MD5 823e5092514c90241d46e6b0b70244af xorg-x11-6.8.0-patches-0.2.10.tar.bz2 161799
 MD5 c31a2e1c226e659c2ff29abfe55386e3 X11R6.8.0-src1.tar.gz 30560275
 MD5 4089bb6efb6c5bc73fbcfc23fafcb0c8 X11R6.8.0-src2.tar.gz 5808901
 MD5 488a5ebbbdf48d974efbc3a0bde92bf4 X11R6.8.0-src3.tar.gz 10014266

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index d4c3fab48d6103d17188018ab5ca8ac0c45277fb..8ca487d90ca8b1138dc770227a71657404a6aeb6 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.17 2004/11/24 02:17:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.18 2004/12/05 01:35:56 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -43,7 +43,7 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.6"
-PATCH_VER="0.2.9"
+PATCH_VER="0.2.10"
 XCUR_VER="0.3.1"
 #MGADRV_VER="1_3_0beta"
 #VIADRV_VER="0.1"
@@ -225,8 +225,6 @@ src_unpack() {
        epatch ${PATCHDIR}
        cd ${S}
 
-       epatch ${FILESDIR}/xpm-secfix-thomas.diff
-
        host_def_setup
 
        # uclibc lacks sinf and cosf