summaryrefslogtreecommitdiff
path: root/kde-plasma/kwin
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/kwin')
-rw-r--r--kde-plasma/kwin/Manifest3
-rw-r--r--kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch41
-rw-r--r--kde-plasma/kwin/kwin-6.0.2-r1.ebuild (renamed from kde-plasma/kwin/kwin-6.0.2.ebuild)7
3 files changed, 49 insertions, 2 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 342d773cde38..3fb800de1817 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,6 +1,7 @@
AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86
+AUX kwin-6.0.2-qtgui-accessibility-optional.patch 1356 BLAKE2B ed6a4a0c98da013a71390314c92b078800242ca2aaa1391bb87046cb2ae6d270545d8fe3715afacf168989fd57a8b68c5e02b92085aec5bd083b4193fe9b32b7 SHA512 f53e97a0b1b77b0c074a3687ca67702ac5793edadd4091696e10947d0b8debe32b556570aa25a95c093e41c8b72c50195f074cd5a418163783a2bf4879cd9402
DIST kwin-5.27.11.tar.xz 7644856 BLAKE2B a21fa8d60418bf109b3f651f266185b1e97bdc92e7c7d7ab4b73271d91e8c2b629fd22851b3fff88d7ecd8277fdd8a70bf1c3bd93aa1e379377b86f56cfe2bd2 SHA512 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b
DIST kwin-6.0.2.tar.xz 8833720 BLAKE2B ee02fee90870e32dcc61a5cbc3bcd2f3e146e3a0aa8c63bcd459eaf8cb35bd48aabf88a4cd6efb6325b24128d5e35c6a67aca1077f3820a061bfcb5f4a5bc467 SHA512 f6f82afe2f007a14114fbf18e0aba6859328d928d14bf5369e9f879ec24baa50a9a1084db49877067eab17ab3dae13991d507c85458b4a588086ecfb4924a8a6
EBUILD kwin-5.27.11.ebuild 4244 BLAKE2B a7d67b4d73c0ea947430d50c8e40f3ff92db153bd2de367bec724784c4575c866734f651d23f738658da5647abd3d0d7f0fed30b37d31d8a819cad05a1a3b739 SHA512 a40d2fc6629a388aeca42f883372c9dd49a139a97cca5a598c2d9676c3be96ec240e5dc3d562e9d62e314db82fff01e3d2cdf8522f1821aac7364c628f3f0b13
-EBUILD kwin-6.0.2.ebuild 3842 BLAKE2B 73090ffaff7329fe26f1412fb45d119b951e7abcb1030f24c9fe958869fc2478b0142f69c53463558c16f935874e937b297ed0466e9e45b5e9e8a26061986c2f SHA512 ead4ab16f1c60fb80b17b988e02ce4306ef65400d982cfe92c8aca014b4055d52ffedc2e6da76f7a4454ea873274c6f97dfa76648cfcf5793527a6aca270c898
+EBUILD kwin-6.0.2-r1.ebuild 3992 BLAKE2B 44e23f2b40e634dd2ef9a6eb383a8efd90951646bdf32a654f94f58cbd22bb4550fe71426f884efef0db285fa56923fdcaac25e99845a6c870bb8438a479c19b SHA512 d17860aace5d60f452da5c47ba820477eeb410f11c5fae540ee299f8616d307b10308db34e5f884194b400ba2685e29a4ebbb1077a54a45c83cb76cf52eada55
MISC metadata.xml 705 BLAKE2B 996b365c3536e5bdaf8487b2f736a31625b84497af81c3b8fa8bf46a585004f426f8bdc22a3a430936e03694a1222dd0a89789df769ef650c0d8da25bf263cd7 SHA512 569c589a88ac23dc869a6487459bd46711dc2b92c1f1cf5d19879fb363b52b76faf7d8c5805f0a9d5a13a3ab4f9f316d732e6ae475d63a950d56ad65c2f05fa4
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.ebuild b/kde-plasma/kwin/kwin-6.0.2-r1.ebuild
index 3534c155b8c5..e3510abd0ff4 100644
--- a/kde-plasma/kwin/kwin-6.0.2.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.2-r1.ebuild
@@ -24,12 +24,13 @@ 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
>=kde-frameworks/kauth-${KFMIN}:6
>=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcolorscheme-${KFMIN}:6
>=kde-frameworks/kconfig-${KFMIN}:6[qml]
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcoreaddons-${KFMIN}:6
@@ -110,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