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

[Andreas Radke]

    Date: Wednesday, June 6, 2018 @ 16:35:59
  Author: andyrtr
Revision: 326046

upgpkg: xkeyboard-config 2.24-1

upstream update 2.24

Modified:
  xkeyboard-config/trunk/PKGBUILD
Deleted:
  xkeyboard-config/trunk/0001-Fix-typo-in-Polish-symbols-file.patch
  xkeyboard-config/trunk/0002_map_rfkill_wwan_to_xf86.diff

--------------------------------------------+
 0001-Fix-typo-in-Polish-symbols-file.patch |   25 --------------
 0002_map_rfkill_wwan_to_xf86.diff          |   46 ---------------------------
 PKGBUILD                                   |   21 ++----------
 3 files changed, 5 insertions(+), 87 deletions(-)

Deleted: 0001-Fix-typo-in-Polish-symbols-file.patch
===================================================================
--- 0001-Fix-typo-in-Polish-symbols-file.patch	2018-06-06 16:20:05 UTC (rev 326045)
+++ 0001-Fix-typo-in-Polish-symbols-file.patch	2018-06-06 16:35:59 UTC (rev 326046)
@@ -1,25 +0,0 @@
-From 9a5cecf64ffc427a6a5a7c9a061992c32e5b8a4f Mon Sep 17 00:00:00 2001
-From: Gunnar Hjalmarsson <gunnarhj at ubuntu.com>
-Date: Thu, 1 Feb 2018 15:37:46 +0100
-Subject: [PATCH] Fix typo in Polish symbols file
-
-https://bugs.freedesktop.org/show_bug.cgi?id=104904
----
- symbols/pl | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/symbols/pl b/symbols/pl
-index 52e7959..800cb85 100644
---- a/symbols/pl
-+++ b/symbols/pl
-@@ -497,7 +497,6 @@ partial alphanumeric_keys
-        include "sun_vndr/pl(sun_type6)"
- };
- 
--------------------------------
- //Glagolica
- partial alphanumeric_keys
- xkb_symbols "glagolica"
--- 
-2.16.1
-

Deleted: 0002_map_rfkill_wwan_to_xf86.diff
===================================================================
--- 0002_map_rfkill_wwan_to_xf86.diff	2018-06-06 16:20:05 UTC (rev 326045)
+++ 0002_map_rfkill_wwan_to_xf86.diff	2018-06-06 16:35:59 UTC (rev 326046)
@@ -1,46 +0,0 @@
-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-06-06 16:20:05 UTC (rev 326045)
+++ PKGBUILD	2018-06-06 16:35:59 UTC (rev 326046)
@@ -3,8 +3,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xkeyboard-config
-pkgver=2.23.1
-pkgrel=3
+pkgver=2.24
+pkgrel=1
 pkgdesc="X keyboard configuration files"
 arch=(any)
 license=('custom')
@@ -13,23 +13,12 @@
 provides=('xkbdata')
 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
-        0002_map_rfkill_wwan_to_xf86.diff)
+source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
 validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
 validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu at gnome.org>"
-sha512sums=('d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba'
-            'SKIP'
-            '2c9a846a0eae6f208cd6be5aa92d69b0b7d1ffc2fe0f98af22f3b62cd73105ff63862d9a2b5719d6b0c5c035b7839faf4e88da5e0c6a336663afede41802381c'
-            '1a0538f9ab4ba9c15d6f697a1ecc023acffa1eec30cd90182006087802d2bceb1d44bcbd7113654ed72da300ab636726ce2a7858c03a1bdedf6f4f8bd670d94f')
+sha512sums=('96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0'
+            'SKIP')
 
-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() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \