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

[Andreas Radke]

    Date: Thursday, June 18, 2020 @ 08:10:41
  Author: andyrtr
Revision: 389491

upgpkg: xkeyboard-config 2.30-2: apply upstream fix solving a git conflict leading to broken layout - FS#67024

Added:
  xkeyboard-config/trunk/fix_symbols_syntax_error.diff
Modified:
  xkeyboard-config/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   14 +++++++++++---
 fix_symbols_syntax_error.diff |   13 +++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-18 01:09:31 UTC (rev 389490)
+++ PKGBUILD	2020-06-18 08:10:41 UTC (rev 389491)
@@ -3,7 +3,7 @@
 
 pkgname=xkeyboard-config
 pkgver=2.30
-pkgrel=1
+pkgrel=2
 pkgdesc="X keyboard configuration files"
 arch=(any)
 license=('custom')
@@ -13,12 +13,20 @@
 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}
+        fix_symbols_syntax_error.diff)
 validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
 validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu at gnome.org>"
 sha512sums=('2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4'
-            'SKIP')
+            'SKIP'
+            'b8463f877f671be5ebf5b1baf1f5c287a14f57de56cc67ea71c6094b40b501c12fbbab3d6cb79926aac80546919a74d0fb77a13ea1a58791a968ee1a1bbe25f6')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # FS#66898 / https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/212
+  patch -Np1 -i ../fix_symbols_syntax_error.diff
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \

Added: fix_symbols_syntax_error.diff
===================================================================
--- fix_symbols_syntax_error.diff	                        (rev 0)
+++ fix_symbols_syntax_error.diff	2020-06-18 08:10:41 UTC (rev 389491)
@@ -0,0 +1,13 @@
+diff --git a/symbols/in b/symbols/in
+index 3ca78a20664d803d92e87315b6372909f31594e8..b3a5ca9ef613876b668a521a8f464596ab835d9e 100644
+--- a/symbols/in
++++ b/symbols/in
+@@ -2326,7 +2326,7 @@ xkb_symbols "marathi" {
+ 	key <AB09> { [ period, U0964, U0965, U093d ] };
+ 	key <AB10> { [ U092f, question, slash, question ] };
+ };
+-=======
++
+ // EXTRAS:
+ 
+ //           Modi is an ancient Indian script that is used to write texts in Marathi, Hindi and Sanskrit.