summaryrefslogtreecommitdiff
path: root/kde-plasma/kwin
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/kwin')
-rw-r--r--kde-plasma/kwin/Manifest13
-rw-r--r--kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch25
-rw-r--r--kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch41
-rw-r--r--kde-plasma/kwin/files/kwin-6.1.4-screenedge-dnd.patch34
-rw-r--r--kde-plasma/kwin/kwin-5.27.11.ebuild142
-rw-r--r--kde-plasma/kwin/kwin-6.1.4-r1.ebuild145
-rw-r--r--kde-plasma/kwin/kwin-6.1.5.ebuild (renamed from kde-plasma/kwin/kwin-6.0.4.1.ebuild)41
-rw-r--r--kde-plasma/kwin/metadata.xml2
8 files changed, 209 insertions, 234 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 7ac2e936cadf..e908630b5e27 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,6 @@
-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.4.1.tar.xz 8831252 BLAKE2B 2acac2ef7b515c4c7ddb4478c7d8e48d9723d722370377b879354c270a1a4a3715214087230abca52b0b2670bf42cc423026d07a7b343e448a66ba81e200c01d SHA512 a38605dea13a225220544b77f835bff5bb191861ad34dd5ea6de06069921bc6db1f2683cb361d421ab3f7a82c58d2ff914512074a17e8e554bac3e5303f19ab5
-EBUILD kwin-5.27.11.ebuild 4244 BLAKE2B a7d67b4d73c0ea947430d50c8e40f3ff92db153bd2de367bec724784c4575c866734f651d23f738658da5647abd3d0d7f0fed30b37d31d8a819cad05a1a3b739 SHA512 a40d2fc6629a388aeca42f883372c9dd49a139a97cca5a598c2d9676c3be96ec240e5dc3d562e9d62e314db82fff01e3d2cdf8522f1821aac7364c628f3f0b13
-EBUILD kwin-6.0.4.1.ebuild 3988 BLAKE2B eb7a93a810cb77186635de4ff3694fbb26dc4df73859520088584be035eefeb9afd0d487c0f7720a63d43802d148d36ea1710d5a7b09fb8c1cee873fca0052d3 SHA512 3272f49a74ab0bae75f6b699870c905362bf8eb7d7fe5a75933af7d63ea24417ef8ee7ce64c54f1d03f6be302295bbbd6df8cdfcf8615db28850e5bfbbd12388
-MISC metadata.xml 705 BLAKE2B 996b365c3536e5bdaf8487b2f736a31625b84497af81c3b8fa8bf46a585004f426f8bdc22a3a430936e03694a1222dd0a89789df769ef650c0d8da25bf263cd7 SHA512 569c589a88ac23dc869a6487459bd46711dc2b92c1f1cf5d19879fb363b52b76faf7d8c5805f0a9d5a13a3ab4f9f316d732e6ae475d63a950d56ad65c2f05fa4
+AUX kwin-6.1.4-screenedge-dnd.patch 1347 BLAKE2B f54f43135efa888f9f7d42e440fdad98674f5eedc2513f96cebbdd5648f88ebe19dd5b388c6e3e9eeb11a9186268c83622c4ce7386bf541fa1da8d3c10363745 SHA512 c117a3550c7813f62e4dfb7f6a5bb2230e9b916e46db15907236c010d64335848d4439eaa360ed8729a418beac4034d6d4903b01e0e56f3d0469d2edcba3ecc3
+DIST kwin-6.1.4.tar.xz 8499248 BLAKE2B f455ee5da1ab735237581b41c3a423e3768443270e294ee1bd974f3f59bc72adf9d67939a27761dff51c2781df5f278b2fcf40f3b768e4bffaa1712934932894 SHA512 f7d512e633ec153f19b2f76f781d67a6c5f9b97df81205cf6e3cca227185b2764ffa612f0d1c0a528a37964dfcf3c6ac060c062ae8d653997057555cfd477090
+DIST kwin-6.1.5.tar.xz 8503432 BLAKE2B 8cd8da89f93ac64dbb8a42e90a09a188b86762440964d4e9425a924f0349360bcf31f187fcfb66b61fca42db44f93c97f313703c5b602e873035bec86f36b0b1 SHA512 a71d1f814c948293d5552504115178f20e7450ead86c57b0fda79584f613fbc77851d1735945f7f05bf0b6b8c09cdacf53154820176d133f41ec736ae1492946
+EBUILD kwin-6.1.4-r1.ebuild 4281 BLAKE2B 9a048866f1c35ca2a06382dd134ae8d0440a128bead66bb9f840aecf46cc582110889ad82a0d6e1eb25c6acf84d1aa846701269e1e74261023f020054aec8762 SHA512 6d4c8ed104ba29367020a6b06201fb8ee5719f224368c6a5b992da5dd50f959e34e1c4b0b81b6682c4c2e2411b9df7b513dc2f441850bf037d8c109b513db906
+EBUILD kwin-6.1.5.ebuild 4140 BLAKE2B c584a1db6c3f94f4ed52aa28f632e51e0cd51679f3c948cc305481d2d0aecaad73c8772a6d7f1c309afb64fff772412aa33318ef60b1c8d1506dc345c78d5676 SHA512 cfabdb37724a800ae099b95dfa7c69cd0111d3a4be2691e104f56ac72559373fceded84014a6fddebd9b35b0e7a28b27edce0c6a1ae0bd8296b23150298475bd
+MISC metadata.xml 677 BLAKE2B 050345f8f8f489b3cb81e112c05fddedc738c8f136d409b8754c54494a02caf5671a66dd1ecd7cfb91f24ab11210c67f78c09c928a4daf16b3512600649551c5 SHA512 5134373a0ce30f351344c07df4a68f97a15bf3bdb061ba8ff3355a42da2281d64bb506cdcb5b1dad698fc2061b4a4a92e054e08c521acb327b84f968a7d936dc
diff --git a/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch
deleted file mode 100644
index 268d88a09cdb..000000000000
--- a/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e15641e466b4802f73b34ea2e510df7f78c50afd Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 6 Aug 2019 22:36:44 +0200
-Subject: [PATCH] Disable the effect video button if gstreamer is missing
-
----
- src/kcms/effects/package/contents/ui/Effect.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kcms/effects/package/contents/ui/Effect.qml b/src/kcms/effects/package/contents/ui/Effect.qml
-index f8a36c03e..ce673728e 100644
---- a/src/kcms/effects/package/contents/ui/Effect.qml
-+++ b/src/kcms/effects/package/contents/ui/Effect.qml
-@@ -116,7 +116,7 @@ Kirigami.SwipeListItem {
- }
- actions: [
- Kirigami.Action {
-- visible: model.VideoRole.toString() !== ""
-+ visible: false
- icon.name: "videoclip-amarok"
- tooltip: i18nc("@info:tooltip", "Show/Hide Video")
- onTriggered: videoItem.showHide()
---
-2.39.0
-
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
deleted file mode 100644
index 3bf872a6e30f..000000000000
--- a/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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/files/kwin-6.1.4-screenedge-dnd.patch b/kde-plasma/kwin/files/kwin-6.1.4-screenedge-dnd.patch
new file mode 100644
index 000000000000..864835bee661
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.1.4-screenedge-dnd.patch
@@ -0,0 +1,34 @@
+From d85dd623d7315f2e620c2c37e635f2fd3737a684 Mon Sep 17 00:00:00 2001
+From: Yifan Zhu <fanzhuyifan@gmail.com>
+Date: Wed, 7 Aug 2024 16:54:44 +0000
+Subject: [PATCH] screenedge: allow activating clients in drag and drop
+
+In particular, this allows dragging onto autohide and dogde-window
+panels.
+
+BUG: 450579
+
+
+(cherry picked from commit 7752db3a882b5432d7d5c0b118acf42eeb3a8aee)
+
+Co-authored-by: Yifan Zhu <fanzhuyifan@gmail.com>
+---
+ src/screenedge.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/screenedge.cpp b/src/screenedge.cpp
+index de9f55dcb69..b1b2a29f9e3 100644
+--- a/src/screenedge.cpp
++++ b/src/screenedge.cpp
+@@ -244,7 +244,7 @@ bool Edge::activatesForPointer() const
+ // Most actions do not handle drag and drop properly yet
+ // but at least allow "show desktop" and "application launcher".
+ if (waylandServer() && waylandServer()->seat()->isDragPointer()) {
+- if (!m_edges->isDesktopSwitching() && m_action != ElectricActionShowDesktop && m_action != ElectricActionApplicationLauncher) {
++ if (!m_edges->isDesktopSwitching() && m_action != ElectricActionNone && m_action != ElectricActionShowDesktop && m_action != ElectricActionApplicationLauncher) {
+ return false;
+ }
+ // Don't activate edge when a mouse button is pressed, except when
+--
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.27.11.ebuild b/kde-plasma/kwin/kwin-5.27.11.ebuild
deleted file mode 100644
index b0e84b231dc1..000000000000
--- a/kde-plasma/kwin/kwin-5.27.11.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.106.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.9
-inherit ecm flag-o-matic plasma.kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="accessibility caps gles2-only lock multimedia plasma screencast"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=dev-libs/libinput-1.19:=
- >=dev-libs/wayland-1.21.0
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[accessibility,egl,gles2-only=,libinput]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5[qml]
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5=[X(+)]
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kidletime-${KFMIN}:5=
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-plasma/breeze-${PVCUT}:5
- >=kde-plasma/kdecoration-${PVCUT}:5
- >=kde-plasma/kwayland-${KFMIN}:5
- >=kde-plasma/libplasma-${KFMIN}:5
- >=kde-plasma/plasma-activities-${KFMIN}:5
- media-libs/fontconfig
- media-libs/freetype
- media-libs/lcms:2
- media-libs/libepoxy
- media-libs/libglvnd
- >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
- virtual/libudev:=
- x11-libs/libX11
- x11-libs/libXi
- >=x11-libs/libdrm-2.4.112
- >=x11-libs/libxcb-1.10:=
- >=x11-libs/libxcvt-0.1.1
- >=x11-libs/libxkbcommon-1.5.0
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- accessibility? ( media-libs/libqaccessibilityclient:5 )
- gles2-only? ( media-libs/mesa[gles2] )
- lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 )
- plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
- screencast? ( >=media-video/pipewire-0.3:= )
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-plasma/kwayland-server
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
- sys-apps/hwdata
- x11-base/xwayland
- multimedia? (
- >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml]
- media-plugins/gst-plugins-soup:1.0
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.9
- >=dev-libs/wayland-protocols-1.31
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtwayland-${QTMIN}:5
- x11-base/xorg-proto
- x11-libs/xcb-util-image
- caps? ( sys-libs/libcap )
-"
-BDEPEND="
- >=dev-qt/qtwaylandscanner-${QTMIN}:5
- dev-util/wayland-scanner
- >=kde-frameworks/kcmutils-${KFMIN}:5
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
-
-src_prepare() {
- ecm_src_prepare
- use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch"
-
- # TODO: try to get a build switch upstreamed
- if ! use screencast; then
- sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- # ODR violation (bug #921558)
- filter-lto
-
- local mycmakeargs=(
- # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
- $(cmake_use_find_package accessibility QAccessibilityClient)
- $(cmake_use_find_package caps Libcap)
- -DKWIN_BUILD_SCREENLOCKER=$(usex lock)
- $(cmake_use_find_package plasma KF5Runner)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- optfeature "color management support" x11-misc/colord
- elog
- elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
- elog "windows to the end of the list was changed so that it remains in the"
- elog "original order. To revert to the well established behavior:"
- elog
- elog " - Edit ~/.config/kwinrc"
- elog " - Find [TabBox] section"
- elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
diff --git a/kde-plasma/kwin/kwin-6.1.4-r1.ebuild b/kde-plasma/kwin/kwin-6.1.4-r1.ebuild
new file mode 100644
index 000000000000..0589874ef8e6
--- /dev/null
+++ b/kde-plasma/kwin/kwin-6.1.4-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.5.0 # bug 933271
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+IUSE="accessibility +caps gles2-only lock screencast +shortcuts systemd"
+
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in tabbox
+COMMON_DEPEND="
+ dev-libs/libei
+ >=dev-libs/libinput-1.19:=
+ >=dev-libs/wayland-1.22.0
+ >=dev-qt/qt5compat-${QTMIN}:6[qml]
+ >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,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
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kdeclarative-${KFMIN}:6
+ >=kde-frameworks/kglobalaccel-${KFMIN}:6=[X(+)]
+ >=kde-frameworks/kguiaddons-${KFMIN}:6[wayland]
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kidletime-${KFMIN}:6=[wayland]
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/kpackage-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/ksvg-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland,X]
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-plasma/breeze-${PVCUT}:6
+ >=kde-plasma/kdecoration-${PVCUT}:6
+ >=kde-plasma/kwayland-${PVCUT}:6
+ >=kde-plasma/plasma-activities-${PVCUT}:6
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/lcms:2
+ media-libs/libdisplay-info:=
+ media-libs/libepoxy
+ media-libs/libglvnd
+ >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
+ virtual/libudev:=
+ x11-libs/libX11
+ x11-libs/libXi
+ >=x11-libs/libdrm-2.4.116
+ >=x11-libs/libxcb-1.10:=
+ >=x11-libs/libxcvt-0.1.1
+ >=x11-libs/libxkbcommon-1.5.0
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-wm
+ accessibility? ( media-libs/libqaccessibilityclient:6 )
+ gles2-only? ( || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[gles2]
+ ) )
+ lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 )
+ screencast? ( >=media-video/pipewire-0.3:= )
+ shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-plasma/kdeplasma-addons:5
+ !kde-plasma/kwayland-server
+ >=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+ || (
+ dev-qt/qtmultimedia:6[ffmpeg]
+ (
+ dev-qt/qtmultimedia:6[gstreamer]
+ media-plugins/gst-plugins-soup:1.0
+ )
+ )
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-plasma/libplasma-${PVCUT}:6[wayland(+)]
+ sys-apps/hwdata
+ x11-base/xwayland[libei]
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.13.0
+ >=dev-libs/wayland-protocols-1.34
+ >=dev-qt/qttools-${QTMIN}:6[widgets]
+ >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+ >=dev-qt/qtwayland-${QTMIN}:6
+ x11-base/xorg-proto
+ x11-libs/xcb-util-image
+ caps? ( sys-libs/libcap )
+ test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) )
+"
+BDEPEND="
+ >=dev-qt/qtwayland-${QTMIN}:6
+ dev-util/wayland-scanner
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+"
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
+
+PATCHES=( "${FILESDIR}/${P}-screenedge-dnd.patch" ) # KDE-bug 450579, in 6.1.5
+
+src_prepare() {
+ ecm_src_prepare
+
+ # TODO: try to get a build switch upstreamed
+ if ! use screencast; then
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if ! use systemd; then
+ sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ # TODO: KWIN_BUILD_X11?
+ # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
+ $(cmake_use_find_package accessibility QAccessibilityClient6)
+ $(cmake_use_find_package caps Libcap)
+ -DKWIN_BUILD_SCREENLOCKER=$(usex lock)
+ -DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-plasma/kwin/kwin-6.0.4.1.ebuild b/kde-plasma/kwin/kwin-6.1.5.ebuild
index 4d79d1d27392..3de7c372757e 100644
--- a/kde-plasma/kwin/kwin-6.0.4.1.ebuild
+++ b/kde-plasma/kwin/kwin-6.1.5.ebuild
@@ -5,26 +5,27 @@ EAPI=8
ECM_HANDBOOK="optional"
ECM_TEST="true"
-KFMIN=6.0
+KFMIN=6.5.0
PVCUT=$(ver_cut 1-3)
-QTMIN=6.6.2
+QTMIN=6.7.2
inherit ecm plasma.kde.org
DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
LICENSE="GPL-2+"
SLOT="6"
-KEYWORDS="~amd64"
-IUSE="accessibility caps gles2-only lock screencast +shortcuts"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
+IUSE="accessibility +caps gles2-only lock screencast +shortcuts systemd"
RESTRICT="test"
-# qtbase slot up: GuiPrivate use in tabbox
+# qtbase slot op: GuiPrivate use in tabbox
COMMON_DEPEND="
+ dev-libs/libei
>=dev-libs/libinput-1.19:=
>=dev-libs/wayland-1.22.0
>=dev-qt/qt5compat-${QTMIN}:6[qml]
- >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,dbus,gles2-only=,gui,libinput,opengl,widgets]
+ >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets]
>=dev-qt/qtdeclarative-${QTMIN}:6
>=dev-qt/qtsensors-${QTMIN}:6
>=dev-qt/qtshadertools-${QTMIN}:6
@@ -56,14 +57,14 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/lcms:2
- media-libs/libdisplay-info
+ media-libs/libdisplay-info:=
media-libs/libepoxy
media-libs/libglvnd
>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
virtual/libudev:=
x11-libs/libX11
x11-libs/libXi
- >=x11-libs/libdrm-2.4.112
+ >=x11-libs/libdrm-2.4.116
>=x11-libs/libxcb-1.10:=
>=x11-libs/libxcvt-0.1.1
>=x11-libs/libxkbcommon-1.5.0
@@ -71,7 +72,10 @@ COMMON_DEPEND="
x11-libs/xcb-util-keysyms
x11-libs/xcb-util-wm
accessibility? ( media-libs/libqaccessibilityclient:6 )
- gles2-only? ( media-libs/mesa[gles2] )
+ gles2-only? ( || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[gles2]
+ ) )
lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 )
screencast? ( >=media-video/pipewire-0.3:= )
shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}:6 )
@@ -89,13 +93,13 @@ RDEPEND="${COMMON_DEPEND}
)
>=kde-frameworks/kirigami-${KFMIN}:6
>=kde-frameworks/kitemmodels-${KFMIN}:6
- >=kde-plasma/libplasma-${PVCUT}:6[wayland]
+ >=kde-plasma/libplasma-${PVCUT}:6[wayland(+)]
sys-apps/hwdata
- x11-base/xwayland
+ x11-base/xwayland[libei]
"
DEPEND="${COMMON_DEPEND}
- >=dev-libs/plasma-wayland-protocols-1.11.1
- >=dev-libs/wayland-protocols-1.32
+ >=dev-libs/plasma-wayland-protocols-1.13.0
+ >=dev-libs/wayland-protocols-1.34
>=dev-qt/qttools-${QTMIN}:6[widgets]
>=dev-qt/qtbase-${QTMIN}:6[concurrent]
>=dev-qt/qtwayland-${QTMIN}:6
@@ -109,11 +113,6 @@ BDEPEND="
dev-util/wayland-scanner
>=kde-frameworks/kcmutils-${KFMIN}:6
"
-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
@@ -122,10 +121,16 @@ src_prepare() {
if ! use screencast; then
sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
fi
+
+ # TODO: try to get a build switch upstreamed
+ if ! use systemd; then
+ sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt || die
+ fi
}
src_configure() {
local mycmakeargs=(
+ # TODO: KWIN_BUILD_X11?
# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
$(cmake_use_find_package accessibility QAccessibilityClient6)
$(cmake_use_find_package caps Libcap)
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 4903bdce5a1e..70350ed8c743 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -7,10 +7,10 @@
</maintainer>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="kde-invent">plasma/kwin</remote-id>
</upstream>
<use>
<flag name="lock">Enable screen locking via <pkg>kde-plasma/kscreenlocker</pkg></flag>
- <flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
<flag name="shortcuts">Enable global shortcuts support via <pkg>kde-plasma/kglobalacceld</pkg></flag>
</use>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-15 23:31:45 +0000