depends: libxkbcommon: update to 1.10.0

diff --git a/contrib/depends/packages/libxkbcommon.mk b/contrib/depends/packages/libxkbcommon.mk
index 56eff50be23c655b3e1b75ba96ce8eb5149fff86..3be21d190fbda5056efdcfe668f4b5b77e84abef 100644 (file)
--- a/contrib/depends/packages/libxkbcommon.mk
+++ b/contrib/depends/packages/libxkbcommon.mk
@@ -1,8 +1,8 @@
 package=libxkbcommon
-$(package)_version=1.8.1
+$(package)_version=1.10.0
 $(package)_download_path=https://github.com/xkbcommon/libxkbcommon/archive/refs/tags
 $(package)_file_name=xkbcommon-$($(package)_version).tar.gz
-$(package)_sha256_hash=c65c668810db305c4454ba26a10b6d84a96b5469719fe3c729e1c6542b8d0d87
+$(package)_sha256_hash=0427585a4d6ca17c9fc1ac4b539bf303348e9080af70c5ea402503bc370a9631
 $(package)_dependencies=libxcb
 $(package)_patches=no-test-x11.patch toolchain.txt
 
@@ -28,4 +28,4 @@ endef
 
 define $(package)_stage_cmds
   DESTDIR=$($(package)_staging_dir) ninja -C build install
-endef
\ No newline at end of file
+endef

diff --git a/contrib/depends/patches/libxkbcommon/no-test-x11.patch b/contrib/depends/patches/libxkbcommon/no-test-x11.patch
index 8cbedfe4194dcf367fcdc73a893560135b2964dd..e23aca91c138aa398bb018405454db533a5b771b 100644 (file)
--- a/contrib/depends/patches/libxkbcommon/no-test-x11.patch
+++ b/contrib/depends/patches/libxkbcommon/no-test-x11.patch
@@ -1,16 +1,22 @@
 diff --git a/meson.build b/meson.build
-index 8714ce4e..35691155 100644
+index c044c099..c2ff2d3a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -893,24 +893,6 @@ test(
+@@ -917,30 +917,6 @@ test(
          dependencies: test_dep),
      env: test_env,
  )
 -if get_option('enable-x11')
 -    has_xvfb = find_program('Xvfb', required: false)
+-    has_xkbcomp = find_program('xkbcomp', required: false)
+-    # We only warn because the build machine may not be the same
+-    # as the host/test machine.
 -    if not has_xvfb.found()
 -        warning('Xvfb program not found, but is required to run X11 tests.')
 -    endif
+-    if not has_xkbcomp.found()
+-        warning('xkbcomp program not found, but is required to run X11 tests.')
+-    endif
 -    test(
 -        'x11',
 -        executable('test-x11', 'test/x11.c', dependencies: x11_xvfb_test_dep),
@@ -27,7 +33,7 @@ index 8714ce4e..35691155 100644
  if get_option('enable-xkbregistry')
      test(
          'registry',
-@@ -1035,13 +1017,6 @@ benchmark(
+@@ -1077,13 +1053,6 @@ benchmark(
      executable('bench-atom', 'bench/atom.c', dependencies: test_dep),
      env: bench_env,
  )