Merged with official ABS xkeyboard-config PKGBUILD

2 files changed, 40 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc70a7f508af..6f81ca2f92c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 pkgbase = xkeyboard-config-git
 	pkgdesc = X keyboard configuration files
-	pkgver = 2.31
+	pkgver = 2.37_r2690.g2433ef1a
 	pkgrel = 1
-	url = https://www.freedesktop.org/wiki/Software/XKeyboardConfig
-	arch = any
+	url = https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
+	arch = x86_64
 	license = custom
-	makedepends = intltool
+	makedepends = git
 	makedepends = xorg-xkbcomp
 	makedepends = libxslt
 	makedepends = python
-	provides = xkbdata
+	makedepends = meson
+	makedepends = git
 	provides = xkeyboard-config
-	conflicts = xkbdata
+	provides = xkbdata
+	provides = xkbdata-git
 	conflicts = xkeyboard-config
-	replaces = xkbdata
-	source = git+https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git
-	sha512sums = SKIP
+	conflicts = xkbdata
+	conflicts = xkbdata-git
+	replaces = xkbdata-git
+	source = git+https://github.com/freedesktop/xkeyboard-config.git
+	sha256sums = SKIP
 
 pkgname = xkeyboard-config-git
-
diff --git a/PKGBUILD b/PKGBUILD
index f3a3c53e7d24..b72e5e3e0ef3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,47 @@
-# Maintainer:  Vincent Grande <shoober420@gmail.com>
+# Merged with official ABS xkeyboard-config PKGBUILD by João, 2023/03/29 (all respective contributors apply herein)
+# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx>
+# Contributor:  Vincent Grande <shoober420@gmail.com>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xkeyboard-config-git
-pkgver=2.31
+pkgver=2.37_r2690.g2433ef1a
 pkgrel=1
 pkgdesc="X keyboard configuration files"
-arch=(any)
+arch=($CARCH)
 license=('custom')
-url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-makedepends=('intltool' 'xorg-xkbcomp' 'libxslt' 'python')
-provides=('xkbdata' 'xkeyboard-config')
-replaces=('xkbdata')
-conflicts=('xkbdata' 'xkeyboard-config')
-source=(git+https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git)
-sha512sums=('SKIP')
+url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+makedepends=(git xorg-xkbcomp libxslt python meson git)
+conflicts=(${pkgname%-git} xkbdata xkbdata-git)
+provides=(${pkgname%-git} xkbdata xkbdata-git)
+replaces=(xkbdata-git)
+source=("git+https://github.com/freedesktop/${pkgname%-git}.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd xkeyboard-config
-  git describe --tags | sed 's/-/+/g'
+  cd ${pkgname%-git}
+  _ver="$(git describe | sed 's/^[^[:digit:]]*-//;s/-[^-]*$//;s/^v//;s/-.*//')"
+  echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd xkeyboard-config
-  ./autogen.sh
-  ./configure --prefix=/usr \
-      --with-xkb-base=/usr/share/X11/xkb \
-      --with-xkb-rules-symlink=xorg \
-      --enable-compat-rules=yes
-  make
+  arch-meson ${pkgname}-${pkgver} build \
+	-D xkb-base="/usr/share/X11/xkb" \
+	-D compat-rules=true \
+	-D xorg-rules-symlinks=true
+
+  # Print config
+  meson configure build
+
+  ninja -C build
+
  }
  
  package() { 
-  cd xkeyboard-config
 
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
+  DESTDIR="$pkgdir" ninja -C build install
 
   install -m755 -d "${pkgdir}/var/lib/xkb"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }