diff options
Diffstat (limited to 'x11-base')
6 files changed, 10 insertions, 163 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/Manifest b/x11-base/xorg-server/Manifest index 265e4700fb62..76084d8f92e7 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,7 +1,4 @@ AUX 0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch 1113 RMD160 2f9d636c73258b926e3a78c8ac7aaefac8afb7b6 SHA1 fe4da99464a2907cf826051d39a841f6e6be5e2b SHA256 bc0a37897d3284165aa38e281afd206ca41766a6cdadf5a157a2c137a7e93d03 -AUX 0002-Fix-linking-with-tslib-with-Wl-as-needed.patch 960 RMD160 1dea070e58b582ca93b58c9c1711db1f5bac5d20 SHA1 d3fe4bc1e82112e6e3c4c516a963ad3a23c96b22 SHA256 0ff93d361a19e9615f4551ebaf91cf9d093bec767665a48cc3274310a4da22a3 -AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a -AUX 1.9.0-fix-VbeModeInfoBlock-memcpy.patch 1356 RMD160 5f7a07dd12df519663f12ff4b2611aea29bfa804 SHA1 e71426eebff844b525218de50a7ab50ac1a7ee78 SHA256 87bcc800c32ac9d806973f3dcfb8ca49a73058527367b589b7a7983ee2d808cc AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce @@ -9,7 +6,6 @@ AUX xdm.initd-3 5551 RMD160 7af6e239e3e75ea88a0766ef2f4976a8b5c51c95 SHA1 bd3022 AUX xorg-server-1.7.6-tslib-as-needed.patch 942 RMD160 d78cde49e7725890be41eca4cb3234e487625ad3 SHA1 41c634c00dd18783a39e2e3bc2aa6342e364e1e1 SHA256 881f23f2f43f6124de202d4fd54a1ef7f505fef3965371cc6145faffa84c5547 AUX xorg-server-1.8-nouveau-default.patch 963 RMD160 cb8e530815c21a6015052594204470d89185bd2b SHA1 a865eeb7818ee2c25d4f94d7b3cf94d9b844fd5c SHA256 40525090aa8342c50401f53d2c66e6bee5ff26db02f7ebf23aab42e33af0fb31 AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea -AUX xorg-server-1.9-xinerama-crash-fix.patch 566 RMD160 6cf4d3aaa9cb58361e7a6ee10d24d95d4c034595 SHA1 e534d0e5a5a1bb23915854a083063243736028d4 SHA256 4c6a994d7f9e2b2f43ade8436eb992a6787caae620b47ef56fe3b35701c264ca AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c DIST xorg-server-1.7.7-patches-01.tar.bz2 5226 RMD160 26c7cf8ebe70f61cd49bbbc46ac317db81a784c7 SHA1 6f0958cf69e074f730435326439be192e05930a2 SHA256 6030b28b0b0194f0e1db30cf36769245ebcada0bcd94a0a14a9b2104fcbd2fa6 @@ -19,5 +15,5 @@ DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737 EBUILD xorg-server-1.7.7-r1.ebuild 7368 RMD160 ccd93332ed25c2884d25cb0de0e0c774bf457fc8 SHA1 88f38a3a42b06000852a0068c568ad7a89d2f394 SHA256 24f07ebc80adfa98007d5bfab22c19a0b5c079c4bd073838e5502422380e7839 EBUILD xorg-server-1.9.4.ebuild 7804 RMD160 be63938727e77f858c9de4ed6892809b21abadd3 SHA1 d5d35ea11f5840459af5e001a1a86701f4ca7192 SHA256 bab747527e1ec78239d0894c08d49178739ea75ffc5afb29b9b4daf07adaf295 EBUILD xorg-server-1.9.5.ebuild 7813 RMD160 c72d1a16efe64a502739eac678da908a7aa7a52f SHA1 754e7537c8dcd412e619e377388f7f6cdbdd7b88 SHA256 745a7b00690e761f295340cab7116d522d701b00f1c1319f14d339e15c899488 -MISC ChangeLog 124503 RMD160 3413beb5f8db720f3c3774a504ed2d7794bea533 SHA1 72f280815cdb1023db5f654362b02a9baf69725b SHA256 25d4d7ab13a9812507aec5fc44b1b3969749fd50300f0648c9a0687d865304f8 +MISC ChangeLog 124832 RMD160 039c3a5a72ff390e5ca7c9d98375e2fedcdde7f5 SHA1 1c2c74a350df0d4350bd02bf509c42ad1b4ca913 SHA256 0198907fa9665adbb8658f3f7524ac6897327e19d4106abb2fd59bbf9d354a75 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b 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; |