rpms/xorg-x11-server/devel xserver-1.5.0-no-evdev-keyboards-kthnx.patch, NONE, 1.1 xorg-x11-server.spec, 1.311, 1.312

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6340

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-no-evdev-keyboards-kthnx.patch 
Log Message:
* Tue Mar 18 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-10.20080314
- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Sorry, evdev keyboarding is
  just too broken.


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

--- NEW FILE xserver-1.5.0-no-evdev-keyboards-kthnx.patch ---
>From 3d914c2c1d24886ea81bf70de224370ebdf73b6d 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.

Hrngh argh hatred.
---
 config/hal.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/config/hal.c b/config/hal.c
index 1575422..dcbf715 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. */
-        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;
-- 
1.5.4.3



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- xorg-x11-server.spec	14 Mar 2008 19:50:58 -0000	1.311
+++ xorg-x11-server.spec	18 Mar 2008 19:20:07 -0000	1.312
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   9.%{gitdate}%{?dist}
+Release:   10.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -64,6 +64,7 @@
 Patch5005: xserver-1.5.0-unselinux.patch
 Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch
 Patch5008: xserver-1.5.0-xaa-sucks.patch
+Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -512,6 +513,10 @@
 
 
 %changelog
+* Tue Mar 18 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-10.20080314
+- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Sorry, evdev keyboarding is
+  just too broken.
+
 * Fri Mar 14 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-9.20080314
 - Today's snapshot.  Mostly just patch merge with rawhide.