debian/changelog | 8 ++-
debian/patches/155_no_checkmotion_for_disabled_devices.patch | 27 +++++++++++
debian/patches/series | 1
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit e41f44eaf3417bb84fd2592778de898f1ec6b298
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Thu Jan 8 18:47:54 2009 -0800
Cherrypick upstream fix for bug 313567.
diff --git a/debian/changelog b/debian/changelog
index 6dddd67..d7f1add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xorg-server (2:1.5.99.3-0ubuntu4) UNRELEASED; urgency=low
+ [Timo Aaltonen]
* debian/rules: Enable dbus-support.
* Merge current server-1.6-branch.
* Disable patch 107 for now, to see what kind of a performance hit
@@ -7,7 +8,12 @@ xorg-server (2:1.5.99.3-0ubuntu4) UNRELEASED; urgency=low
while apps are being loaded.
* Remove patches 150, 151, applied upstream.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 17 Dec 2008 15:02:53 +0200
+ [Bryce Harrington]
+ * 155_no_checkmotion_for_disabled_devices.patch: Cherrypick upstream
+ patch to fix crash when a device is not enabled (such as after a
+ suspend/resume). LP: #313567
+
+ -- Bryce Harrington <br...@ubuntu.com> Thu, 08 Jan 2009 18:30:42 -0800
xorg-server (2:1.5.99.3-0ubuntu3) jaunty; urgency=low
diff --git a/debian/patches/155_no_checkmotion_for_disabled_devices.patch
b/debian/patches/155_no_checkmotion_for_disabled_devices.patch
new file mode 100644
index 0000000..00d4a54
--- /dev/null
+++ b/debian/patches/155_no_checkmotion_for_disabled_devices.patch
@@ -0,0 +1,27 @@
+commit e1a3a1a0d85c9971aea65c2228b5fd4dbf3bf57a
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Tue Dec 23 10:00:34 2008 +1000
+
+ xfree86: don't call CheckMotion if a device hasn't been enabled. #19176
+
+ X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=19176>
+
+diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
+index fe62772..e39c087 100644
+--- a/hw/xfree86/common/xf86Xinput.c
++++ b/hw/xfree86/common/xf86Xinput.c
+@@ -549,10 +549,11 @@ xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev,
BOOL enable)
+ ActivateDevice(dev);
+ /* Enable it if it's properly initialised and we're currently in the VT */
+ if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)
++ {
+ EnableDevice(dev);
+-
+- /* send enter/leave event, update sprite window */
+- CheckMotion(NULL, dev);
++ /* send enter/leave event, update sprite window */
++ CheckMotion(NULL, dev);
++ }
+
+ *pdev = dev;
+ return Success;
diff --git a/debian/patches/series b/debian/patches/series
index ce40c3d..b88b453 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
152_let-the-ddx-decide-on-the-xkbrulesdefaults.patch
153_make_dmx_compile.patch
154_force-copykeyclass-for-key-events.patch
+155_no_checkmotion_for_disabled_devices.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
