From 0bc04c37402d64e3e08ee0236ab79da102753c34 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Thu, 19 Aug 2021 11:34:48 +0200
Subject: [PATCH] libxkbcommon: enable xkbregistry

This is now needed by Waybar
---
 common/shlibs                 |  1 +
 srcpkgs/libxkbcommon/template | 17 ++++++++++++++---
 srcpkgs/libxkbregistry        |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/libxkbregistry

diff --git a/common/shlibs b/common/shlibs
index 63dea0e2ea0..39136a41cfe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1155,6 +1155,7 @@ libtomcrypt.so.1 libtomcrypt-1.18.0_1
 libHX.so.28 libHX-3.14_1
 libxkbcommon.so.0 libxkbcommon-0.2.0_1
 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
+libxkbregistry.so.0 libxkbregistry-1.3.0_3
 libgee-0.8.so.2 libgee08-0.8.2_1
 libnettle.so.8 nettle-3.6_1
 libhogweed.so.6 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 5cdadd1db7d..ed016aae5ee 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,13 +1,16 @@
 # Template file for 'libxkbcommon'
 pkgname=libxkbcommon
 version=1.3.0
-revision=2
+revision=3
 wrksrc="${pkgname}-${pkgname#lib}-${version}"
 build_style=meson
+# b_ndebug=false is needed to pass the test suite, as it relies on side effects
+# in the arguments of assert calls.
 configure_args="-Denable-x11=true -Denable-docs=false
- -Denable-wayland=true -Denable-xkbregistry=false"
+ -Denable-wayland=true -Denable-xkbregistry=true -Db_ndebug=false"
 hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols xorgproto"
+makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols
+ xorgproto libxml2-devel"
 depends="xkeyboard-config"
 short_desc="Library to handle keyboard descriptions"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
@@ -27,8 +30,16 @@ libxkbcommon-x11_package() {
 	}
 }
 
+libxkbregistry_package() {
+	short_desc="XKB API to query available rules, models, layouts, variants and options"
+	pkg_install() {
+		vmove "usr/lib/libxkbregistry.so.*"
+	}
+}
+
 libxkbcommon-devel_package() {
 	depends="${sourcepkg}-x11>=${version}_${revision}
+	 libxkbregistry>=${version}_${revision}
 	 ${sourcepkg}>=${version}_${revision} libxcb-devel"
 	short_desc+=" - development files"
 	pkg_install() {
diff --git a/srcpkgs/libxkbregistry b/srcpkgs/libxkbregistry
new file mode 120000
index 00000000000..51911d5197a
--- /dev/null
+++ b/srcpkgs/libxkbregistry
@@ -0,0 +1 @@
+libxkbcommon
\ No newline at end of file