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

[Maxime Gauduin]

    Date: Sunday, August 26, 2018 @ 14:27:27
  Author: alucryd
Revision: 374313

upgpkg: lib32-libxkbcommon 0.8.2-1

Modified:
  lib32-libxkbcommon/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-26 14:25:47 UTC (rev 374312)
+++ PKGBUILD	2018-08-26 14:27:27 UTC (rev 374313)
@@ -6,15 +6,15 @@
 
 pkgbase=lib32-libxkbcommon
 pkgname=('lib32-libxkbcommon' 'lib32-libxkbcommon-x11')
-pkgver=0.8.0
+pkgver=0.8.2
 pkgrel=1
 arch=('x86_64')
 url='https://xkbcommon.org/'
 license=('custom')
-makedepends=('gcc-multilib' 'lib32-libxcb' 'lib32-wayland' 'meson'
-             'wayland-protocols' 'xorg-util-macros')
-source=("https://xkbcommon.org/download/libxkbcommon-${pkgver}.tar.xz")
-sha256sums=('e829265db04e0aebfb0591b6dc3377b64599558167846c3f5ee5c5e53641fe6d')
+makedepends=('git' 'lib32-libxcb' 'lib32-wayland' 'meson' 'wayland-protocols'
+             'xorg-util-macros')
+source=("git+https://github.com/xkbcommon/libxkbcommon.git#tag=xkbcommon-${pkgver}")
+sha256sums=('SKIP')
 
 prepare() {
   mkdir -p build x11/usr/lib32/pkgconfig
@@ -21,16 +21,13 @@
 }
 
 build() {
-  cd build
-
   export CC='gcc -m32'
-  export CXX='g++ -m32'
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  arch-meson ../libxkbcommon-${pkgver} \
+  arch-meson libxkbcommon build \
     --libdir='/usr/lib32' \
     -Denable-docs='false'
-  ninja
+  ninja -C build
 }
 
 package_lib32-libxkbcommon() {
@@ -37,16 +34,14 @@
   pkgdesc='Keymap handling library for toolkits and window systems'
   depends=('lib32-glibc' 'libxkbcommon')
 
-  cd build
-
-  DESTDIR="${pkgdir}" ninja install
+  DESTDIR="${pkgdir}" ninja -C build install
   rm -rf "${pkgdir}"/usr/include
 
   install -dm 755 "${pkgdir}"/usr/share/licenses
   ln -s libxkbcommon "${pkgdir}"/usr/share/licenses/lib32-libxkbcommon
 
-  mv "${pkgdir}"/usr/lib32/*x11* ../x11/usr/lib32
-  mv "${pkgdir}"/usr/lib32/pkgconfig/*x11* ../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() {