summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
Diffstat (limited to 'user')
-rw-r--r--user/xkeyboard-config/APKBUILD29
1 files changed, 12 insertions, 17 deletions
diff --git a/user/xkeyboard-config/APKBUILD b/user/xkeyboard-config/APKBUILD
index 63d9e1f64..fd865dcac 100644
--- a/user/xkeyboard-config/APKBUILD
+++ b/user/xkeyboard-config/APKBUILD
@@ -1,35 +1,30 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xkeyboard-config
-pkgver=2.30
+pkgver=2.42
pkgrel=0
pkgdesc="Keyboard configuration files for X11"
url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
arch="noarch"
+options="!check" # requires gawk
license="X11 AND MIT"
depends=""
-makedepends="intltool libx11-dev python3 xkbcomp libxslt"
+makedepends="intltool libx11-dev python3 xkbcomp libxslt meson"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://www.X.Org/releases/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.bz2"
+source="https://www.X.Org/releases/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.xz"
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --with-xkb-base=/usr/share/X11/xkb \
- --with-xkb-rules-symlink=xorg \
- --enable-compat-rules=yes
- make
-}
-
-check() {
- make check
+ meson setup \
+ -Dprefix=/usr \
+ -Dxkb-base=/usr/share/X11/xkb \
+ -Dxorg-rules-symlinks=true \
+ build
+ meson compile -C build
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install -C build
rm -f "$pkgdir"/usr/share/X11/xkb/compiled
install -m755 -d "$pkgdir"/var/lib/xkb
}
-sha512sums="2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4 xkeyboard-config-2.30.tar.bz2"
+sha512sums="654436ae21b9deb3b193847403b652cc5c19aa665a9c9168598fc6ac7af83ac04d40684d9eb99dd4db97c21e5100cfeed06b25e2b041eb9fdf3c05ef95a891a9 xkeyboard-config-2.42.tar.xz"