From 330e172b02733333e09e3a3abbb3e26c110a1a7d Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Mon, 8 Mar 2010 11:10:05 -0500 Subject: [PATCH] xorg-server: Version bump to 1.7.5.901. DontLie patch needed to be rebased. --- x11-base/xorg-server/Manifest | 7 +- ...nts-is-true-for-passive-grabs-add-th.patch | 83 ------------------- .../xfree86-Add-DontLie-server-flag.patch | 16 ++-- ....5.ebuild => xorg-server-1.7.5.901.ebuild} | 5 +- 4 files changed, 12 insertions(+), 99 deletions(-) delete mode 100644 x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch rename x11-base/xorg-server/{xorg-server-1.7.5.ebuild => xorg-server-1.7.5.901.ebuild} (96%) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index dfdefc7..7460354 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,4 +1,3 @@ -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 xfree86-Add-DontLie-server-flag.patch 4791 RMD160 a2997146d717d419231e733f470138ea30a39cd0 SHA1 3cdbed7870dfe3d118828f4256e303510ea64818 SHA256 c588df4e09c1ab2b905cf8ae8ecb911dc60a87b35426df75707b4b23cd45586d -DIST xorg-server-1.7.5.tar.bz2 4926990 RMD160 900863aeb73967e33265e0445ddaa61feeecc452 SHA1 c385293b66a6b0bc6bad648588f611d844c26ee7 SHA256 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa -EBUILD xorg-server-1.7.5.ebuild 7061 RMD160 1a086a4bbe12ba2354948ec61b900ba9dae61e67 SHA1 1fa5670dab80ff7754857cc0497bf252c59d9ee3 SHA256 6fa3490413ffd6369c0bc6b80009b7f0a79af8f0db6bf86f3991b776401ca591 +AUX xfree86-Add-DontLie-server-flag.patch 4744 RMD160 c9650be0d9e554375f1e8a11b451222c407af24e SHA1 ed18ca8e811784042ce0e3ee070a74a9b9f26a6d SHA256 6830129ee0d48cf44ad42f2729393a392f8ccca960bda670612839e8a6003400 +DIST xorg-server-1.7.5.901.tar.bz2 4925825 RMD160 e0ccff20b20214b087582472a474d16850944477 SHA1 0ac7b037f511938cc4da32fc71de7e81617790cd SHA256 9530e1515642657d226c406cfd18bb80c03a698a7f0e2000b2057de81a742d40 +EBUILD xorg-server-1.7.5.901.ebuild 6908 RMD160 58a6441ddee5c377e32d0d239d5f41facda46086 SHA1 f60c6b5acd16d6b2bdc2c44f3274e5266ba1d33d SHA256 add4d5cb94d25c0ad69b6b0a688286c0f4e421e0d366e432a8ac2d18628cc24f 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 82f4f50..0000000 --- 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 -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 - -Signed-off-by: Peter Hutterer ---- - 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/xfree86-Add-DontLie-server-flag.patch b/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch index 5a857b7..7826994 100644 --- a/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch +++ b/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch @@ -1,4 +1,4 @@ -From e68d127198bca378ff9f9a3e532d3be067a74af7 Mon Sep 17 00:00:00 2001 +From 3f5e8e89ea149a105ac191e3b7ebee922f78868f Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Wed, 6 Jan 2010 10:42:17 -0500 Subject: [PATCH] xfree86: Add DontLie server flag. @@ -77,7 +77,7 @@ index b2095aa..05166f9 100644 Bool caughtSignal; diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre -index 687ec76..11810e8 100644 +index f0a7373..21ea017 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -490,6 +490,12 @@ When this option is enabled, those key sequences have no special meaning @@ -94,18 +94,18 @@ index 687ec76..11810e8 100644 This disables the parts of the VidMode extension used by the xvidtune client that can be used to change the video modes. diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c -index 1fc63c4..5d8bc29 100644 +index 7ba09b6..c51857b 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -806,6 +806,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) else { - xf86OutputPtr output = config->output[config->compat_output]; + xf86OutputPtr output = xf86CompatOutput(pScrn); + xf86CrtcPtr crtc = output->crtc; - if (output->conf_monitor && - (output->conf_monitor->mon_width > 0 && -@@ -817,6 +818,17 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) + if (output && + output->conf_monitor && +@@ -818,6 +819,17 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) mmWidth = output->conf_monitor->mon_width; mmHeight = output->conf_monitor->mon_height; } @@ -124,5 +124,5 @@ index 1fc63c4..5d8bc29 100644 { /* -- -1.6.6.1 +1.7.0 diff --git a/x11-base/xorg-server/xorg-server-1.7.5.ebuild b/x11-base/xorg-server/xorg-server-1.7.5.901.ebuild similarity index 96% rename from x11-base/xorg-server/xorg-server-1.7.5.ebuild rename to x11-base/xorg-server/xorg-server-1.7.5.901.ebuild index a40b55d..022a1f4 100644 --- a/x11-base/xorg-server/xorg-server-1.7.5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.7.5.901.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.5.ebuild,v 1.1 2010/02/16 10:55:20 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.5.901.ebuild,v 1.1 2010/03/07 19:07:17 chithanh Exp $ EAPI="2" @@ -121,9 +121,6 @@ EPATCH_SUFFIX="patch" # These have been sent upstream UPSTREAMED_PATCHES=( #"${WORKDIR}/patches/" - - # Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400 - "${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch" ) PATCHES=( -- 2.43.2