Attachment 10362 Details for Bug 11301 – proposed patch

[patch] proposed patch

kbd.diff (text/plain), 1.42 KB, created by Julien Cristau on 2007-06-18 08:36:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julien Cristau

Created: 2007-06-18 08:36:03 UTC

Size: 1.42 KB

patch

obsolete

>diff --git a/src/Makefile.am b/src/Makefile.am
>index 03f8f3c..bb3f7e3 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -49,4 +49,10 @@ if HURD
> kbd_drv_la_SOURCES += $(HURD_SRCS)
> endif
> 
>+install-data-local: install-kbd_drv_laLTLIBRARIES
>+	(cd $(DESTDIR)$(kbd_drv_ladir) && rm -f keyboard_drv.so && ln -s kbd_drv.so keyboard_drv.so)
>+
>+uninstall-local:
>+	(cd $(DESTDIR)$(kbd_drv_ladir) && rm -f keyboard_drv.so)
>+
> EXTRA_DIST = $(BSD_SRCS) $(HURD_SRCS) $(LINUX_SRCS) $(SCO_SRCS) $(SOLARIS_SRCS)
>diff --git a/src/kbd.c b/src/kbd.c
>index c1daa4b..5c3dc6b 100644
>--- a/src/kbd.c
>+++ b/src/kbd.c
>@@ -838,6 +838,7 @@ xf86KbdPlug(pointer	module,
>     }
> 
>     xf86AddInputDriver(&KBD, module, 0);
>+    xf86AddInputDriver(&KEYBOARD, module, 0);
> 
>     return module;
> }
>@@ -862,3 +863,25 @@ _X_EXPORT XF86ModuleData kbdModuleData = {
>     xf86KbdPlug,
>     xf86KbdUnplug
> };
>+
>+static XF86ModuleVersionInfo xf86KeyboardVersionRec =
>+{
>+    "keyboard",
>+    MODULEVENDORSTRING,
>+    MODINFOSTRING1,
>+    MODINFOSTRING2,
>+    XORG_VERSION_CURRENT,
>+    PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
>+    ABI_CLASS_XINPUT,
>+    ABI_XINPUT_VERSION,
>+    MOD_CLASS_XINPUT,
>+    {0, 0, 0, 0}                /* signature, to be patched into the file by */
>+                                /* a tool */
>+};
>+
>+_X_EXPORT XF86ModuleData keyboardModuleData = {
>+    &xf86KeyboardVersionRec,
>+    xf86KbdPlug,
>+    xf86KbdUnplug
>+};
>+

Actions: View | Splinter Review

Attachments on bug 11301: 10361 | 10362 | 10363

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.