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

[Bartłomiej Piotrowski]

    Date: Sunday, February 4, 2018 @ 15:06:21
  Author: bpiotrowski
Revision: 315859

2.23.1-2: backport commit that fixes entering Polish symbols

Added:
  xkeyboard-config/trunk/0001-Fix-typo-in-Polish-symbols-file.patch
Modified:
  xkeyboard-config/trunk/PKGBUILD

--------------------------------------------+
 0001-Fix-typo-in-Polish-symbols-file.patch |   25 +++++++++++++++++++++++++
 PKGBUILD                                   |   13 ++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

Added: 0001-Fix-typo-in-Polish-symbols-file.patch
===================================================================
--- 0001-Fix-typo-in-Polish-symbols-file.patch	                        (rev 0)
+++ 0001-Fix-typo-in-Polish-symbols-file.patch	2018-02-04 15:06:21 UTC (rev 315859)
@@ -0,0 +1,25 @@
+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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-04 13:16:11 UTC (rev 315858)
+++ PKGBUILD	2018-02-04 15:06:21 UTC (rev 315859)
@@ -4,7 +4,7 @@
 
 pkgname=xkeyboard-config
 pkgver=2.23.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X keyboard configuration files"
 arch=(any)
 license=('custom')
@@ -13,12 +13,19 @@
 provides=('xkbdata')
 replaces=('xkbdata')
 conflicts=('xkbdata')
-source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+        0001-Fix-typo-in-Polish-symbols-file.patch)
 validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
 validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu at gnome.org>"
 sha512sums=('d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba'
-            'SKIP')
+            'SKIP'
+            '2c9a846a0eae6f208cd6be5aa92d69b0b7d1ffc2fe0f98af22f3b62cd73105ff63862d9a2b5719d6b0c5c035b7839faf4e88da5e0c6a336663afede41802381c')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/0001-Fix-typo-in-Polish-symbols-file.patch"
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \