From 9dd4404111850d7179e3ff9aacc47978fe41b11f Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 26 Mar 2024 09:19:34 +0100 Subject: [PATCH] depends: libxkbcommon: update to 1.7.0 --- contrib/depends/packages/libxkbcommon.mk | 4 ++-- contrib/depends/patches/libxkbcommon/no-test-x11.patch | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/depends/packages/libxkbcommon.mk b/contrib/depends/packages/libxkbcommon.mk index b110d59..b1cb3e8 100644 --- a/contrib/depends/packages/libxkbcommon.mk +++ b/contrib/depends/packages/libxkbcommon.mk @@ -1,8 +1,8 @@ package=libxkbcommon -$(package)_version=1.6.0 +$(package)_version=1.7.0 $(package)_download_path=https://xkbcommon.org/download/ $(package)_file_name=libxkbcommon-$($(package)_version).tar.xz -$(package)_sha256_hash=0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b +$(package)_sha256_hash=65782f0a10a4b455af9c6baab7040e2f537520caa2ec2092805cdfd36863b247 $(package)_dependencies=libxcb $(package)_patches=no-test-x11.patch toolchain.txt diff --git a/contrib/depends/patches/libxkbcommon/no-test-x11.patch b/contrib/depends/patches/libxkbcommon/no-test-x11.patch index e3792ff..780e747 100644 --- a/contrib/depends/patches/libxkbcommon/no-test-x11.patch +++ b/contrib/depends/patches/libxkbcommon/no-test-x11.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index eaef4fb..1e31558 100644 +index 2de4ee9..57c1038 100644 --- a/meson.build +++ b/meson.build -@@ -748,18 +748,6 @@ test( +@@ -768,20 +768,6 @@ test( dependencies: test_dep), env: test_env, ) @@ -11,17 +11,19 @@ index eaef4fb..1e31558 100644 - 'x11', - executable('test-x11', 'test/x11.c', dependencies: x11_test_dep), - env: test_env, +- is_parallel : false, - ) - test( - 'x11comp', - executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep), - env: test_env, +- is_parallel : false, - ) -endif if get_option('enable-xkbregistry') test( 'registry', -@@ -844,13 +832,6 @@ benchmark( +@@ -866,13 +852,6 @@ benchmark( executable('bench-atom', 'bench/atom.c', dependencies: test_dep), env: bench_env, )