depends: libxkbcommon: update to 1.6.0

diff --git a/contrib/depends/packages/libxkbcommon.mk b/contrib/depends/packages/libxkbcommon.mk
index e3361b1dcf2c0f73b715bbdb0825e68a6ef7bd15..b110d59504b453daad0d0c340adca3d1497e3790 100644 (file)
--- a/contrib/depends/packages/libxkbcommon.mk
+++ b/contrib/depends/packages/libxkbcommon.mk
@@ -1,8 +1,8 @@
 package=libxkbcommon
-$(package)_version=1.5.0
+$(package)_version=1.6.0
 $(package)_download_path=https://xkbcommon.org/download/
 $(package)_file_name=libxkbcommon-$($(package)_version).tar.xz
-$(package)_sha256_hash=560f11c4bbbca10f495f3ef7d3a6aa4ca62b4f8fb0b52e7d459d18a26e46e017
+$(package)_sha256_hash=0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b
 $(package)_dependencies=libxcb
 $(package)_patches=no-test-x11.patch toolchain.txt
 

diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index dd440c764732058f94ce0a4a99e732dff32df05a..d15567b2a259a8ed4422baefa9e78eb0197a337f 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -19,6 +19,7 @@ $(package)_patches += revert_f99ee441.patch
 $(package)_patches += xcb-util-image-fix.patch
 $(package)_patches += libxau-fix.patch
 $(package)_patches += toolchain.cmake
+$(package)_patches += xkb-1.6.0.patch
 #$(package)_patches += fix-static-fontconfig-static-linking.patch
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
@@ -187,6 +188,7 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/revert_f99ee441.patch && \
   patch -p1 -i $($(package)_patch_dir)/xcb-util-image-fix.patch && \
   patch -p1 -i $($(package)_patch_dir)/libxau-fix.patch && \
+  patch -p1 -i $($(package)_patch_dir)/xkb-1.6.0.patch && \
   cd ../qtmultimedia && \
   patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
   patch -p1 -i $($(package)_patch_dir)/v4l2.patch

diff --git a/contrib/depends/patches/libxkbcommon/no-test-x11.patch b/contrib/depends/patches/libxkbcommon/no-test-x11.patch
index 50b0fd483b567c1db6fc51afe05e0acaf868e802..e3792ffca0a4efdcba358a6e164224409fea8100 100644 (file)
--- a/contrib/depends/patches/libxkbcommon/no-test-x11.patch
+++ b/contrib/depends/patches/libxkbcommon/no-test-x11.patch
@@ -1,10 +1,10 @@
 diff --git a/meson.build b/meson.build
-index 245e7b1..a80d050 100644
+index eaef4fb..1e31558 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -666,16 +666,6 @@ test(
+@@ -748,18 +748,6 @@ test(
+         dependencies: test_dep),
      env: test_env,
-     suite: ['python-tests'],
  )
 -if get_option('enable-x11')
 -    test(
@@ -12,14 +12,16 @@ index 245e7b1..a80d050 100644
 -        executable('test-x11', 'test/x11.c', dependencies: x11_test_dep),
 -        env: test_env,
 -    )
--    # test/x11comp is meant to be run, but it is (temporarily?) disabled.
--    # See: https://github.com/xkbcommon/libxkbcommon/issues/30
--    executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
+-    test(
+-        'x11comp',
+-        executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep),
+-        env: test_env,
+-    )
 -endif
  if get_option('enable-xkbregistry')
      test(
          'registry',
-@@ -755,13 +745,6 @@ benchmark(
+@@ -844,13 +832,6 @@ benchmark(
      executable('bench-atom', 'bench/atom.c', dependencies: test_dep),
      env: bench_env,
  )

diff --git a/contrib/depends/patches/qt/xkb-1.6.0.patch b/contrib/depends/patches/qt/xkb-1.6.0.patch
new file mode 100644 (file)
index 0000000..e436315
--- /dev/null
+++ b/contrib/depends/patches/qt/xkb-1.6.0.patch
@@ -0,0 +1,44 @@
+From f3fbd07f7a180b58db8025c5165e42b7ea3390c2 Mon Sep 17 00:00:00 2001
+From: Liang Qi <liang.qi@qt.io>
+Date: Tue, 10 Oct 2023 14:08:48 +0200
+Subject: [PATCH] xkb: fix build with libxkbcommon 1.6.0 and later
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A few XKB_KEY_dead_* defines got removed from 1.6.0. See also
+https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14
+https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08
+
+Pick-to: 6.5 6.2 5.15
+Fixes: QTBUG-117950
+Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
+Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
+(cherry picked from commit 8af35d27e8f02bbb99aef4ac495ed406e50e3cca)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+ src/gui/platform/unix/qxkbcommon.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
+index 2fa2ae8911..394407e403 100644
+--- a/src/gui/platform/unix/qxkbcommon.cpp
++++ b/src/gui/platform/unix/qxkbcommon.cpp
+@@ -239,10 +239,14 @@ static constexpr const auto KeyTbl = qMakeArray(
+         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
+         Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
++/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
++   The define check is kind of version check here. */
++#ifdef XKB_KEY_dead_lowline
+         Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
+         Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
+         Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
+         Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
++#endif
+ 
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.
+-- 
+2.42.0
+