main/libxkbcommon: upgrade to 1.10.0

main/libxkbcommon/APKBUILD

@@ -1,8 +1,8 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer: Peter Shkenev <santurysim@gmail.com>
 pkgname=libxkbcommon
-pkgver=1.8.1
-pkgrel=2
+pkgver=1.10.0
+pkgrel=0
 pkgdesc="keyboard handling library"
 url="https://xkbcommon.org/"
 arch="all"
@@ -91,6 +91,6 @@ bashcomp() {
 
 
 sha512sums="
-a11b8563b11bd085b909753fa99e5b2129343363a05d4fac44a46b334b644dbdd57c356021926e9fdcc2bf6855b90283af93e74c471c3d5677c2ed1bf19427c2  xkbcommon-1.8.1.tar.gz
-77e4c1e6e370dd26a6dfa7914a2df5a5e78ccd42752694ff473b44317db242367ec815e43c979ad952ff475228d5ce9e788b670bb513e63df4d55bc3691aa0a7  allow-skip-test.patch
+5ffc69ebdf5455ea2cb3d7061dd35fe13f0a741034d0e1a68376695a0ac77db0e9bd383135cb6a662e5edeea7df9dfcc98f5526d48a41e1b71b94998f1ecd684  xkbcommon-1.10.0.tar.gz
+60ef29e37d422cc0b85e158dfcbb6c92810c300b3f9999c232f1f510525d70a014a7c81e6dc0edf08ed8d90bf1eea8741013e15730fc7af7f2d8f7652eaca3d3  allow-skip-test.patch
 "

main/libxkbcommon/allow-skip-test.patch

@@ -1,11 +1,7 @@
-Partial revert of 0ed9390c07130c2d3ebaf2e1b67c6dc0011a8aee
-as we don't have xvfb, needed for the tests, packaged in main
-
-diff --git a/test/x11.c b/test/x11.c
-index c3cf2ee..4ff211e 100644
---- a/test/x11.c
-+++ b/test/x11.c
-@@ -45,7 +45,7 @@ X11_TEST(test_basic)
+diff -Nurp libxkbcommon-xkbcommon-1.10.0.orig/test/x11.c libxkbcommon-xkbcommon-1.10.0/test/x11.c
+--- libxkbcommon-xkbcommon-1.10.0.orig/test/x11.c	2025-05-21 21:19:09.000000000 +0300
++++ libxkbcommon-xkbcommon-1.10.0/test/x11.c	2025-06-27 23:54:30.718234061 +0300
+@@ -29,7 +29,7 @@ X11_TEST(test_basic)
      */
      conn = xcb_connect(display, NULL);
      if (!conn || xcb_connection_has_error(conn)) {
@@ -14,7 +10,7 @@ index c3cf2ee..4ff211e 100644
          goto err_conn;
      }
  
-@@ -55,7 +55,7 @@ X11_TEST(test_basic)
+@@ -39,7 +39,7 @@ X11_TEST(test_basic)
                                        XKB_X11_SETUP_XKB_EXTENSION_NO_FLAGS,
                                        NULL, NULL, NULL, NULL);
      if (!ret) {
@@ -23,11 +19,10 @@ index c3cf2ee..4ff211e 100644
          goto err_conn;
      }
  
-diff --git a/test/x11comp.c b/test/x11comp.c
-index 33dd7c2..dc70fd1 100644
---- a/test/x11comp.c
-+++ b/test/x11comp.c
-@@ -51,7 +51,7 @@ X11_TEST(test_basic)
+diff -Nurp libxkbcommon-xkbcommon-1.10.0.orig/test/x11comp.c libxkbcommon-xkbcommon-1.10.0/test/x11comp.c
+--- libxkbcommon-xkbcommon-1.10.0.orig/test/x11comp.c	2025-05-21 21:19:09.000000000 +0300
++++ libxkbcommon-xkbcommon-1.10.0/test/x11comp.c	2025-06-27 23:56:16.779791651 +0300
+@@ -44,7 +44,7 @@ X11_TEST(test_basic)
  
      conn = xcb_connect(display, NULL);
      if (xcb_connection_has_error(conn)) {
@@ -36,7 +31,7 @@ index 33dd7c2..dc70fd1 100644
          goto err_conn;
      }
      ret = xkb_x11_setup_xkb_extension(conn,
-@@ -60,7 +60,7 @@ X11_TEST(test_basic)
+@@ -53,7 +53,7 @@ X11_TEST(test_basic)
                                        XKB_X11_SETUP_XKB_EXTENSION_NO_FLAGS,
                                        NULL, NULL, NULL, NULL);
      if (!ret) {
@@ -45,10 +40,10 @@ index 33dd7c2..dc70fd1 100644
          goto err_xcb;
      }
      device_id = xkb_x11_get_core_keyboard_device_id(conn);
-@@ -72,12 +72,12 @@ X11_TEST(test_basic)
-     ret = posix_spawnp(&xkbcomp_pid, "xkbcomp", NULL, NULL, xkbcomp_argv, envp);
-     free(xkb_path);
-     if (ret != 0) {
+@@ -74,12 +74,12 @@ X11_TEST(test_basic)
+                     "Please install the corresponding package, "
+                     "e.g. \"xkbcomp\" or \"x11-xkb-utils\".\n");
+         }
 -        ret = TEST_SETUP_FAILURE;
 +        ret = SKIP_TEST;
          goto err_xcb;
@@ -60,25 +55,15 @@ index 33dd7c2..dc70fd1 100644
          goto err_xcb;
      }
  
-diff --git a/test/xvfb-wrapper.c b/test/xvfb-wrapper.c
-index ab0c645..144187a 100644
---- a/test/xvfb-wrapper.c
-+++ b/test/xvfb-wrapper.c
-@@ -77,7 +77,7 @@ xvfb_wrapper(int (*test_func)(char* display))
-                     "Xvfb may be missing. Please install the corresponding "
-                     "package, e.g. \"xvfb\" or \"xorg-x11-server-Xvfb\".\n");
+diff -Nurp libxkbcommon-xkbcommon-1.10.0.orig/test/xvfb-wrapper.c libxkbcommon-xkbcommon-1.10.0/test/xvfb-wrapper.c
+--- libxkbcommon-xkbcommon-1.10.0.orig/test/xvfb-wrapper.c	2025-05-21 21:19:09.000000000 +0300
++++ libxkbcommon-xkbcommon-1.10.0/test/xvfb-wrapper.c	2025-06-28 00:00:35.150392206 +0300
+@@ -81,7 +81,7 @@ xvfb_wrapper(int (*test_func)(char* disp
+                     "Please install the corresponding package, "
+                     "e.g. \"xvfb\" or \"xorg-x11-server-Xvfb\".\n");
          }
 -        ret = TEST_SETUP_FAILURE;
 +        ret = SKIP_TEST;
          goto err_xvfd;
      }
  
-@@ -118,7 +118,7 @@ xvfb_wrapper(int (*test_func)(char* display))
-     length = fread(&display[1], 1, sizeof(display) - 1, display_fd);
-     if (length <= 0) {
-         fprintf(stderr, "fread error: length=%zu\n", length);
--        ret = TEST_SETUP_FAILURE;
-+        ret = SKIP_TEST;
-         goto err_xvfd;
-     } else {
-         /* Drop the newline character */