xorg-server: Version bump to 1.7.7 + DontLie.

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index abeb2b2ca39491e4fea1425b873046d382cac23e..a0a57ffa858527a4fd5fddefc6905454391892ef 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,5 +1,4 @@
 AUX 0001-xfree86-Add-DontLie-server-flag.patch 4746 RMD160 87de996ac0eaab5d0bdc7013319ee8b0c7cd1727 SHA1 f5ba61e4a1a08b6d8f35be96d7295599edae0b84 SHA256 904cdde3750fdc23572286cd8d8fb6e6372b8c56021dcb8b1a14a5e1e5101759
-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 1.8.0-match-only-sane-devices.patch 1980 RMD160 4fee29076bb30e8fb1b820ef58a1c26f3bd63c73 SHA1 98d4ea8e493a31f141e39f4a468458469ebff58f SHA256 95f6ab36fa1b6b80786ff90fb2ee1f7fe02d964a1d10c90277060b4982d8eace
 AUX 1.8.0-no-hardcoded-etc.patch 833 RMD160 9e3736556f8c74c1c78561590cf03e9316d28a75 SHA1 0063e0c520f128507e71134571de6dd95a00079c SHA256 2168832548dbb8d6619df7b2a54b22f118de588522b4014dabaa98829331a6b9
@@ -7,9 +6,9 @@ AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f
 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa4701d93a54080408548792deafac5414cbfa13b89ec
 AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655753128aab2a0815efb83f906db3f54ba5c886ce
 AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
-DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
+DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af465829 SHA1 0f1b71363843b7e394d6de62d0db5b74d3e645ef SHA256 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
 DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665d12018 SHA1 a5f4fc748fc9841b7c0be6ef7388d26551d0d75b SHA256 423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77
 DIST xorg-server-1.8.1.tar.bz2 5200978 RMD160 27bd6d1e565e241412f1fb8e18b5b9b194b94356 SHA1 cba0d3b3d28696609a1f9b110d4d129cd066e133 SHA256 bddb974d8f21107ab8f79abf92cebb06ec13243f1ffd1ef56b48452c4994659d
-EBUILD xorg-server-1.7.6.ebuild 7139 RMD160 87d35013f3a3c5461ce558426e430e7225369f8a SHA1 5b5a5a60b1135166691b4cea40d02d2b7b58a0e5 SHA256 8f68f9b269d6053b28260e65c6779b07ec1d1faf332dbd27a07f3cc80fe452fa
+EBUILD xorg-server-1.7.7.ebuild 7220 RMD160 ed925fe7fccf08ae58ce59314a0c472535f13ec0 SHA1 5d72d32a1b8c9c4f40f88627b42d749ed4223e7b SHA256 f70710b49e1ca43c8cc765fe20ab9819bc5b2793eff0064cee607e4703d73ccc
 EBUILD xorg-server-1.8.0.ebuild 8221 RMD160 6aa53ec1042a8c12b9aa06c1aee767a50e1c2445 SHA1 d1e770f5108c161fb5d20207c612c568c32cfdc8 SHA256 5e21d8ab052b17774c40b67fb20981847a289ddbad39b8753501d21b50a6d450
 EBUILD xorg-server-1.8.1.ebuild 8038 RMD160 3b253838cd8f3bf455c8baab504b63ec8a1c2136 SHA1 987b78cca326fadac53f8336ed5de06c114414c4 SHA256 9f8b8fc1004d97642e78b77accb0c8197f3b156bea3ddec593a11ef150db570c

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 (file)
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 <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/xorg-server-1.7.6.ebuild b/x11-base/xorg-server/xorg-server-1.7.7.ebuild
similarity index 95%
rename from x11-base/xorg-server/xorg-server-1.7.6.ebuild
rename to x11-base/xorg-server/xorg-server-1.7.7.ebuild
index 0f4db4028428295e0ffacfe4f07e31c0fe58d58f..5ec29a8ec688175254f2aa62d04226d7b1f15845 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.7.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.7.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.6.ebuild,v 1.1 2010/03/17 15:35:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7.ebuild,v 1.2 2010/05/04 12:53:24 scarabeus Exp $
 
 EAPI="2"
 
@@ -35,7 +35,7 @@ RDEPEND="hal? ( sys-apps/hal )
        >=x11-apps/iceauth-1.0.2
        >=x11-apps/rgb-1.0.3
        >=x11-apps/xauth-1.0.3
-       >=x11-apps/xinit-1.0.8-r3
+       <=x11-apps/xinit-1.2.1
        >=app-admin/eselect-opengl-1.0.8
        dmx? (
                x11-libs/libXt
@@ -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"
        # Fix for bug #304067
        "${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
        )
@@ -182,6 +179,12 @@ pkg_setup() {
                fi
        fi
 
+       # Incompatible with GCC 3.x CPP, bug #314615
+       if [[ $(gcc-major-version) -lt 4 ]]; then
+               ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
+               ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
+       fi
+
        OLD_IMPLEM="$(eselect opengl show)"
        eselect opengl set ${OPENGL_DIR}
 }