From 070488c636bef4019cf704d39a46f6342c7fe671 Mon Sep 17 00:00:00 2001
From: Florian Franzmann
Date: Wed, 6 Jul 2022 20:59:53 +0200
Subject: xorg-data/xkeyboard-config: version 2.36

---
 xorg-data/xkeyboard-config/BUILD     |  6 +++---
 xorg-data/xkeyboard-config/CONFIGURE |  1 +
 xorg-data/xkeyboard-config/DEPENDS   | 20 +++++++++-----------
 xorg-data/xkeyboard-config/DETAILS   |  5 +++--
 xorg-data/xkeyboard-config/HISTORY   |  3 +++
 5 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100755 xorg-data/xkeyboard-config/CONFIGURE

(limited to 'xorg-data')

diff --git a/xorg-data/xkeyboard-config/BUILD b/xorg-data/xkeyboard-config/BUILD
index d5deb61d8b..bdade9625f 100755
--- a/xorg-data/xkeyboard-config/BUILD
+++ b/xorg-data/xkeyboard-config/BUILD
@@ -1,5 +1,5 @@
-OPTS="$OPTS --enable-compat-rules" &&
-OPTS="$OPTS --with-xkb-base=$INSTALL_ROOT/usr/share/X11/xkb" &&
-OPTS="$OPTS --with-xkb-rules-symlink=xorg,xfree86" &&
+OPTS="$OPTS compat-rules=true"                        &&
+OPTS="$OPTS xkb-base=$INSTALL_ROOT/usr/share/X11/xkb" &&
+OPTS="$OPTS xorg-rules-symlinks=true"                 &&
 
 default_build
diff --git a/xorg-data/xkeyboard-config/CONFIGURE b/xorg-data/xkeyboard-config/CONFIGURE
new file mode 100755
index 0000000000..d1cc655820
--- /dev/null
+++ b/xorg-data/xkeyboard-config/CONFIGURE
@@ -0,0 +1 @@
+. "$GRIMOIRE"/MESON_CONFIGURE
diff --git a/xorg-data/xkeyboard-config/DEPENDS b/xorg-data/xkeyboard-config/DEPENDS
index c1f338737f..4f420b2383 100755
--- a/xorg-data/xkeyboard-config/DEPENDS
+++ b/xorg-data/xkeyboard-config/DEPENDS
@@ -1,14 +1,12 @@
-depends util-macros &&
-depends xkbcomp &&
+. "$GRIMOIRE"/MESON_DEPENDS &&
+
+depends util-macros      &&
+depends xkbcomp          &&
 depends xml-parser-expat &&
-depends glib2 &&
+depends glib2            &&
+depends GETTEXT          &&
 
 optional_depends libxslt \
-                 "--with-xsltproc" \
-                 "--without-xsltproc" \
-                 "for the transformation of XML documents" &&
-
-optional_depends GETTEXT \
-                 "--enable-nls" \
-                 "--disable-nls" \
-                 "to use Native Language Support"
+                 "" \
+                 "" \
+                 "to generate manpages"
diff --git a/xorg-data/xkeyboard-config/DETAILS b/xorg-data/xkeyboard-config/DETAILS
index a60da17495..d333fab602 100755
--- a/xorg-data/xkeyboard-config/DETAILS
+++ b/xorg-data/xkeyboard-config/DETAILS
@@ -1,6 +1,7 @@
+. "$GRIMOIRE"/MESON_FUNCTIONS
            SPELL=xkeyboard-config
-         VERSION=2.30
-          SOURCE=$SPELL-$VERSION.tar.bz2
+         VERSION=2.36
+          SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=https://www.x.org/releases/individual/data/$SPELL/$SOURCE
          SOURCE2=$SOURCE.sig
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY
index e485c1ccee..ad3a1c974a 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,3 +1,6 @@
+2022-07-06 Florian Franzmann <bwlf@bandrate.org>
+	* DETAILS, CONFIGURE, BUILD, DEPENDS: version 2.36
+
 2022-04-07 Treeve Jelbert <treeve@sourcemage.org>
 	* DEPENDS: delete intltool
 
-- 
cgit v1.2.3