xorg-server: Version bump to 1.7.6.

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 74603546feaa8eb934b7d976d5935ff0b5e9dd90..73e58f2f61364c5d5c86df0f645c2dc6c8b091d2 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,3 +1,5 @@
+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.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
 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
+DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
+EBUILD xorg-server-1.7.6.ebuild 7134 RMD160 1d9e86620711eb4bf8b1493966b81854a764b6f6 SHA1 7f46d8b19ceaedb9ac90b657674d715c318ec067 SHA256 6bba79ecd3f8d97f6d3a003088b9038549114d62f7f32aab600a5e40f79c9e97

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
new file mode 100644 (file)
index 0000000..82f4f50
--- /dev/null
+++ b/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch
@@ -0,0 +1,83 @@
+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.7.5.902-fix-tslib-1.0-check.patch b/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
new file mode 100644 (file)
index 0000000..3675822
--- /dev/null
+++ b/x11-base/xorg-server/files/1.7.5.902-fix-tslib-1.0-check.patch
@@ -0,0 +1,19 @@
+--- configure.ac       2010-03-16 22:24:14.000000000 +0100
++++ configure.ac.new   2010-03-16 22:33:10.000000000 +0100
+@@ -1915,8 +1915,14 @@
+         AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
+     fi
+ 
+-
+-    PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
++dnl Do tripple check for tslib in the transition phase to unversioned pkgconfig files...
++    PKG_CHECK_MODULES([TSLIB], [tslib], [HAVE_TSLIB="yes"], [
++        PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [
++              PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [
++                  HAVE_TSLIB="no"
++              ])
++      ])
++    ])
+     if test "x$HAVE_TSLIB" = xno; then
+         AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
+     fi

diff --git a/x11-base/xorg-server/xorg-server-1.7.5.901.ebuild b/x11-base/xorg-server/xorg-server-1.7.6.ebuild
similarity index 95%
rename from x11-base/xorg-server/xorg-server-1.7.5.901.ebuild
rename to x11-base/xorg-server/xorg-server-1.7.6.ebuild
index 022a1f40aecb58146471756d66fee56a43c1776c..4ccaf2f08680315aa476651cf166b70756eb0f69 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.7.5.901.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.6.ebuild
@@ -1,11 +1,11 @@
 # 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.901.ebuild,v 1.1 2010/03/07 19:07:17 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.6.ebuild,v 1.1 2010/03/17 15:35:54 scarabeus Exp $
 
 EAPI="2"
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular multilib versionator
 
@@ -121,6 +121,11 @@ 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"
+       # Fix for bug #304067
+       "${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
        )
 
 PATCHES=(