x11/libxkbcommon: update to 1.6.0

Changes: https://lists.freedesktop.org/archives/wayland-devel/2023-October/043121.html PR: 274373 Exp-run by: antoine Approved by: manu
freebsd · Oct 17, 2023 · 6154950 · 6154950
1 parent f45b7f2
commit 6154950
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 4 deletions.
diff --git a/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp b/devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp
@@ -0,0 +1,13 @@
+--- src/gui/platform/unix/qxkbcommon.cpp.orig	2023-09-21 19:24:26 UTC
++++ src/gui/platform/unix/qxkbcommon.cpp
+@@ -239,10 +239,6 @@ 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>,
+-        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>,
+
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp b/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp
@@ -0,0 +1,13 @@
+--- src/platformsupport/input/xkbcommon/qxkbcommon.cpp.orig	2023-09-06 08:28:54 UTC
++++ src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+@@ -274,10 +274,6 @@ 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>,
+-        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>,
+
+         // Special keys from X.org - This include multimedia keys,
+         // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libxkbcommon
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
 

diff --git a/x11/libxkbcommon/distinfo b/x11/libxkbcommon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672687410
-SHA256 (libxkbcommon-1.5.0.tar.xz) = 560f11c4bbbca10f495f3ef7d3a6aa4ca62b4f8fb0b52e7d459d18a26e46e017
-SIZE (libxkbcommon-1.5.0.tar.xz) = 472700
+TIMESTAMP = 1696798008
+SHA256 (libxkbcommon-1.6.0.tar.xz) = 0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b
+SIZE (libxkbcommon-1.6.0.tar.xz) = 510456
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
@@ -31,3 +31,4 @@ man/man1/xkbcli-how-to-type.1.gz
 %%X11%%man/man1/xkbcli-interactive-x11.1.gz
 man/man1/xkbcli-list.1.gz
 man/man1/xkbcli.1.gz
+share/bash-completion/completions/xkbcli