From 6b7d733ea3827b0babeacd77f7dbefebfc56a86b Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Fri, 8 Jul 2022 22:48:20 +0200
Subject: [PATCH] Update to libxkbcommon-0.8.4.

---
 ports/libxkbcommon/libxkbcommon.patch | 40 ---------------------------
 ports/libxkbcommon/libxkbcommon.port  |  6 ++--
 2 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 ports/libxkbcommon/libxkbcommon.patch

diff --git a/ports/libxkbcommon/libxkbcommon.patch b/ports/libxkbcommon/libxkbcommon.patch
deleted file mode 100644
index fe50f5ca..00000000
--- a/ports/libxkbcommon/libxkbcommon.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Paur --no-dereference -- libxkbcommon.upstream/config.sub libxkbcommon/config.sub
---- libxkbcommon.upstream/config.sub
-+++ libxkbcommon/config.sub
-@@ -1356,7 +1356,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-diff -Paur --no-dereference -- libxkbcommon.upstream/src/xkbcomp/include.c libxkbcommon/src/xkbcomp/include.c
---- libxkbcommon.upstream/src/xkbcomp/include.c
-+++ libxkbcommon/src/xkbcomp/include.c
-@@ -54,6 +54,10 @@
- #include "xkbcomp-priv.h"
- #include "include.h"
- 
-+#if defined(__sortix__) && !defined(PATH_MAX)
-+#define PATH_MAX 32678
-+#endif
-+
- /**
-  * Parse an include statement. Each call returns a file name, along with
-  * (possibly) a specific map in the file, an explicit group designator, and
-diff -Paur --no-dereference -- libxkbcommon.upstream/test/common.c libxkbcommon/test/common.c
---- libxkbcommon.upstream/test/common.c
-+++ libxkbcommon/test/common.c
-@@ -38,6 +38,10 @@
- 
- #include "test.h"
- 
-+#if defined(__sortix__) && !defined(PATH_MAX)
-+#define PATH_MAX 32678
-+#endif
-+
- /*
-  * Test a sequence of keysyms, resulting from a sequence of key presses,
-  * against the keysyms they're supposed to generate.
diff --git a/ports/libxkbcommon/libxkbcommon.port b/ports/libxkbcommon/libxkbcommon.port
index 76ea8886..311ae427 100644
--- a/ports/libxkbcommon/libxkbcommon.port
+++ b/ports/libxkbcommon/libxkbcommon.port
@@ -1,12 +1,14 @@
 NAME=libxkbcommon
 BUILD_LIBRARIES=
-VERSION=0.3.1
+VERSION=0.8.4 # Update blocked by meson adoption
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=9c973581bba0c883a301fa6474d9c3e4f3a06c34e4ae4f1f4e113692cb18b38e
+SHA256SUM=60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b
 UPSTREAM_SITE=https://xkbcommon.org/download
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE='MIT AND X11 AND HPND'
 BUILD_SYSTEM=configure
+CONFIGURE_ARGS=--disable-x11
 MAKE_VARS='V=1'
 POST_INSTALL=tix-eradicate-libtool-la