diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2024-03-13 22:00:01 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-03-13 22:16:29 +0100 |
| commit | 02995e8e16cd8f164acc4ac86afcfd3675df85a4 (patch) | |
| tree | 34c3e0c6eb59b9f807e2f5d6375c46e100c3710b | |
| parent | kde-plasma/kwin: Add missing dependency (not declared in cmake) (diff) | |
| download | gentoo-02995e8e16cd8f164acc4ac86afcfd3675df85a4.tar.gz gentoo-02995e8e16cd8f164acc4ac86afcfd3675df85a4.tar.bz2 gentoo-02995e8e16cd8f164acc4ac86afcfd3675df85a4.zip | |
kde-plasma/kwin: Add dev-qt/qtbase:6[accessibility=] USEdep
Upstream commit ade5d72c3a7e2078025ecbb3c9a354c20a8d9c90
Backporting to 6.0.
Closes: https://bugs.gentoo.org/926935
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch | 41 | ||||
| -rw-r--r-- | kde-plasma/kwin/kwin-6.0.2-r1.ebuild | 6 |
2 files changed, 46 insertions, 1 deletions
diff --git a/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch b/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch new file mode 100644 index 000000000000..3bf872a6e30f --- /dev/null +++ b/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch @@ -0,0 +1,41 @@ +From ade5d72c3a7e2078025ecbb3c9a354c20a8d9c90 Mon Sep 17 00:00:00 2001 +From: Aleix Pol Gonzalez <aleixpol@kde.org> +Date: Wed, 21 Feb 2024 12:25:09 +0000 +Subject: [PATCH] qpa: Don't build SPI support if Qt wasn't build with it + +Signed-off-by: Falko Becker <falko.becker@mbition.io> +--- + src/plugins/qpa/integration.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/qpa/integration.cpp b/src/plugins/qpa/integration.cpp +index 9a9195d8173..238a2e60628 100644 +--- a/src/plugins/qpa/integration.cpp ++++ b/src/plugins/qpa/integration.cpp +@@ -33,9 +33,12 @@ + #include <QtGui/private/qgenericunixeventdispatcher_p.h> + #include <QtGui/private/qgenericunixfontdatabase_p.h> + #include <QtGui/private/qgenericunixthemes_p.h> +-#include <QtGui/private/qspiaccessiblebridge_p.h> + #include <QtGui/private/qunixeventdispatcher_qpa_p.h> + ++#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) ++#include <QtGui/private/qspiaccessiblebridge_p.h> ++#endif ++ + namespace KWin + { + +@@ -160,7 +163,9 @@ QPlatformOpenGLContext *Integration::createPlatformOpenGLContext(QOpenGLContext + QPlatformAccessibility *Integration::accessibility() const + { + if (!m_accessibility) { ++#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) + m_accessibility.reset(new QSpiAccessibleBridge()); ++#endif + } + return m_accessibility.get(); + } +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-6.0.2-r1.ebuild b/kde-plasma/kwin/kwin-6.0.2-r1.ebuild index 41629d06895d..e3510abd0ff4 100644 --- a/kde-plasma/kwin/kwin-6.0.2-r1.ebuild +++ b/kde-plasma/kwin/kwin-6.0.2-r1.ebuild @@ -24,7 +24,7 @@ COMMON_DEPEND=" >=dev-libs/libinput-1.19:= >=dev-libs/wayland-1.22.0 >=dev-qt/qt5compat-${QTMIN}:6[qml] - >=dev-qt/qtbase-${QTMIN}:6=[dbus,gles2-only=,gui,libinput,opengl,widgets] + >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,dbus,gles2-only=,gui,libinput,opengl,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtsensors-${QTMIN}:6 >=dev-qt/qtshadertools-${QTMIN}:6 @@ -111,6 +111,10 @@ BDEPEND=" " PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" +PATCHES=( + "${FILESDIR}/${PN}-6.0.2-qtgui-accessibility-optional.patch" # bug 926935, 6.1 +) + src_prepare() { ecm_src_prepare |