Re: [meta-arago][master][PATCH] qtbase: Patch to support xkbcommon 1.6.0

* Re: [meta-arago][master][PATCH] qtbase: Patch to support xkbcommon 1.6.0
       [not found] <179DF9DADB1B9582.18076@lists.yoctoproject.org>
@ 2023-12-06 16:13 ` Ryan Eatmon
  0 siblings, 0 replies; 2+ messages in thread
From: Ryan Eatmon @ 2023-12-06 16:13 UTC (permalink / raw)
  To: Praneeth Bajjuri, Denys Dmytriyenko, meta-arago

This patch has now been accepted on master, so reverting this patch.

On 12/5/2023 9:42 AM, Ryan Eatmon via lists.yoctoproject.org wrote:
> xkbcommon 1.6.0 (and newer) remove 4 defintions that qtbase seems to use.
> Backport an upstream patch to look to see if they are defined and
> ignore them if they're not.
> 
> This is a temporary patch to fix our master builds while we wait for the
> meta-q5 patch [1] to make it to the master branch.  This will be
> reverted once that patch is promoted.
> 
> [1] https://github.com/meta-qt5/meta-qt5/pull/545
> 
> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> ---
>   .../recipes-qt/qt5/qtbase-native_%.bbappend   |  7 +++
>   ...ld-with-libxkbcommon-1.6.0-and-later.patch | 55 +++++++++++++++++++
>   .../recipes-qt/qt5/qtbase_%.bbappend          |  1 +
>   3 files changed, 63 insertions(+)
>   create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase-native_%.bbappend
>   create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch
> 
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase-native_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase-native_%.bbappend
> new file mode 100644
> index 00000000..e49941db
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase-native_%.bbappend
> @@ -0,0 +1,7 @@
> +
> +FILESEXTRAPATHS:prepend := "${THISDIR}/qtbase:"
> +
> +SRC_URI += "\
> +    file://0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch \
> +"
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch
> new file mode 100644
> index 00000000..ab6e92cc
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch
> @@ -0,0 +1,55 @@
> +From 8946e4874d0e071b182ba5ac438fb4d52d2a44d0 Mon Sep 17 00:00:00 2001
> +From: Mark Hatle <mark.hatle@amd.com>
> +Date: Fri, 1 Dec 2023 08:17:51 -0700
> +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
> +
> +Disable the 4 XKB_KEY_dead functions to support libxkbcommon 1.6.0.  See:
> +
> +https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70
> +
> +The above URL points to a commit in qt which was used as a basis for the fix.
> +
> +Upstream-Status: Backport
> +[https://github.com/qt/qtbase/commit/8af35d27e8f02bbb99aef4ac495ed406e50e3cca]
> +
> +  xkb: fix build with libxkbcommon 1.6.0 and later
> +
> +  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.6 6.5 6.2 5.15
> +  Fixes: QTBUG-117950
> +  Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
> +  Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
> +
> +Signed-off-by: Mark Hatle <mark.hatle@amd.com>
> +---
> + src/platformsupport/input/xkbcommon/qxkbcommon.cpp | 4 ++++
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
> +index b713c19447..ecf02de6db 100644
> +--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
> ++++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
> +@@ -273,10 +273,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.34.1
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
> index 8ae8110b..3d875683 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend
> @@ -21,6 +21,7 @@ SRC_URI += "\
>       file://0001-deform-Fix-how-controls-are-shown.patch \
>       file://0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch \
>       file://0001-eglfs-Force-888-format-only-on-env-flag.patch \
> +    file://0027-xkb-fix-build-with-libxkbcommon-1.6.0-and-later.patch \
>   "
>   
>   python do_patch:append() {

-- 
Ryan Eatmon                reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS

^ permalink raw reply	[flat|nested] 2+ messages in thread