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

[Maxime Gauduin]

    Date: Monday, February 24, 2020 @ 10:53:59
  Author: alucryd
Revision: 580337

upgpkg: lib32-libxkbcommon 0.10.0-1

Modified:
  lib32-libxkbcommon/trunk/PKGBUILD

----------+
 PKGBUILD |   53 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-24 09:50:15 UTC (rev 580336)
+++ PKGBUILD	2020-02-24 10:53:59 UTC (rev 580337)
@@ -4,18 +4,36 @@
 # Contributor: Mladen Pejakovic <pejakm at gmail.com>
 
 pkgbase=lib32-libxkbcommon
-pkgname=('lib32-libxkbcommon' 'lib32-libxkbcommon-x11')
-pkgver=0.9.1
+pkgname=(
+  lib32-libxkbcommon
+  lib32-libxkbcommon-x11
+)
+pkgver=0.10.0
 pkgrel=1
-url='https://xkbcommon.org/'
-arch=('x86_64')
-license=('custom')
-makedepends=('git' 'lib32-libxcb' 'lib32-wayland' 'meson' 'wayland-protocols'
-             'xorg-util-macros')
-checkdepends=('xorg-server-xvfb' 'libgl')
-source=("git+https://github.com/xkbcommon/libxkbcommon#tag=xkbcommon-${pkgver}")
+url=https://xkbcommon.org/
+arch=(x86_64)
+license=(custom)
+makedepends=(
+  git
+  lib32-libxcb
+  lib32-wayland
+  meson
+  wayland-protocols
+  xorg-util-macros
+)
+checkdepends=(
+  xorg-server-xvfb
+  libgl
+)
+source=(git+https://github.com/xkbcommon/libxkbcommon#tag=e3c3420a7146f4ea6225d6fb417baa05a79c8202)
 sha256sums=('SKIP')
 
+pkgver() {
+  cd libxkbcommon
+
+  git describe --tags | sed 's/^xkbcommon-//'
+}
+
 prepare() {
   mkdir -p build x11/usr/lib32/pkgconfig
 }
@@ -22,11 +40,11 @@
 
 build() {
   export CC='gcc -m32'
-  export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
+  export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
 
   arch-meson libxkbcommon build \
-    --libdir='/usr/lib32' \
-    -D enable-docs='false'
+    --libdir=/usr/lib32 \
+    -D enable-docs=false
   ninja -C build
 }
 
@@ -36,7 +54,10 @@
 
 package_lib32-libxkbcommon() {
   pkgdesc='Keymap handling library for toolkits and window systems'
-  depends=('lib32-glibc' 'libxkbcommon')
+  depends=(
+    lib32-glibc
+    libxkbcommon
+  )
 
   DESTDIR="${pkgdir}" meson install -C build
   rm -rf "${pkgdir}"/usr/include
@@ -50,7 +71,11 @@
 
 package_lib32-libxkbcommon-x11() {
   pkgdesc='Keyboard handling library using XKB data for X11 XCB clients'
-  depends=('lib32-libxcb' 'lib32-libxkbcommon' 'libxkbcommon-x11')
+  depends=(
+    lib32-libxcb
+    lib32-libxkbcommon
+    libxkbcommon-x11
+  )
 
   mv x11/* "${pkgdir}"/
   find "${pkgdir}" -type d -exec chmod 755 {} +