xorg-server: Changes to 'ubuntu'
debian/patches/156_exevents_copykeyclass_nullptrcheck.patch | 20 ------------
debian/patches/series | 1
2 files changed, 21 deletions(-)
New commits:
commit e567ca880178b1a76fe15d434658082a95f25aad
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Dec 3 15:04:10 2009 -0800
Finish removal of patch 156
diff --git a/debian/patches/156_exevents_copykeyclass_nullptrcheck.patch b/debian/patches/156_exevents_copykeyclass_nullptrcheck.patch
deleted file mode 100644
index 06bd5ab..0000000
--- a/debian/patches/156_exevents_copykeyclass_nullptrcheck.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nurp patched/Xi/exevents.c working/Xi/exevents.c
---- patched/Xi/exevents.c 2009-01-15 23:02:52.000000000 -0800
-+++ working/Xi/exevents.c 2009-01-15 23:09:42.000000000 -0800
-@@ -194,12 +194,15 @@ CopyKeyClass(DeviceIntPtr device, Device
- BOOL sendNotify = FALSE;
- int i;
-
-- if (device == master)
-+ if (device == master || device == NULL || master == NULL)
- return;
-
- dk = device->key;
- mk = master->key;
-
-+ if (dk == NULL || mk == NULL)
-+ return;
-+
- if (device != dixLookupPrivate(&master->devPrivates,
- CoreDevicePrivateKey)) {
- memcpy(mk->modifierMap, dk->modifierMap, MAP_LENGTH);
diff --git a/debian/patches/series b/debian/patches/series
index f86876e..ef359e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,6 @@
121_only_switch_vt_when_active.diff
135_rethrow_signals.patch
#143_default_to_vesa.patch
-#156_exevents_copykeyclass_nullptrcheck.patch
157_check_null_modes.patch
160_log_timestamping.patch
162_null_crtc_in_rotation.patch
Reply to: