diff options
| author | Mikko Gronoff <[email protected]> | 2025-06-11 16:38:40 +0300 |
|---|---|---|
| committer | Mikko Gronoff <[email protected]> | 2025-06-12 14:42:39 +0300 |
| commit | 4da2a68590de2434d3b67f9c90ac4e9fdc4a0f1d (patch) | |
| tree | 1e8ae634fd6afcb2b9d92605a3262b157083233a | |
| parent | 7e6aae6cd9a8a5e715ff9484c6c704bb65563d50 (diff) | |
Keep the Weston patch in qtwayland module for Qt 6.9 branch,
but for Qt 6.10 branch onwards switch it under qtbase as the
qtwayland code the patch touches was move there.
Change-Id: Id9c7059ae097956387ba7cae1136c56ef15e88e3
Reviewed-by: Samuli Piippo <[email protected]>
| -rw-r--r-- | recipes-qt/qt6/qtbase/0002-Workaround-to-add-support-for-weston.patch | 28 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtbase_%.bbappend | 1 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtwayland_%.bbappend | 2 |
3 files changed, 30 insertions, 1 deletions
diff --git a/recipes-qt/qt6/qtbase/0002-Workaround-to-add-support-for-weston.patch b/recipes-qt/qt6/qtbase/0002-Workaround-to-add-support-for-weston.patch new file mode 100644 index 0000000..9c565ba --- /dev/null +++ b/recipes-qt/qt6/qtbase/0002-Workaround-to-add-support-for-weston.patch @@ -0,0 +1,28 @@ +From 1e3d38039146ba707a7a60a96016c164eccd70b0 Mon Sep 17 00:00:00 2001 +From: Ari Parkkila <[email protected]> +Date: Thu, 20 Mar 2025 08:21:48 +0200 +Subject: [PATCH] Workaround to add support for weston + +Qt wayland is incompatible with weston's wayland so disable +problematic functionality temporarily. + +Upstream-Status: Inappropriate [https://bugreports.qt.io/browse/QTBUG-134955] +Task-number: QTBUG-127698 +--- + .../plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp +index 1356d93abab..c2d73f59b93 100644 +--- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp ++++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp +@@ -470,7 +470,8 @@ void QWaylandXdgSurface::setSizeHints() + maxHeight = 0; + + m_toplevel->set_min_size(minWidth, minHeight); +- m_toplevel->set_max_size(maxWidth, maxHeight); ++ // outcomment because of wayland protocol error: [email protected] ++ //m_toplevel->set_max_size(maxWidth, maxHeight); + } + } + diff --git a/recipes-qt/qt6/qtbase_%.bbappend b/recipes-qt/qt6/qtbase_%.bbappend index d704f7c..3ea4895 100644 --- a/recipes-qt/qt6/qtbase_%.bbappend +++ b/recipes-qt/qt6/qtbase_%.bbappend @@ -2,4 +2,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://0001-Fix-casting-of-egl.h-types.patch \ + ${@'file://0002-Workaround-to-add-support-for-weston.patch' if bb.utils.vercmp_string_op(d.getVar('QT_VERSION'), '6.10', '>=') else ''} \ " diff --git a/recipes-qt/qt6/qtwayland_%.bbappend b/recipes-qt/qt6/qtwayland_%.bbappend index 44ffd12..58edbfd 100644 --- a/recipes-qt/qt6/qtwayland_%.bbappend +++ b/recipes-qt/qt6/qtwayland_%.bbappend @@ -1,5 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "\ - file://0001-Workaround-to-add-support-for-weston.patch \ + ${@'file://0001-Workaround-to-add-support-for-weston.patch' if bb.utils.vercmp_string_op(d.getVar('QT_VERSION'), '6.10', '<') else ''} \ " |