[arch-commits] Commit in xkeyboard-config/repos/extra-any (PKGBUILD PKGBUILD)

[Andreas Radke]

    Date: Sunday, June 25, 2017 @ 16:24:21
  Author: andyrtr
Revision: 299226

archrelease: copy trunk to extra-any

Added:
  xkeyboard-config/repos/extra-any/PKGBUILD
    (from rev 299225, xkeyboard-config/trunk/PKGBUILD)
Deleted:
  xkeyboard-config/repos/extra-any/PKGBUILD

----------+
 PKGBUILD |   88 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-25 16:24:06 UTC (rev 299225)
+++ PKGBUILD	2017-06-25 16:24:21 UTC (rev 299226)
@@ -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.21
-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>"
-sha256sums=('30c17049fae129fc14875656da9aa3099e3031d6ce0ee1d77aae190fd9edcec5'
-            '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/extra-any/PKGBUILD (from rev 299225, xkeyboard-config/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-06-25 16:24:21 UTC (rev 299226)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xkeyboard-config
+pkgver=2.21
+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}
+       fix_typo.diff::https://cgit.freedesktop.org/xkeyboard-config/patch/?id=b3fb72308942f705e3e8e17765e4097773ed5483)
+validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
+validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu at gnome.org>"
+sha256sums=('30c17049fae129fc14875656da9aa3099e3031d6ce0ee1d77aae190fd9edcec5'
+            'SKIP'
+            'SKIP')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # https://bugs.archlinux.org/task/54584
+  patch -Np1 -i ../fix_typo.diff
+}
+
+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}/"
+}