Drop unused patches.

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

5 files changed, 9 insertions, 158 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 22c2b86bbb65..b885895ee98f 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.574 2011/03/17 22:31:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.575 2011/03/18 18:42:47 scarabeus Exp $
+
+  18 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch,
+  -files/xorg-server-1.9-xinerama-crash-fix.patch,
+  -files/1.9.0-fix-VbeModeInfoBlock-memcpy.patch,
+  -files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.pa
+  tch:
+  Drop unused patches.
 
 *xorg-server-1.9.5 (17 Mar 2011)
 
diff --git a/x11-base/xorg-server/files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch b/x11-base/xorg-server/files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch
deleted file mode 100644
index cdcfca6fdf81..000000000000
--- a/x11-base/xorg-server/files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 39193982958d8e3c433f32d834912129e360d377 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 4 Oct 2010 19:02:29 +0200
-Subject: [PATCH 2/2] Fix linking with tslib, with -Wl,--as-needed.
-
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6d63663..e8f9473 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2122,7 +2122,7 @@ if test "$KDRIVE" = yes; then
-     KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"
-     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
-     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
--    KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
-+    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
- 
-     AC_SUBST([XEPHYR_LIBS])
-     AC_SUBST([XEPHYR_INCS])
--- 
-1.7.3.1
-
diff --git a/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch b/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch
deleted file mode 100644
index 82f4f50ebb1c..000000000000
--- a/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 873ef3430e92b0756c0dbe5033f6aec38a20d6ad Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 16 Dec 2009 13:43:22 +1000
-Subject: [PATCH] dix: if owner-events is true for passive grabs, add the window mask (#25400)
-
-A client requesting a GrabModeSync button grab, owner-events true, with only
-the ButtonRelease mask set would never receive the press event even if the
-grab window had the ButtonPress mask set.
-
-The protocol requires that if owner-events is true, then the delivery mask
-is the combination of the grab mask + the window event mask.
-
-X.Org Bug 25400 <http://bugs.freedesktop.org/show_bug.cgi?id=25400>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- dix/events.c |   36 ++++++++++++++++++++++++++++++++++++
- 1 files changed, 36 insertions(+), 0 deletions(-)
-
-diff --git a/dix/events.c b/dix/events.c
-index 7e0867c..12b12a8 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -3590,6 +3590,8 @@ CheckPassiveGrabsOnWindow(
-                 xE = &core;
-                 count = 1;
-                 mask = grab->eventMask;
-+                if (grab->ownerEvents)
-+                    mask |= pWin->eventMask;
-             } else if (match & XI2_MATCH)
-             {
-                 rc = EventToXI2((InternalEvent*)event, &xE);
-@@ -3611,6 +3613,24 @@ CheckPassiveGrabsOnWindow(
-                     mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
-                 else if (event->type == XI_Enter || event->type == XI_FocusIn)
-                     mask = grab->xi2mask[device->id][event->type/8];
-+
-+                if (grab->ownerEvents && wOtherInputMasks(grab->window))
-+                {
-+                    InputClientsPtr icp =
-+                        wOtherInputMasks(grab->window)->inputClients;
-+
-+                    while(icp)
-+                    {
-+                        if (rClient(icp) == rClient(grab))
-+                        {
-+                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
-+                            mask |= icp->xi2mask[device->id][evtype/8];
-+                            break;
-+                        }
-+
-+                        icp = icp->next;
-+                    }
-+                }
-             } else
-             {
-                 rc = EventToXI((InternalEvent*)event, &xE, &count);
-@@ -3622,6 +3642,22 @@ CheckPassiveGrabsOnWindow(
-                     continue;
-                 }
-                 mask = grab->eventMask;
-+                if (grab->ownerEvents && wOtherInputMasks(grab->window))
-+                {
-+                    InputClientsPtr icp =
-+                        wOtherInputMasks(grab->window)->inputClients;
-+
-+                    while(icp)
-+                    {
-+                        if (rClient(icp) == rClient(grab))
-+                        {
-+                            mask |= icp->mask[device->id];
-+                            break;
-+                        }
-+
-+                        icp = icp->next;
-+                    }
-+                }
-             }
- 
- 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
--- 
-1.6.5.2
-
diff --git a/x11-base/xorg-server/files/1.9.0-fix-VbeModeInfoBlock-memcpy.patch b/x11-base/xorg-server/files/1.9.0-fix-VbeModeInfoBlock-memcpy.patch
deleted file mode 100644
index 239213928acf..000000000000
--- a/x11-base/xorg-server/files/1.9.0-fix-VbeModeInfoBlock-memcpy.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ef6c9d2af50ac03b28ad92ea90105047d8bc9948 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sun, 12 Sep 2010 23:53:26 -0400
-Subject: [PATCH] Fix VbeModeInfoBlock memcpy.
-
-Reserved2 is 189 bytes (not 188). From LinBytesPerScanLine to end of
-Reserved2 we have 189 + 16 = 205 bytes (not 206). From PhysBasePtr to end
-of Reserved2 we have 189 + 26 = 215 bytes (not 216).
----
- hw/xfree86/vbe/vbe.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
-index 0b34648..2051577 100644
---- a/hw/xfree86/vbe/vbe.c
-+++ b/hw/xfree86/vbe/vbe.c
-@@ -583,13 +583,13 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
- 	    block->LinRsvdMaskSize = ((char*)pVbe->memory)[60];
- 	    block->LinRsvdFieldPosition = ((char*)pVbe->memory)[61];
- 	    block->MaxPixelClock = *(CARD32*)(((char*)pVbe->memory) + 62);
--	    memcpy(&block->Reserved2, ((char*)pVbe->memory) + 66, 188);
-+	    memcpy(&block->Reserved2, ((char*)pVbe->memory) + 66, 189);
- 	}
- 	else
--	memcpy(&block->LinBytesPerScanLine, ((char*)pVbe->memory) + 50, 206);
-+	memcpy(&block->LinBytesPerScanLine, ((char*)pVbe->memory) + 50, 205);
-     }
-     else
--	memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216);
-+	memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 215);
- 
-     return block;
- }
--- 
-1.7.2.2
-
diff --git a/x11-base/xorg-server/files/xorg-server-1.9-xinerama-crash-fix.patch b/x11-base/xorg-server/files/xorg-server-1.9-xinerama-crash-fix.patch
deleted file mode 100644
index 7fe9d48608a6..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.9-xinerama-crash-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
-index 67b4030..d843168 100644
---- a/Xext/panoramiXprocs.c
-+++ b/Xext/panoramiXprocs.c
-@@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client)
-     rep.dstX = x - pDst->drawable.x;
-     rep.dstY = y - pDst->drawable.y;
-     if((pDst == screenInfo.screens[0]->root) ||
--       (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid))
-+       (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid))
-     {
- 	rep.dstX += screenInfo.screens[0]->x;
- 	rep.dstY += screenInfo.screens[0]->y;