Date: Sunday, September 15, 2019 @ 21:55:22 Author: jgc Revision: 362923
upgpkg: xorg-xkbcomp 1.4.2+7+g29fda8e-1 Bump to git snapshot to fix errors from FS#62449 Modified: xorg-xkbcomp/trunk/PKGBUILD ----------+ PKGBUILD | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-09-15 21:50:31 UTC (rev 362922) +++ PKGBUILD 2019-09-15 21:55:22 UTC (rev 362923) @@ -2,7 +2,7 @@ # Maintainer: Andreas Radke <[email protected]> pkgname=xorg-xkbcomp -pkgver=1.4.2 +pkgver=1.4.2+7+g29fda8e pkgrel=1 pkgdesc="X Keyboard description compiler" arch=(x86_64) @@ -9,23 +9,37 @@ url="https://xorg.freedesktop.org/"; license=('custom') depends=('libxkbfile') -makedepends=('xorg-util-macros') +makedepends=('xorg-util-macros' git) groups=('xorg-apps' 'xorg') -source=(${url}/releases/individual/app/xkbcomp-${pkgver}.tar.bz2{,.sig}) -sha512sums=('b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e' - 'SKIP') +_commit=29fda8e50e4a4a127348e63fcf9f47600beab93c # master +source=("git+https://gitlab.freedesktop.org/xorg/app/xkbcomp#commit=$_commit";) +sha512sums=('SKIP') validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <[email protected]> validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <[email protected]>" validpgpkeys+=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') # "Adam Jackson <[email protected]>" +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-${pkgver} + cd xkbcomp ./configure --prefix=/usr make } package() { - cd xkbcomp-${pkgver} + cd xkbcomp make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
