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

[Andreas Radke]

    Date: Tuesday, September 6, 2022 @ 11:06:07
  Author: andyrtr
Revision: 455115

upgpkg: xkeyboard-config 2.36+89+g382c5feb-1: update to latest git commit - should solve FS#75704

Modified:
  xkeyboard-config/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-06 10:12:45 UTC (rev 455114)
+++ PKGBUILD	2022-09-06 11:06:07 UTC (rev 455115)
@@ -1,35 +1,32 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=xkeyboard-config
-pkgver=2.36
-pkgrel=3
+_commit=382c5feb04c151833a8d10de3198d1ace4d62c0b # = master 2022-09-05
+pkgver=2.36+89+g382c5feb
+pkgrel=1
 pkgdesc="X keyboard configuration files"
 arch=(any)
 license=('custom')
 url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson')
+makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson' 'git')
 provides=('xkbdata')
 replaces=('xkbdata')
 conflicts=('xkbdata')
-source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
-        alujiskeys.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/dc1534b4b0cf2153e4b8848310efc8393fb73830.patch
-        backslahes-instead-of-slashes.patch::https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/8ac41c50ab0aa7cd3a7e94313074115de2a172d2.patch)
-validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov at gmail.com>
+# https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
+source=(#https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
+        "git+https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git#commit=$_commit")
+#validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov at gmail.com>
 #validpgpkeys=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu at gnome.org>"
-sha256sums=('1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595'
-            'SKIP'
-            'SKIP'
-            'SKIP')
+sha256sums=('SKIP')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # FS##75007 / https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/325
-  patch -Np1 -i ../alujiskeys.patch
-  patch -Np1 -i ../backslahes-instead-of-slashes.patch
+pkgver() {
+  cd $pkgname
+  git describe --long | sed "s/$pkgname//" | sed 's/^Release.//;s/\([^-]*-g\)/\1/;s/-/+/g;' | sed 's/+//'
 }
 
 build() {
-  arch-meson ${pkgname}-${pkgver} build \
+#  arch-meson ${pkgname}-${pkgver} build \
+  arch-meson ${pkgname} build \
 	-D xkb-base="/usr/share/X11/xkb" \
 	-D compat-rules=true \
 	-D xorg-rules-symlinks=true
@@ -47,5 +44,6 @@
 
   install -m755 -d "${pkgdir}/var/lib/xkb"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  #install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -m644 ${pkgname}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }