rpms/xorg-x11-server/F-9 xorg-x11-server.spec, 1.346, 1.347 xserver-1.5.0-no-evdev-keyboards-kthnx.patch, 1.6, 1.7
Peter Hutterer
whot at fedoraproject.org
Mon Nov 3 05:30:39 UTC 2008
- Previous message: rpms/gdb/devel gdb-6.8-bz377541-vla-bound-undefined.patch, NONE, 1.1 gdb-6.8-bz377541-vla-loc-kind.patch, NONE, 1.1 gdb-6.8-bz377541-vla.patch, NONE, 1.1 gdb-6.6-buildid-locate.patch, 1.14, 1.15 gdb-6.8-inlining.patch, 1.2, 1.3 gdb.spec, 1.305, 1.306 gdb-6.8-bz377541-fortran-dynamic-arrays.patch, 1.2, NONE
- Next message: rpms/ghc/F-9 .cvsignore, 1.11, 1.12 ghc-rpm-macros.ghc, 1.2, 1.3 ghc.spec, 1.38, 1.39 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: whot
Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25100
Modified Files:
xorg-x11-server.spec
xserver-1.5.0-no-evdev-keyboards-kthnx.patch
Log Message:
* Mon Nov 3 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.2-3
- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: disable AllowEmptyInput by
default again (got inadvertently removed). (#462606)
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -r1.346 -r1.347
--- xorg-x11-server.spec 27 Oct 2008 02:27:22 -0000 1.346
+++ xorg-x11-server.spec 3 Nov 2008 05:30:09 -0000 1.347
@@ -19,7 +19,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.5.2
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -463,6 +463,10 @@
%changelog
+* Mon Nov 3 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.2-3
+- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: disable AllowEmptyInput by
+ default again (got inadvertently removed). (#462606)
+
* Mon Oct 27 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.2-2
- xserver-1.5.0-more-sanity-checks.patch: more sanity checks to stop vmmouse
from segfaulting the server. #434807
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xserver-1.5.0-no-evdev-keyboards-kthnx.patch 13 Oct 2008 14:26:42 -0000 1.6
+++ xserver-1.5.0-no-evdev-keyboards-kthnx.patch 3 Nov 2008 05:30:09 -0000 1.7
@@ -1,11 +1,14 @@
-From d70615e602361be7204552327f1fd5fa6d170cd0 Mon Sep 17 00:00:00 2001
+From c5714d2d77e872344d0ef8b4665f50cd43e467d8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Fri, 12 Sep 2008 10:12:55 -0400
Subject: [PATCH] config: disable evdev for keyboards
+If we ignore evdev keyboards, then we must have AEI off by default to allow
+for kbd to start if no xorg.conf is present.
---
- config/hal.c | 28 ++++++++++++++++++++++++++++
- 1 files changed, 28 insertions(+), 0 deletions(-)
+ config/hal.c | 28 ++++++++++++++++++++++++++++
+ hw/xfree86/common/xf86Config.c | 5 +++--
+ 2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/config/hal.c b/config/hal.c
index 0e0505b..76e8c45 100644
@@ -53,6 +56,22 @@
driver = get_prop_string(hal_ctx, udi, "input.x11_driver");
if (!driver){
/* verbose, don't tell the user unless they _want_ to see it */
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index a1c2e34..67cc783 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -1088,8 +1088,9 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
+ }
+ #endif
+
+- /* AllowEmptyInput is automatically true if we're hotplugging */
+- xf86Info.allowEmptyInput = (xf86Info.autoAddDevices && xf86Info.autoEnableDevices);
++ /* Disable AEI by default, so setups with no config file force the kbd
++ * driver */
++ xf86Info.allowEmptyInput = FALSE;
+ xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &xf86Info.allowEmptyInput);
+
+ xf86Info.useDefaultFontPath = TRUE;
--
-1.6.0.1
+1.5.5.2
- Previous message: rpms/gdb/devel gdb-6.8-bz377541-vla-bound-undefined.patch, NONE, 1.1 gdb-6.8-bz377541-vla-loc-kind.patch, NONE, 1.1 gdb-6.8-bz377541-vla.patch, NONE, 1.1 gdb-6.6-buildid-locate.patch, 1.14, 1.15 gdb-6.8-inlining.patch, 1.2, 1.3 gdb.spec, 1.305, 1.306 gdb-6.8-bz377541-fortran-dynamic-arrays.patch, 1.2, NONE
- Next message: rpms/ghc/F-9 .cvsignore, 1.11, 1.12 ghc-rpm-macros.ghc, 1.2, 1.3 ghc.spec, 1.38, 1.39 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list