9 files changed, 20 insertions, 12 deletions
diff --git a/xorg-data/xbitmaps/DETAILS b/xorg-data/xbitmaps/DETAILS
index ddf5f593de..14bfa36ae3 100755
--- a/xorg-data/xbitmaps/DETAILS
+++ b/xorg-data/xbitmaps/DETAILS
@@ -1,7 +1,7 @@
            SPELL=xbitmaps
              PKG=xbitmaps
-         VERSION=1.1.2
-          SOURCE=${PKG}-${VERSION}.tar.bz2
+         VERSION=1.1.3
+          SOURCE=${PKG}-${VERSION}.tar.xz
    SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/data/${SOURCE}
          SOURCE2=$SOURCE.sig
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/xorg-data/xbitmaps/HISTORY b/xorg-data/xbitmaps/HISTORY
index a61d4052c4..eb87a84321 100644
--- a/xorg-data/xbitmaps/HISTORY
+++ b/xorg-data/xbitmaps/HISTORY
@@ -1,3 +1,6 @@
+2023-02-24 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 1.1.3
+
 2018-03-10 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 1.1.2
 	* DETAILS: add gpg checking
diff --git a/xorg-data/xcursor-themes/DETAILS b/xorg-data/xcursor-themes/DETAILS
index 25ac799050..45dd003bf7 100755
--- a/xorg-data/xcursor-themes/DETAILS
+++ b/xorg-data/xcursor-themes/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xcursor-themes
-         VERSION=1.0.6
-          SOURCE=$SPELL-$VERSION.tar.bz2
+         VERSION=1.0.7
+          SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/data/$SOURCE
          SOURCE2=$SOURCE.sig
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/xorg-data/xcursor-themes/HISTORY b/xorg-data/xcursor-themes/HISTORY
index 9fc23f2e9c..75ced0e481 100644
--- a/xorg-data/xcursor-themes/HISTORY
+++ b/xorg-data/xcursor-themes/HISTORY
@@ -1,3 +1,6 @@
+2023-02-26 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 1.0.7
+
 2019-02-17 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 1.0.6
 	* DETAILS: add gpg checking
diff --git a/xorg-data/xkeyboard-config/DEPENDS b/xorg-data/xkeyboard-config/DEPENDS
index 4f420b2383..ff97dd899d 100755
--- a/xorg-data/xkeyboard-config/DEPENDS
+++ b/xorg-data/xkeyboard-config/DEPENDS
@@ -1,7 +1,6 @@
 . "$GRIMOIRE"/MESON_DEPENDS &&
 
 depends util-macros      &&
-depends xkbcomp          &&
 depends xml-parser-expat &&
 depends glib2            &&
 depends GETTEXT          &&
@@ -9,4 +8,6 @@ depends GETTEXT          &&
 optional_depends libxslt \
                  "" \
                  "" \
-                 "to generate manpages"
+                 "to generate manpages" &&
+
+suggest_depends xkbcomp "" "" "for compiling keyboard descriptions"
diff --git a/xorg-data/xkeyboard-config/DETAILS b/xorg-data/xkeyboard-config/DETAILS
index d333fab602..5168c609d1 100755
--- a/xorg-data/xkeyboard-config/DETAILS
+++ b/xorg-data/xkeyboard-config/DETAILS
@@ -1,6 +1,6 @@
 . "$GRIMOIRE"/MESON_FUNCTIONS
            SPELL=xkeyboard-config
-         VERSION=2.36
+         VERSION=2.38
           SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=https://www.x.org/releases/individual/data/$SPELL/$SOURCE
          SOURCE2=$SOURCE.sig
diff --git a/xorg-data/xkeyboard-config/FINAL b/xorg-data/xkeyboard-config/FINAL
new file mode 100755
index 0000000000..e381689be3
--- /dev/null
+++ b/xorg-data/xkeyboard-config/FINAL
@@ -0,0 +1 @@
+install -m 755 -d "${INSTALL_ROOT}/var/lib/xkb"
diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY
index ad3a1c974a..203db620f2 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,3 +1,8 @@
+2023-02-22 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 2.38
+	* DEPENDS: xkbcomp is suggested dependency now
+	* INSTALL, FINAL: moved all significant code to FINAL
+
 2022-07-06 Florian Franzmann <bwlf@bandrate.org>
 	* DETAILS, CONFIGURE, BUILD, DEPENDS: version 2.36
 
diff --git a/xorg-data/xkeyboard-config/INSTALL b/xorg-data/xkeyboard-config/INSTALL
deleted file mode 100755
index 675e74a818..0000000000
--- a/xorg-data/xkeyboard-config/INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-make_single &&
-default_install &&
-make_normal &&
-
-install -vm 755 -d "$INSTALL_ROOT/var/lib/xkb"