rpms/xorg-x11-server/F-9 xorg-x11-server.spec, 1.329, 1.330 xserver-1.5.0-no-evdev-keyboards-kthnx.patch, 1.1, 1.2

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv363

Modified Files:
	xorg-x11-server.spec 
	xserver-1.5.0-no-evdev-keyboards-kthnx.patch 
Log Message:
* Thu Apr 24 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-26.20080415
- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Disable evdev for keyboards
  even on combo devices.  This means combo devices will go through the old
  mouse driver too.  Oh well.  (#440380)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- xorg-x11-server.spec	24 Apr 2008 06:47:31 -0000	1.329
+++ xorg-x11-server.spec	24 Apr 2008 19:38:40 -0000	1.330
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   25.%{gitdate}%{?dist}
+Release:   26.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -516,6 +516,11 @@
 
 
 %changelog
+* Thu Apr 24 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-26.20080415
+- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Disable evdev for keyboards
+  even on combo devices.  This means combo devices will go through the old
+  mouse driver too.  Oh well.  (#440380)
+
 * Thu Apr 24 2008 Dave Airlie <airlied at redhat.com> 1.4.99.901-25.20080415
 - xserver-1.5.0-f-spot-screws-glx.patch: stop GLX crashing X server when
   f-spot exists (#443299)

xserver-1.5.0-no-evdev-keyboards-kthnx.patch:

Index: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xserver-1.5.0-no-evdev-keyboards-kthnx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.5.0-no-evdev-keyboards-kthnx.patch	18 Mar 2008 19:20:07 -0000	1.1
+++ xserver-1.5.0-no-evdev-keyboards-kthnx.patch	24 Apr 2008 19:38:41 -0000	1.2
@@ -1,27 +1,40 @@
-From 3d914c2c1d24886ea81bf70de224370ebdf73b6d Mon Sep 17 00:00:00 2001
+From 749698f0f4677758349bc652ee12b3a69ae8ca5c Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Tue, 18 Mar 2008 15:11:13 -0400
-Subject: [PATCH] Disable evdev for keyboards.
+Subject: [PATCH] Disable evdev for keyboards even harder.
 
 Hrngh argh hatred.
 ---
- config/hal.c |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
+ config/hal.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/config/hal.c b/config/hal.c
-index 1575422..dcbf715 100644
+index 1575422..ec49f2a 100644
 --- a/config/hal.c
 +++ b/config/hal.c
-@@ -177,9 +177,6 @@ device_added(LibHalContext *hal_ctx, const char *udi)
-         /* input.keys is the new, of which input.keyboard is a subset, but
-          * input.keyboard is the old 'we have keys', so we have to keep it
-          * around. */
+@@ -174,16 +174,16 @@ device_added(LibHalContext *hal_ctx, const char *udi)
+         goto out_error;
+     }
+     for (i = 0; props[i]; i++) {
+-        /* input.keys is the new, of which input.keyboard is a subset, but
+-         * input.keyboard is the old 'we have keys', so we have to keep it
+-         * around. */
 -        if (strcmp(props[i], "input.keys") == 0 ||
 -            strcmp(props[i], "input.keyboard") == 0)
 -            type |= TYPE_KEYS;
          if (strcmp(props[i], "input.mouse") == 0 ||
              strcmp(props[i], "input.touchpad") == 0)
              type |= TYPE_POINTER;
+     }
++    /* XXX skip keyboards.  seriously. */
++    for (i = 0; props[i]; i++) {
++        if (strcmp(props[i], "input.keys") == 0 ||
++            strcmp(props[i], "input.keyboard") == 0)
++            type = TYPE_NONE;
++    }
+     libhal_free_string_array(props);
+ 
+     if (type == TYPE_NONE)
 -- 
-1.5.4.3
+1.5.4.5