[arch-commits] Commit in lib32-libxkbcommon/trunk (PKGBUILD)

[Jan Steffens]

    Date: Saturday, September 11, 2021 @ 23:08:35
  Author: heftig
Revision: 1014374

1.3.1-1

Modified:
  lib32-libxkbcommon/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-11 22:31:26 UTC (rev 1014373)
+++ PKGBUILD	2021-09-11 23:08:35 UTC (rev 1014374)
@@ -8,8 +8,9 @@
   lib32-libxkbcommon
   lib32-libxkbcommon-x11
 )
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
+pkgdesc='Keymap handling library for toolkits and window systems (32-bit)'
 url=https://xkbcommon.org/
 arch=(x86_64)
 license=(custom)
@@ -16,6 +17,7 @@
 makedepends=(
   git
   lib32-libxcb
+  lib32-libxml2
   lib32-wayland
   meson
   wayland-protocols
@@ -25,7 +27,7 @@
   xorg-server-xvfb
   libgl
 )
-_tag=13ba9135c013fbcbba50c3056ac73e4905d4bdf9
+_tag=e97297b5ce1201a3992f2de5fb1118d73eb904e4
 source=(git+https://github.com/xkbcommon/libxkbcommon#tag=${_tag})
 sha256sums=('SKIP')
 
@@ -35,48 +37,52 @@
   git describe --tags | sed 's/^xkbcommon-//'
 }
 
-prepare() {
-  mkdir -p build x11/usr/lib32/pkgconfig
-}
-
 build() {
   export CC='gcc -m32'
-  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+  export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
 
   arch-meson libxkbcommon build \
     --libdir=/usr/lib32 \
     -D enable-docs=false
-  ninja -C build
+  meson compile -C build
 }
 
 check() {
-  xvfb-run -a meson test -C build --print-errorlogs
+  xvfb-run -s '-nolisten local' meson test -C build --print-errorlogs
 }
 
 package_lib32-libxkbcommon() {
-  pkgdesc='Keymap handling library for toolkits and window systems'
   depends=(
-    lib32-glibc
+    lib32-libxml2
     libxkbcommon
   )
+  provides=(
+    libxkbcommon.so
+    libxkbregistry.so
+  )
 
-  DESTDIR="${pkgdir}" meson install -C build
+  meson install -C build --destdir "${pkgdir}"
   rm -rf "${pkgdir}"/usr/{bin,include,lib,share}
 
   install -dm 755 "${pkgdir}"/usr/share/licenses
   ln -s libxkbcommon "${pkgdir}"/usr/share/licenses/lib32-libxkbcommon
 
+  mkdir -p x11/usr/lib32/pkgconfig
   mv "${pkgdir}"/usr/lib32/*x11* x11/usr/lib32
   mv "${pkgdir}"/usr/lib32/pkgconfig/*x11* x11/usr/lib32/pkgconfig
 }
 
 package_lib32-libxkbcommon-x11() {
-  pkgdesc='Keyboard handling library using XKB data for X11 XCB clients'
+  pkgdesc='Keyboard handling library using XKB data for X11 XCB clients (32-bit)'
   depends=(
+    lib32-libxkbcommon
+    libxkbcommon.so
     lib32-libxcb
-    lib32-libxkbcommon
     libxkbcommon-x11
   )
+  provides=(
+    libxkbcommon-x11.so
+  )
 
   mv x11/* "${pkgdir}"/
   find "${pkgdir}" -type d -exec chmod 755 {} +