libxkbcommon: Update to 0.8.0

7 files changed, 24 insertions, 48 deletions

diff --git a/pkg/libxkbcommon/.gitignore b/pkg/libxkbcommon/.gitignore
index e23a9aca..0b92b10d 100644
--- a/pkg/libxkbcommon/.gitignore
+++ b/pkg/libxkbcommon/.gitignore
@@ -1,2 +1,2 @@
-/libxkbcommon-0.7.2.tar.xz
+/libxkbcommon-0.8.0.tar.xz
 /src
diff --git a/pkg/libxkbcommon/README.md b/pkg/libxkbcommon/README.md
new file mode 100644
index 00000000..27d94fd4
--- /dev/null
+++ b/pkg/libxkbcommon/README.md
@@ -0,0 +1,14 @@
+# libxkbcommon
+Upstream tar archives are used over git because the parser
+(src/xkbcomp/parser.y) uses various GNU extensions.
+
+## config.h
+Generated with
+
+	meson \
+		-Dxkb-config-root=/share/xkb \
+		-Dx-locale-root=/share/xlocale \
+		-Denable-x11=false \
+		-Denable-wayland=false \
+		-Denable-docs=false \
+		build
diff --git a/pkg/libxkbcommon/config.h b/pkg/libxkbcommon/config.h
index c0862eb6..703fd2a4 100644
--- a/pkg/libxkbcommon/config.h
+++ b/pkg/libxkbcommon/config.h
@@ -1,50 +1,13 @@
-#include <config-posix.h>
-
-#define DFLT_XKB_CONFIG_ROOT "/share/xkb"
-#define XLOCALEDIR "/share/xlocale"
-
 #define DEFAULT_XKB_LAYOUT "us"
 #define DEFAULT_XKB_MODEL "pc105"
-/* #undef DEFAULT_XKB_OPTIONS */
 #define DEFAULT_XKB_RULES "evdev"
-/* #undef DEFAULT_XKB_VARIANT */
+#define DFLT_XKB_CONFIG_ROOT "/share/xkb"
 #define HAVE_EACCESS 1
 #define HAVE_EUIDACCESS 1
-#define HAVE_MEMORY_H 1
-/* #undef HAVE_SECURE_GETENV */
+#define HAVE_MKOSTEMP 1
+#define HAVE_MMAP 1
+#define HAVE_POSIX_FALLOCATE 1
 #define HAVE___BUILTIN_EXPECT 1
 #define HAVE___BUILTIN_POPCOUNT 1
-/* #undef HAVE___SECURE_GETENV */
-#define LT_OBJDIR ".libs/"
-#define PACKAGE "libxkbcommon"
-#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=libxkbcommon"
-#define PACKAGE_NAME "libxkbcommon"
-#define PACKAGE_STRING "libxkbcommon 0.7.2"
-#define PACKAGE_TARNAME "libxkbcommon"
-#define PACKAGE_URL "http://xkbcommon.org"
-#define PACKAGE_VERSION "0.7.2"
-#define PACKAGE_VERSION_MAJOR 0
-#define PACKAGE_VERSION_MINOR 7
-#define PACKAGE_VERSION_PATCHLEVEL 1
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-#define VERSION "0.7.2"
-/* #undef _MINIX */
-/* #undef _POSIX_1_SOURCE */
-/* #undef _POSIX_SOURCE */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
+#define XLOCALEDIR "/share/xlocale"
+#define _GNU_SOURCE 1
diff --git a/pkg/libxkbcommon/gen.lua b/pkg/libxkbcommon/gen.lua
index d03665cc..23c5f924 100644
--- a/pkg/libxkbcommon/gen.lua
+++ b/pkg/libxkbcommon/gen.lua
@@ -1,6 +1,5 @@
 cflags{
 	'-include $dir/config.h',
-	'-I include',
 	'-I $srcdir',
 	'-I $srcdir/src',
 }
diff --git a/pkg/libxkbcommon/rev b/pkg/libxkbcommon/rev
index 7ed6ff82..1e8b3149 100644
--- a/pkg/libxkbcommon/rev
+++ b/pkg/libxkbcommon/rev
@@ -1 +1 @@
-5
+6
diff --git a/pkg/libxkbcommon/sha256 b/pkg/libxkbcommon/sha256
index f44c941f..3192f301 100644
--- a/pkg/libxkbcommon/sha256
+++ b/pkg/libxkbcommon/sha256
@@ -1 +1 @@
-28a4dc2735863bec2dba238de07fcdff28c5dd2300ae9dfdb47282206cd9b9d8  libxkbcommon-0.7.2.tar.xz
+e829265db04e0aebfb0591b6dc3377b64599558167846c3f5ee5c5e53641fe6d  libxkbcommon-0.8.0.tar.xz
diff --git a/pkg/libxkbcommon/url b/pkg/libxkbcommon/url
index 4f59aad1..1af8480d 100644
--- a/pkg/libxkbcommon/url
+++ b/pkg/libxkbcommon/url
@@ -1 +1 @@
-url = "http://xkbcommon.org/download/libxkbcommon-0.7.2.tar.xz"
+url = "http://xkbcommon.org/download/libxkbcommon-0.8.0.tar.xz"