From d0b6ac1364067ebe37887fbe6f0ab59982a57d56 Mon Sep 17 00:00:00 2001
From: tobtoht <tob@featherwallet.org>
Date: Thu, 13 Feb 2025 12:00:22 +0100
Subject: [PATCH] depends: libxkbcommon: update to 1.8.0

---
 contrib/depends/packages/libxkbcommon.mk               |  8 ++++----
 contrib/depends/patches/libxkbcommon/no-test-x11.patch | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/contrib/depends/packages/libxkbcommon.mk b/contrib/depends/packages/libxkbcommon.mk
index e3674516..d99575cf 100644
--- a/contrib/depends/packages/libxkbcommon.mk
+++ b/contrib/depends/packages/libxkbcommon.mk
@@ -1,8 +1,8 @@
 package=libxkbcommon
-$(package)_version=1.7.0
-$(package)_download_path=https://xkbcommon.org/download/
-$(package)_file_name=libxkbcommon-$($(package)_version).tar.xz
-$(package)_sha256_hash=65782f0a10a4b455af9c6baab7040e2f537520caa2ec2092805cdfd36863b247
+$(package)_version=1.8.0
+$(package)_download_path=https://github.com/xkbcommon/libxkbcommon/archive/refs/tags
+$(package)_file_name=xkbcommon-$($(package)_version).tar.gz
+$(package)_sha256_hash=025c53032776ed850fbfb92683a703048cd70256df4ac1a1ec41ed3455d5d39c
 $(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 780e7478..9b40f228 100644
--- a/contrib/depends/patches/libxkbcommon/no-test-x11.patch
+++ b/contrib/depends/patches/libxkbcommon/no-test-x11.patch
@@ -1,12 +1,16 @@
 diff --git a/meson.build b/meson.build
-index 2de4ee9..57c1038 100644
+index b0b49e78..3b035493 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -768,20 +768,6 @@ test(
+@@ -881,24 +881,6 @@ test(
          dependencies: test_dep),
      env: test_env,
  )
 -if get_option('enable-x11')
+-    has_xvfb = find_program('Xvfb', required: false)
+-    if not has_xvfb.found()
+-        warning('Xvfb program not found, but is required to run X11 tests.')
+-    endif
 -    test(
 -        'x11',
 -        executable('test-x11', 'test/x11.c', dependencies: x11_test_dep),
@@ -23,7 +27,7 @@ index 2de4ee9..57c1038 100644
  if get_option('enable-xkbregistry')
      test(
          'registry',
-@@ -866,13 +852,6 @@ benchmark(
+@@ -1023,13 +1005,6 @@ benchmark(
      executable('bench-atom', 'bench/atom.c', dependencies: test_dep),
      env: bench_env,
  )
-- 
2.52.0