[arch-commits] Commit in xkeyboard-config/trunk (2 files)

[Andreas Radke]

    Date: Sunday, April 22, 2018 @ 11:07:45
  Author: andyrtr
Revision: 322781

upgpkg: xkeyboard-config 2.23.1-3

fix mapping for KEY_RFKILL and KEY_WWAN; FS#58261

Added:
  xkeyboard-config/trunk/0002_map_rfkill_wwan_to_xf86.diff
Modified:
  xkeyboard-config/trunk/PKGBUILD

-----------------------------------+
 0002_map_rfkill_wwan_to_xf86.diff |   46 ++++++++++++++++++++++++++++++++++++
 PKGBUILD                          |   10 +++++--
 2 files changed, 53 insertions(+), 3 deletions(-)

Added: 0002_map_rfkill_wwan_to_xf86.diff
===================================================================
--- 0002_map_rfkill_wwan_to_xf86.diff	                        (rev 0)
+++ 0002_map_rfkill_wwan_to_xf86.diff	2018-04-22 11:07:45 UTC (rev 322781)
@@ -0,0 +1,46 @@
+From 39927132729bcd8569716f4ccd3a2e3eadfaf186 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg at redhat.com>
+Date: Mon, 8 May 2017 15:54:46 +0200
+Subject: Map evdev keycodes KEY_RFKILL and KEY_WWAN to XF86RFKill and XF86WWAN
+
+In particular KEY_RFKILL is required for properly handling airplane mode
+in userspace.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100970
+---
+ keycodes/evdev | 2 ++
+ symbols/inet   | 4 ++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/keycodes/evdev b/keycodes/evdev
+index 624ac68..51a6e26 100644
+--- a/keycodes/evdev
++++ b/keycodes/evdev
+@@ -281,6 +281,8 @@ default xkb_keycodes "evdev" {
+ 	<I251> = 251;	// #define KEY_BRIGHTNESS_CYCLE    243
+ 	<I252> = 252;	// #define KEY_BRIGHTNESS_ZERO     244
+ 	<I253> = 253;	// #define KEY_DISPLAY_OFF         245
++	<I254> = 254;	// #define KEY_WWAN                246
++	<I255> = 255;	// #define KEY_RFKILL              247
+ 
+ 	// Fake keycodes for virtual keys
+ 	<LVL3> =   92;
+diff --git a/symbols/inet b/symbols/inet
+index 5403e77..2934b65 100644
+--- a/symbols/inet
++++ b/symbols/inet
+@@ -215,8 +215,8 @@ xkb_symbols "evdev" {
+ //  key <I251>   {      [ ]       }; // KEY_BRIGHTNESS_CYCLE  --  bright up, max++ == min
+ //  key <I252>   {      [ ]       }; // KEY_BRIGHTNESS_ZERO  --  brightness off
+ //  key <I253>   {      [ ]       }; // KEY_DISPLAY_OFF  --  turn off display
+-//  key <I254>   {      [ ]       }; // KEY_WIMAX
+-    key <I255>   {      [ XF86Hibernate         ]       }; // KEY_HIBERNATE
++    key <I254>   {      [ XF86WWAN              ]       }; // KEY_WWAN
++    key <I255>   {      [ XF86RFKill            ]       }; // KEY_RFKILL
+ 
+     key <FK13>   {      [ XF86Tools         ]       };
+     key <FK14>   {      [ XF86Launch5       ]       };
+-- 
+cgit v1.1
+
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-22 08:17:40 UTC (rev 322780)
+++ PKGBUILD	2018-04-22 11:07:45 UTC (rev 322781)
@@ -4,7 +4,7 @@
 
 pkgname=xkeyboard-config
 pkgver=2.23.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X keyboard configuration files"
 arch=(any)
 license=('custom')
@@ -14,16 +14,20 @@
 replaces=('xkbdata')
 conflicts=('xkbdata')
 source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        0001-Fix-typo-in-Polish-symbols-file.patch)
+        0001-Fix-typo-in-Polish-symbols-file.patch
+        0002_map_rfkill_wwan_to_xf86.diff)
 validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
 validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu at gnome.org>"
 sha512sums=('d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba'
             'SKIP'
-            '2c9a846a0eae6f208cd6be5aa92d69b0b7d1ffc2fe0f98af22f3b62cd73105ff63862d9a2b5719d6b0c5c035b7839faf4e88da5e0c6a336663afede41802381c')
+            '2c9a846a0eae6f208cd6be5aa92d69b0b7d1ffc2fe0f98af22f3b62cd73105ff63862d9a2b5719d6b0c5c035b7839faf4e88da5e0c6a336663afede41802381c'
+            '1a0538f9ab4ba9c15d6f697a1ecc023acffa1eec30cd90182006087802d2bceb1d44bcbd7113654ed72da300ab636726ce2a7858c03a1bdedf6f4f8bd670d94f')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/0001-Fix-typo-in-Polish-symbols-file.patch"
+  # FS#58261, https://bugs.freedesktop.org/show_bug.cgi?id=100970
+  patch -p1 -i "${srcdir}/0002_map_rfkill_wwan_to_xf86.diff"
 }
 
 build() {