From b69ad95ede4c5b36aa01a8db34745e72476616a5 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Sun, 5 Aug 2018 16:26:06 -0300
Subject: [PATCH] libxkbcommon: update to 0.8.2.

---
 .../libxkbcommon/patches/remove-fuzzing.patch | 19 ++++++++++++++
 srcpkgs/libxkbcommon/template                 | 25 ++++++++++---------
 2 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/libxkbcommon/patches/remove-fuzzing.patch

diff --git a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
new file mode 100644
index 00000000000..eddc5ce2b5b
--- /dev/null
+++ b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
@@ -0,0 +1,19 @@
+Source: maxice8
+Upstream: no
+Reason: removes creation of fuzzing infrastructure which isn't included in the distfiles
+
+--- meson.build
++++ meson.build
+@@ -382,12 +382,6 @@ if get_option('enable-x11')
+     executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
+ endif
+ 
+-
+-# Fuzzing target programs.
+-executable('fuzz-keymap', 'fuzz/keymap/target.c', dependencies: test_dep)
+-executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
+-
+-
+ # Demo programs.
+ executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep)
+ executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep)
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 0ce499804c0..013a58fb02c 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,21 +1,23 @@
 # Template file for 'libxkbcommon'.
 pkgname=libxkbcommon
-version=0.8.1
+version=0.8.2
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake pkg-config libtool flex xorg-util-macros"
-makedepends="xkeyboard-config libxcb-devel"
+build_style=meson
+configure_args="-Denable-wayland=true -Denable-docs=false -Denable-x11=true"
+hostmakedepends="pkg-config bison wayland-protocols"
+makedepends="xkeyboard-config libxcb-devel wayland-devel"
 depends="xkeyboard-config"
 short_desc="Library to handle keyboard descriptions"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
+maintainer="maxice8 <thinkabit.ukim@gmail.com>"
 license="MIT"
 homepage="https://xkbcommon.org/"
 distfiles="https://xkbcommon.org/download/${pkgname}-${version}.tar.xz"
-checksum=8d1df6bdf216950da611e66cff1af576710aad79772de3be6e131019f761f897
+checksum=7ab8c4b3403d89d01898066b72cb6069bddeb5af94905a65368f671a026ed58c
 
-pre_configure() {
-	autoreconf -fi
-}
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" wayland-devel"
+	makedepends+=" wayland-protocols"
+fi
 
 pkg_install() {
 	vlicense LICENSE
@@ -24,7 +26,7 @@ pkg_install() {
 libxkbcommon-x11_package() {
 	short_desc+=" - X11 support"
 	pkg_install() {
-		vmove usr/lib/*x11*.so.*
+		vmove "usr/lib/*x11*.so.*"
 	}
 }
 
@@ -34,7 +36,6 @@ libxkbcommon-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }