[arch-commits] Commit in xorg-xkbcomp/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Jan de Groot]

    Date: Sunday, September 15, 2019 @ 21:55:27
  Author: jgc
Revision: 362924

archrelease: copy trunk to extra-x86_64

Added:
  xorg-xkbcomp/repos/extra-x86_64/PKGBUILD
    (from rev 362923, xorg-xkbcomp/trunk/PKGBUILD)
Deleted:
  xorg-xkbcomp/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   79 +++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 33 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-15 21:55:22 UTC (rev 362923)
+++ PKGBUILD	2019-09-15 21:55:27 UTC (rev 362924)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=xorg-xkbcomp
-pkgver=1.4.2
-pkgrel=1
-pkgdesc="X Keyboard description compiler"
-arch=(x86_64)
-url="https://xorg.freedesktop.org/"
-license=('custom')
-depends=('libxkbfile')
-makedepends=('xorg-util-macros')
-groups=('xorg-apps' 'xorg')
-source=(${url}/releases/individual/app/xkbcomp-${pkgver}.tar.bz2{,.sig})
-sha512sums=('b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e'
-            'SKIP')
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
-validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels at collabora.com>"
-validpgpkeys+=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') # "Adam Jackson <ajax at benzedrine.nwnk.net>"
-
-build() {
-  cd xkbcomp-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd xkbcomp-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xorg-xkbcomp/repos/extra-x86_64/PKGBUILD (from rev 362923, xorg-xkbcomp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-15 21:55:27 UTC (rev 362924)
@@ -0,0 +1,46 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=xorg-xkbcomp
+pkgver=1.4.2+7+g29fda8e
+pkgrel=1
+pkgdesc="X Keyboard description compiler"
+arch=(x86_64)
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('libxkbfile')
+makedepends=('xorg-util-macros' git)
+groups=('xorg-apps' 'xorg')
+_commit=29fda8e50e4a4a127348e63fcf9f47600beab93c  # master
+source=("git+https://gitlab.freedesktop.org/xorg/app/xkbcomp#commit=$_commit")
+sha512sums=('SKIP')
+validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
+validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels at collabora.com>"
+validpgpkeys+=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') # "Adam Jackson <ajax at benzedrine.nwnk.net>"
+
+pkgver() {
+  cd xkbcomp
+  git describe --tags | sed 's/^xkbcomp-//;s/-/+/g'
+}
+
+prepare() {
+  cd xkbcomp
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+check() {
+  make -C xkbcomp check
+}
+
+build() {
+  cd xkbcomp
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd xkbcomp
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}