From 7da7532121e918dfd1cc1449aa6aaaa814e70f6674d2cc73f2cf407d289f9350 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 18 Nov 2014 10:11:22 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=817 --- ...-support-for-IBM-ThinkPad-X41-Tablet.patch | 38 +++++++++++++++++++ ...cial-keys-on-ThinkPad-X60-X61-Tablet.patch | 33 ++++++++++++++++ systemd-mini.changes | 7 ++++ systemd-mini.spec | 6 +++ systemd.changes | 7 ++++ systemd.spec | 6 +++ 6 files changed, 97 insertions(+) create mode 100644 0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch create mode 100644 0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch diff --git a/0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch b/0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch new file mode 100644 index 00000000..67fb3061 --- /dev/null +++ b/0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch @@ -0,0 +1,38 @@ +From 71ed2d38711e345f22e2200bc7bb156aed98972a Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 12 Nov 2014 23:30:46 +0100 +Subject: [PATCH] keymap: Add support for IBM ThinkPad X41 Tablet + +Scancode taken from: +http://www.thinkwiki.org/wiki/Tablet_Hardware_Buttons#Linux_Support + +William Jon McCann provided the DMI match. IBM seems to have +swapped the version and model of the system: + Manufacturer: IBM + Product Name: 18666TU + Version: ThinkPad X41 Tablet +--- + hwdb/60-keyboard.hwdb | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git hwdb/60-keyboard.hwdb hwdb/60-keyboard.hwdb +index d2ca965..56a4009 100644 +--- hwdb/60-keyboard.hwdb ++++ hwdb/60-keyboard.hwdb +@@ -594,6 +594,13 @@ keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnThinkPad*X6*:pvr* + KEYBOARD_KEY_6f=down # down on d-pad + KEYBOARD_KEY_69=enter # enter on d-pad + ++# ThinkPad X41 Tablet ++keyboard:dmi:bvn*:bvr*:bd*:svnIBM*:pn18666TU:pvr* ++ KEYBOARD_KEY_6c=direction # rotate ++ KEYBOARD_KEY_68=f13 # toolbox ++ KEYBOARD_KEY_6b=esc # escape ++ KEYBOARD_KEY_69=enter # enter on d-pad ++ + # IdeaPad + keyboard:name:Ideapad extra buttons:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn* + KEYBOARD_KEY_42=f23 +-- +1.7.9.2 + diff --git a/0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch b/0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch new file mode 100644 index 00000000..28f7bb2a --- /dev/null +++ b/0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch @@ -0,0 +1,33 @@ +From b4c72e52d2109fe7f0ac3440c81ae3e1ce64a143 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 12 Nov 2014 23:31:08 +0100 +Subject: [PATCH] keymap: Fix special keys on ThinkPad X60/X61 Tablet + +KEY_DIRECTION is mapped to XF86RotateWindows, to rotate the display: +http://cgit.freedesktop.org/xkeyboard-config/commit/symbols/inet?id=ec875f6f9b7c4028e11d32b071989c682e6502bd + +And F13 is mapped to XF86Tools, which is closest to the original toolbox +usage: +http://cgit.freedesktop.org/xkeyboard-config/tree/symbols/inet?id=7a2c4bed212ebbcc05f3c959aef659ce7dd31fd8#n221 +--- + hwdb/60-keyboard.hwdb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git hwdb/60-keyboard.hwdb hwdb/60-keyboard.hwdb +index 56a4009..533ad5b 100644 +--- hwdb/60-keyboard.hwdb ++++ hwdb/60-keyboard.hwdb +@@ -585,8 +585,8 @@ keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*:pvrThinkPad*X2*Tablet* + + # ThinkPad X6 Tablet + keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnThinkPad*X6*:pvr* +- KEYBOARD_KEY_6c=f21 # rotate +- KEYBOARD_KEY_68=screenlock # screenlock ++ KEYBOARD_KEY_6c=direction # rotate ++ KEYBOARD_KEY_68=f13 # toolbox + KEYBOARD_KEY_6b=esc # escape + KEYBOARD_KEY_6d=right # right on d-pad + KEYBOARD_KEY_6e=left # left on d-pad +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 5984fa4d..6ffd6635 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 18 10:10:28 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch + 0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch + ------------------------------------------------------------------- Thu Nov 13 14:47:17 UTC 2014 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index ed476907..2079a8c4 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1033,6 +1033,10 @@ Patch501: 0001-login-rerun-vconsole-setup-when-switching-from-vgaco.patch Patch502: 0002-shutdown-fix-arguments-to-run-initramfs-shutdown.patch # PATCH-FIX-UPSTREAM added at 2014/11/10 Patch503: 0003-utf8-when-looking-at-the-next-unichar-honour-the-siz.patch +# PATCH-FIX-UPSTREAM added at 2014/11/18 +Patch504: 0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch +# PATCH-FIX-UPSTREAM added at 2014/11/18 +Patch505: 0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch # UDEV PATCHES # ============ @@ -1897,6 +1901,8 @@ cp %{SOURCE7} m4/ %patch501 -p0 %patch502 -p0 %patch503 -p0 +%patch504 -p0 +%patch505 -p0 # udev patches %patch1001 -p1 diff --git a/systemd.changes b/systemd.changes index 5984fa4d..6ffd6635 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 18 10:10:28 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch + 0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch + ------------------------------------------------------------------- Thu Nov 13 14:47:17 UTC 2014 - rmilasan@suse.com diff --git a/systemd.spec b/systemd.spec index 283bd01d..937cd8ce 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1028,6 +1028,10 @@ Patch501: 0001-login-rerun-vconsole-setup-when-switching-from-vgaco.patch Patch502: 0002-shutdown-fix-arguments-to-run-initramfs-shutdown.patch # PATCH-FIX-UPSTREAM added at 2014/11/10 Patch503: 0003-utf8-when-looking-at-the-next-unichar-honour-the-siz.patch +# PATCH-FIX-UPSTREAM added at 2014/11/18 +Patch504: 0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch +# PATCH-FIX-UPSTREAM added at 2014/11/18 +Patch505: 0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch # UDEV PATCHES # ============ @@ -1892,6 +1896,8 @@ cp %{SOURCE7} m4/ %patch501 -p0 %patch502 -p0 %patch503 -p0 +%patch504 -p0 +%patch505 -p0 # udev patches %patch1001 -p1