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

[Andreas Radke]

    Date: Sunday, September 12, 2021 @ 21:15:48
  Author: andyrtr
Revision: 423971

upgpkg: xkeyboard-config 2.33-2: build using meson

Modified:
  xkeyboard-config/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-12 20:52:33 UTC (rev 423970)
+++ PKGBUILD	2021-09-12 21:15:48 UTC (rev 423971)
@@ -3,12 +3,12 @@
 
 pkgname=xkeyboard-config
 pkgver=2.33
-pkgrel=1
+pkgrel=2
 pkgdesc="X keyboard configuration files"
 arch=(any)
 license=('custom')
 url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-makedepends=('intltool' 'xorg-xkbcomp' 'libxslt' 'python')
+makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson')
 provides=('xkbdata')
 replaces=('xkbdata')
 conflicts=('xkbdata')
@@ -19,21 +19,23 @@
             '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
+  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 ${pkgname}-${pkgver}
 
-  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}/"
 }