Attachment 245528 Details for Bug 274373 – v1 (apply via "git am")

[patch] v1 (apply via "git am")

bug274373.diff (text/plain), 4.44 KB, created by Jan Beich on 2023-10-09 12:44:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2023-10-09 12:44:47 UTC

Size: 4.44 KB

patch

obsolete

>From 5355ba145eefc794ba9f63fbf8d1bfd4945145a5 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 8 Oct 2023 22:46:48 +0200
>Subject: [PATCH] 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
>---
> .../patch-src_gui_platform_unix_qxkbcommon.cpp      | 13 +++++++++++++
> ...c_platformsupport_input_xkbcommon_qxkbcommon.cpp | 13 +++++++++++++
> x11/libxkbcommon/Makefile                           |  2 +-
> x11/libxkbcommon/distinfo                           |  6 +++---
> x11/libxkbcommon/pkg-plist                          |  1 +
> 5 files changed, 31 insertions(+), 4 deletions(-)
> create mode 100644 devel/qt6-base/files/patch-src_gui_platform_unix_qxkbcommon.cpp
> create mode 100644 x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_xkbcommon_qxkbcommon.cpp
>
>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
>new file mode 100644
>index 000000000000..c437e8d69127
>--- /dev/null
>+++ 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
>new file mode 100644
>index 000000000000..7b6fa29aaaa0
>--- /dev/null
>+++ 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
>index 48f9f9dcd443..d3ce4abd1f06 100644
>--- 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
>index 38ea44e8393c..6bb837d1f481 100644
>--- 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
>index e004f90d0247..49e58fa81021 100644
>--- 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

Actions: View | Diff

Attachments on bug 274373: 245528