[arch-commits] Commit in xkeyboard-config/repos/testing-any (3 files)

[Bartłomiej Piotrowski]

    Date: Sunday, February 4, 2018 @ 15:06:31
  Author: bpiotrowski
Revision: 315860

archrelease: copy trunk to testing-any

Added:
  xkeyboard-config/repos/testing-any/0001-Fix-typo-in-Polish-symbols-file.patch
    (from rev 315859, xkeyboard-config/trunk/0001-Fix-typo-in-Polish-symbols-file.patch)
  xkeyboard-config/repos/testing-any/PKGBUILD
    (from rev 315859, xkeyboard-config/trunk/PKGBUILD)
Deleted:
  xkeyboard-config/repos/testing-any/PKGBUILD

--------------------------------------------+
 0001-Fix-typo-in-Polish-symbols-file.patch |   25 +++++++
 PKGBUILD                                   |   87 ++++++++++++++-------------
 2 files changed, 72 insertions(+), 40 deletions(-)

Copied: xkeyboard-config/repos/testing-any/0001-Fix-typo-in-Polish-symbols-file.patch (from rev 315859, xkeyboard-config/trunk/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:31 UTC (rev 315860)
@@ -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
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-04 15:06:21 UTC (rev 315859)
+++ PKGBUILD	2018-02-04 15:06:31 UTC (rev 315860)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xkeyboard-config
-pkgver=2.23.1
-pkgrel=1
-pkgdesc="X keyboard configuration files"
-arch=(any)
-license=('custom')
-url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-makedepends=('intltool' 'xorg-xkbcomp' 'libxslt')
-provides=('xkbdata')
-replaces=('xkbdata')
-conflicts=('xkbdata')
-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')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-      --with-xkb-base=/usr/share/X11/xkb \
-      --with-xkb-rules-symlink=xorg \
-      --enable-compat-rules=yes
-  make
- }
- 
- package() { 
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
-
-  install -m755 -d "${pkgdir}/var/lib/xkb"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xkeyboard-config/repos/testing-any/PKGBUILD (from rev 315859, xkeyboard-config/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-02-04 15:06:31 UTC (rev 315860)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xkeyboard-config
+pkgver=2.23.1
+pkgrel=2
+pkgdesc="X keyboard configuration files"
+arch=(any)
+license=('custom')
+url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+makedepends=('intltool' 'xorg-xkbcomp' 'libxslt')
+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)
+validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
+validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu at gnome.org>"
+sha512sums=('d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba'
+            '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 \
+      --with-xkb-base=/usr/share/X11/xkb \
+      --with-xkb-rules-symlink=xorg \
+      --enable-compat-rules=yes
+  make
+ }
+ 
+ package() { 
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
+
+  install -m755 -d "${pkgdir}/var/lib/xkb"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}