1.4.1-1

PKGBUILD

@@ -3,31 +3,50 @@
 # Contributor: Mladen Pejakovic <pejakm@gmail.com>
 
 pkgbase=libxkbcommon
-pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11)
-pkgver=1.4.0
+pkgname=(
+  libxkbcommon
+  libxkbcommon-x11
+  libxkbcommon-doc
+)
+pkgver=1.4.1
 pkgrel=1
-pkgdesc="Keymap handling library for toolkits and window systems"
-url="https://xkbcommon.org/"
+pkgdesc='Keymap handling library for toolkits and window systems'
+url='https://xkbcommon.org/'
 arch=(x86_64)
 license=(custom)
-makedepends=(xkeyboard-config libxml2 libxcb wayland wayland-protocols doxygen
-             git meson xorgproto)
-checkdepends=(xorg-server-xvfb libgl)
-_commit=ea6580cc3913d93655ecf92a5913de652315efc3  # tags/xkbcommon-1.4.0^0
+makedepends=(
+  doxygen
+  git
+  libxcb 
+  libxml2
+  meson
+  wayland
+  wayland-protocols
+  xkeyboard-config
+  xorgproto
+)
+checkdepends=(
+  libgl
+  xorg-server-xvfb
+)
+options=(
+  debug
+)
+_commit=57af9cb71f19f37394399b549f7cb7b0d9fe3988  # tags/xkbcommon-1.4.1^0
 source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $pkgbase
-  git describe --tags | sed 's/^xkbcommon-//;s/-/+/g'
+  cd libxkbcommon
+  git describe --tags | sed 's/^xkbcommon-//;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
-  cd $pkgbase
+  cd libxkbcommon
 }
 
 build() {
-  arch-meson $pkgbase build
+  arch-meson libxkbcommon build
   meson compile -C build
 }
 
@@ -46,35 +65,54 @@ _pick() {
 }
 
 package_libxkbcommon() {
-  depends=(xkeyboard-config libxml2)
-  optdepends=('libxkbcommon-x11: xkbcli interactive-x11'
-              'wayland: xkbcli interactive-wayland')
-  provides=(libxkbcommon.so libxkbregistry.so)
+  depends=(
+    libxml2
+    xkeyboard-config
+  )
+  optdepends=(
+    'libxkbcommon-x11: xkbcli interactive-x11'
+    'wayland: xkbcli interactive-wayland'
+  )
+  provides=(
+    libxkbcommon.so
+    libxkbregistry.so
+  )
 
   meson install -C build --destdir "$pkgdir"
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
 
-  _pick libxkbcommon-doc "$pkgdir"/usr/share/doc
+  _pick x11 "$pkgdir"/usr/lib/*x11*
+  _pick x11 "$pkgdir"/usr/lib/pkgconfig/*x11*
+  _pick x11 "$pkgdir"/usr/lib/xkbcommon/*x11*
+  _pick x11 "$pkgdir"/usr/include/xkbcommon/*x11*
+  _pick x11 "$pkgdir"/usr/share/man/man1/*x11*
 
-  _pick libxkbcommon-x11 "$pkgdir"/usr/lib/*x11*
-  _pick libxkbcommon-x11 "$pkgdir"/usr/lib/pkgconfig/*x11*
-  _pick libxkbcommon-x11 "$pkgdir"/usr/lib/xkbcommon/*x11*
-  _pick libxkbcommon-x11 "$pkgdir"/usr/include/xkbcommon/*x11*
-  _pick libxkbcommon-x11 "$pkgdir"/usr/share/man/man1/*x11*
+  _pick doc "$pkgdir"/usr/share/doc
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 libxkbcommon/LICENSE
 }
 
-package_libxkbcommon-doc() {
-  pkgdesc="API documentation for libxkbcommon"
+package_libxkbcommon-x11() {
+  pkgdesc='Keyboard handling library using XKB data for X11 XCB clients'
+  depends=(
+    libxcb
+    libxkbcommon
+    libxkbcommon.so
+  )
+  provides=(
+    libxkbcommon-x11.so
+  )
+
+  mv x11/* "$pkgdir"/
 
-  mv libxkbcommon-doc/* "$pkgdir"
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 libxkbcommon/LICENSE
 }
 
-package_libxkbcommon-x11() {
-  pkgdesc="Keyboard handling library using XKB data for X11 XCB clients"
-  depends=(libxkbcommon libxkbcommon.so libxcb)
-  provides=(libxkbcommon-x11.so)
+package_libxkbcommon-doc() {
+  pkgdesc='API documentation for libxkbcommon'
 
-  mv libxkbcommon-x11/* "$pkgdir"
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE
+  mv doc/* "$pkgdir"/
+
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 libxkbcommon/LICENSE
 }
+
+# vim:set sw=2 sts=-1 et: