xorg-server: Changes to 'ubuntu'
debian/changelog | 7 -
debian/patches/163_no_updatespriteforscreen_if_xinerama.patch | 37 ----------
debian/patches/series | 1
3 files changed, 3 insertions(+), 42 deletions(-)
New commits:
commit c44f7c20dc7de881188ba9df96cc65b32b503d7d
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Mar 3 17:44:43 2009 -0800
Patch 163 is already in 1.6.0; drop it in favor of message about fix.
diff --git a/debian/changelog b/debian/changelog
index 6d0dc5f..f4484e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,20 +6,19 @@ xorg-server (2:1.6.0-0ubuntu1) UNRELEASED; urgency=low
(LP: #319210)
- Fixes EDID for monitors that incorrectly report aspect ratio instead
of resolution (LP: #311485)
+ - Fixes issue where X stops responding to mouse clicks after some time
+ if using Xinerama. (LP: #296167)
* Add 162_null_crtc_in_rotation.patch: Fixes crash when two displays on
separate cards are attached. X doesn't work with multiple cards yet,
but crashing is not an appropriate way to handle such a situation.
(LP: #139990)
- * Add 163_no_updatespriteforscreen_if_xinerama.patch: Fixes issue where
- X stops responding to mouse clicks after some time if using Xinerama.
- (LP: #296167)
[ Timo Aaltonen ]
* 159_xinerama_focus.patch,
161_force_paired_kbd_device.patch:
- Dropped, applied upstream
- -- Bryce Harrington <bryce@ubuntu.com> Tue, 03 Mar 2009 17:39:25 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 03 Mar 2009 17:44:03 -0800
xorg-server (2:1.6.0-1) UNRELEASED; urgency=low
diff --git a/debian/patches/163_no_updatespriteforscreen_if_xinerama.patch b/debian/patches/163_no_updatespriteforscreen_if_xinerama.patch
deleted file mode 100644
index e3d1ae4..0000000
--- a/debian/patches/163_no_updatespriteforscreen_if_xinerama.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7dfc941eee8261355ea2f8a82a77bece45fbde66 Mon Sep 17 00:00:00 2001
-From: Fedora X Ninjas <x@fedoraproject.org>
-Date: Fri, 30 Jan 2009 10:19:01 +1000
-Subject: [PATCH] mi: don't call UpdateSpriteForScreen if we have Xinerama enabled. #18668
-
-In Xinerama all windows hang off the first root window. Crossing the screens
-must not reset the spriteTrace, otherwise picking fails and events are sent to
-the root window.
-
-X.Org Bug 18668 <http://bugs.freedesktop.org/show_bug.cgi?id=18668>
----
- mi/mipointer.c | 9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/mi/mipointer.c b/mi/mipointer.c
-index b55e68b..195243d 100644
---- a/mi/mipointer.c
-+++ b/mi/mipointer.c
-@@ -260,7 +260,14 @@ miPointerWarpCursor (pScreen, x, y)
- miPointer.pScreen = pScreen;
- }
-
-- if (changedScreen)
-+ /* Don't call USFS if we use Xinerama, otherwise the root window is
-+ * updated to the second screen, and we never receive any events.
-+ * (FDO bug #18668) */
-+ if (changedScreen
-+#ifdef PANORAMIX
-+ && noPanoramiXExtension
-+#endif
-+ )
- UpdateSpriteForScreen (pScreen) ;
- }
-
---
-1.6.0.6
-
diff --git a/debian/patches/series b/debian/patches/series
index c591632..353b282 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,4 +19,3 @@
160_log_timestamping.patch
162_null_crtc_in_rotation.patch
999_default_modedebug_on.patch
-163_no_updatespriteforscreen_if_xinerama.patch
Reply to: