commit: 9944092282d97c4444e607231200089a5b232f19
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 10:22:47 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 10:56:44 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=99440922
kde-plasma/kwin: Update dependencies, cmake args, add IUSE shortcuts
Drop IUSE plasma
Upstream commits:
192a57e2e1af3e75fa9a227749c74d1eabdf530f
d0b87a900f79fb03a81b3ec578e44ee1b3e0e24f
8a0a91fea155be3944c9a4152be60bf3d6603873
d2b0ed0c5a1e1663ff8b1e15187c0015af9f79e1
569e0f8f6474e30fae3a2c5edb82d4424f0f2178
49a76ea772039c57189fbdf9988658d4de5579ca
6cd56d51928f47a355dc019234ce5dbb4ec2a75c
54b3c2c6b673442d2632e8e5b243e08afee82fb4
028dd552cfb9d826b40b9620d869c98d2aa3dca3
ae84480fbfdc684b8ee4b0207d3ce679f6fb4cd7
22dfc8978e112ee78f18e6a61240871df5cc2328
7bd9ae8d0bcb3f3da96345b266ae41a70e9a130a
b853de3d299f880ab3b7c924773a4a1a28110fc3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/kwin/kwin-9999.ebuild | 23 +++++++++++++++--------
kde-plasma/kwin/metadata.xml | 1 +
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 97f18c92f9..320720b619 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -15,15 +15,19 @@ DESCRIPTION="Flexible, composited Window Manager for
windowing systems on Linux"
LICENSE="GPL-2+"
SLOT="6"
KEYWORDS=""
-IUSE="accessibility caps gles2-only lock multimedia plasma screencast"
+IUSE="accessibility caps gles2-only lock multimedia screencast +shortcuts"
RESTRICT="test"
+# qtbase slot up: GuiPrivate use in tabbox
COMMON_DEPEND="
>=dev-libs/libinput-1.19:=
- >=dev-libs/wayland-1.21.0
-
>=dev-qt/qtbase-${QTMIN}:6[accessibility,dbus,gles2-only=,gui,libinput,opengl,widgets]
+ >=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/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/kconfig-${KFMIN}:6[qml]
@@ -33,19 +37,20 @@ COMMON_DEPEND="
>=kde-frameworks/kdbusaddons-${KFMIN}:6
>=kde-frameworks/kdeclarative-${KFMIN}:6
>=kde-frameworks/kglobalaccel-${KFMIN}:6=[X(+)]
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kidletime-${KFMIN}:6=
>=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=[X]
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-plasma/breeze-${PVCUT}:6
>=kde-plasma/kdecoration-${PVCUT}:6
>=kde-plasma/kwayland-${PVCUT}:6
- >=kde-plasma/libplasma-${PVCUT}:6
>=kde-plasma/plasma-activities-${PVCUT}:6
media-libs/fontconfig
media-libs/freetype
@@ -67,27 +72,29 @@ COMMON_DEPEND="
accessibility? ( media-libs/libqaccessibilityclient:6 )
gles2-only? ( media-libs/mesa[gles2] )
lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 )
- plasma? ( >=kde-frameworks/krunner-${KFMIN}: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
>=kde-frameworks/kirigami-${KFMIN}:6
>=kde-frameworks/kitemmodels-${KFMIN}:6[qml]
+ >=kde-plasma/libplasma-${PVCUT}:6
sys-apps/hwdata
x11-base/xwayland
multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:6[gstreamer,qml] )
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/plasma-wayland-protocols-1.11.1
- >=dev-libs/wayland-protocols-1.31
+ >=dev-libs/wayland-protocols-1.32
>=dev-qt/qttools-${QTMIN}:6[designer]
>=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
@@ -109,10 +116,10 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still
hard-depends on it
- $(cmake_use_find_package accessibility QAccessibilityClient)
+ $(cmake_use_find_package accessibility QAccessibilityClient6)
$(cmake_use_find_package caps Libcap)
-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
- $(cmake_use_find_package plasma KF6Runner)
+ -DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
)
ecm_src_configure
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index d71da9e2cb..4903bdce5a 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -12,5 +12,6 @@
<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>
</pkgmetadata>
