Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-plasma/plasma-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/plasma-desktop')
-rw-r--r--kde-plasma/plasma-desktop/Manifest7
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch126
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch53
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch35
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch85
-rw-r--r--kde-plasma/plasma-desktop/metadata.xml2
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.23.4-r1.ebuild190
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.27.11.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild)78
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild179
9 files changed, 304 insertions, 451 deletions
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index a873ef5fb62e..d12ab0a8da32 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,4 @@
-DIST plasma-desktop-5.23.4.tar.xz 15796556 BLAKE2B 876d308272bfd395ba3006cf70aa3bd3fc4fead5000cddf49c6be0bdfc95bb171c4dcac23636341766318d0156c7d473b9a8f5f0e37a57ea4e73b4b224b85abc SHA512 afbf8d3f7ca755ec207cda5258329b4f77dc0b26cd735eeb67e266d0937e892dc63172822792ffc7053cd52b9a34253cd4dcd1d1f52b54dd8a80f4dfa31a9f08
-DIST plasma-desktop-5.23.5.tar.xz 15794548 BLAKE2B 6e215cc5ef10598308a9fbe6c58ea67ea16ee3c3394c69bebcd1167b939e8ff1442bc839c87428cc5a57b274cc95d02983a67ab0e8fac6c27435e446f84c8630 SHA512 14cd20b24e265ef9cc4e4ebbfc743151cf5f9ba0a94fbc19e44571c7e68db61d68bab17dd1feea6f4e0844ab448110010fbfe85212b426c1e12232b73bd1c531
-DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
+DIST plasma-desktop-5.27.11.tar.xz 14729900 BLAKE2B 3c023febf5c6dc72fdd3ca3696d5c5c84c5c099e8d66497e9fccde601a23ec19fc001d6b48f9b1160946ab46e0436e54dc20a91c56dafae455e8455fa558bfc4 SHA512 644bfe2235dcfc591ae66fc7090ca1e67fc8dfe80033c1b0bedc32cd76299a3f47e6c74eadee7ce80241efb31d20b561d9c06af457aa36b6528548b4eaee3eb9
+DIST plasma-desktop-6.0.5.tar.xz 15632868 BLAKE2B 9ece4d16440ecd9f38bad29dc5039439662abf9c872103d9faa58c742b1b93d7825ad4bf6716778c5a3881b877c30d58dcecbaef117fb9ade2ef7d804acece3c SHA512 59ab3e024a5a947603556d596f52bbcedbe94a997f67955583534ad4fce9c95c03e98e977f6df47be13d6014c55266c3f0fee88fdde682fe5d1036c170577499
+DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb
+DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch
deleted file mode 100644
index d77187409738..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-panel-initial-sizing.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 9f19af95e9699420b057b6ff7e99968faf8948a3 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 3 Dec 2021 16:34:40 +0000
-Subject: [PATCH] containments/panel: Fix initial sizing
-
-Timers for anything that affect layouts are universally wrong.
-
-Ultimately this breaks layouts internal usage of QQmlParserStatus. For
-runtime changes layout internally most relayouting is buffered
-internally till the polish event which is once per frame.
-
-Removing this makes startup faster, less glitchy and more declarative.
-
-
-(cherry picked from commit b2fd1578a0063938a3eda8d8e41f14394b7635f7)
----
- containments/panel/contents/ui/main.qml | 34 ++++++-------------------
- 1 file changed, 8 insertions(+), 26 deletions(-)
-
-diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
-index 0a5477476..9b5656acf 100644
---- a/containments/panel/contents/ui/main.qml
-+++ b/containments/panel/contents/ui/main.qml
-@@ -154,14 +154,12 @@ function checkLastSpacer() {
-
- //BEGIN connections
- Component.onCompleted: {
-- currentLayout.isLayoutHorizontal = isHorizontal
- LayoutManager.plasmoid = plasmoid;
- LayoutManager.root = root;
- LayoutManager.layout = currentLayout;
- LayoutManager.lastSpacer = lastSpacer;
- LayoutManager.marginHighlights = [];
- LayoutManager.restore();
-- containmentSizeSyncTimer.restart();
-
- plasmoid.action("configure").visible = Qt.binding(function() {
- return !plasmoid.immutable;
-@@ -200,7 +198,6 @@ function checkLastSpacer() {
- event.accept(event.proposedAction);
- root.fixedWidth = 0;
- root.fixedHeight = 0;
-- containmentSizeSyncTimer.restart();
- }
-
-
-@@ -215,8 +212,6 @@ function checkLastSpacer() {
- }
-
- Plasmoid.onUserConfiguringChanged: {
-- containmentSizeSyncTimer.restart();
--
- if (plasmoid.immutable) {
- if (dragOverlay) {
- dragOverlay.destroy();
-@@ -245,11 +240,7 @@ function checkLastSpacer() {
- }
- }
-
-- Plasmoid.onFormFactorChanged: containmentSizeSyncTimer.restart();
-- Containment.onEditModeChanged: containmentSizeSyncTimer.restart();
--
- onToolBoxChanged: {
-- containmentSizeSyncTimer.restart();
- if (startupTimer.running) {
- startupTimer.restart();
- }
-@@ -478,10 +469,16 @@ function checkLastSpacer() {
-
- GridLayout {
- id: currentLayout
-- property bool isLayoutHorizontal
-+ readonly property bool isLayoutHorizontal: root.isHorizontal
- rowSpacing: PlasmaCore.Units.smallSpacing
- columnSpacing: PlasmaCore.Units.smallSpacing
-
-+ x: (isLayoutHorizontal && root.toolBox && Qt.application.layoutDirection === Qt.RightToLeft && plasmoid.editMode) ? root.toolBox.width : 0;
-+ y: 0
-+
-+ width: root.width - (isLayoutHorizontal && root.toolBox && plasmoid.editMode ? root.toolBox.width : 0)
-+ height: root.height - (!isLayoutHorizontal && root.toolBox && plasmoid.editMode ? root.toolBox.height : 0)
-+
- Layout.preferredWidth: {
- var width = 0;
- for (var i = 0, length = currentLayout.children.length; i < length; ++i) {
-@@ -505,36 +502,21 @@ function checkLastSpacer() {
- rows: 1
- columns: 1
- //when horizontal layout top-to-bottom, this way it will obey our limit of one row and actually lay out left to right
-- flow: isHorizontal ? GridLayout.TopToBottom : GridLayout.LeftToRight
-+ flow: isLayoutHorizontal ? GridLayout.TopToBottom : GridLayout.LeftToRight
- layoutDirection: Qt.application.layoutDirection
- }
-
- onWidthChanged: {
-- containmentSizeSyncTimer.restart()
- if (startupTimer.running) {
- startupTimer.restart();
- }
- }
- onHeightChanged: {
-- containmentSizeSyncTimer.restart()
- if (startupTimer.running) {
- startupTimer.restart();
- }
- }
-
-- Timer {
-- id: containmentSizeSyncTimer
-- interval: 150
-- onTriggered: {
-- dndSpacer.parent = root;
-- currentLayout.x = (isHorizontal && toolBox && Qt.application.layoutDirection === Qt.RightToLeft && plasmoid.editMode) ? toolBox.width : 0;
-- currentLayout.y = 0
-- currentLayout.width = root.width - (isHorizontal && toolBox && plasmoid.editMode ? toolBox.width : 0)
-- currentLayout.height = root.height - (!isHorizontal && toolBox && plasmoid.editMode ? toolBox.height : 0)
-- currentLayout.isLayoutHorizontal = isHorizontal
-- }
-- }
--
- //FIXME: I don't see other ways at the moment a way to see when the UI is REALLY ready
- Timer {
- id: startupTimer
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch
deleted file mode 100644
index 1c9a2b79e31e..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-applet-popup-close-on-click.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2131daa05195a2b55f593acf3d323cf4c2a89936 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Thu, 2 Dec 2021 20:13:46 -0700
-Subject: [PATCH] kcms/touchpad/applet: Make the popup close on click
-
-BUG: 445982
-FIXED-IN: 5.23.5
-(cherry picked from commit 4cb2de984ab79bc257af0135bf92ea7390d5617f)
----
- .../applet/qml/contents/ui/touchpad.qml | 23 +++++++++++--------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-index 3f5eb722f..106859c3a 100644
---- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-+++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-@@ -56,20 +56,23 @@ Item {
- connectedSources: dataSource.sources
- }
-
-- Plasmoid.compactRepresentation: PlasmaCore.ToolTipArea {
-- id: toolTip
-+ Plasmoid.compactRepresentation: PlasmaCore.IconItem {
-+ implicitWidth: PlasmaCore.Units.iconSizes.small
-+ implicitHeight: PlasmaCore.Units.iconSizes.small
-
-- Layout.minimumWidth: PlasmaCore.Units.iconSizes.small
-- Layout.minimumHeight: Layout.minimumWidth
-+ source: plasmoid.icon
-+ active: parent.containsMouse
-
-- mainText: plasmoid.title
-- subText: plasmoid.toolTipSubText
-+ PlasmaCore.ToolTipArea {
-+ mainText: plasmoid.title
-+ subText: plasmoid.toolTipSubText
-+ }
-
-- PlasmaCore.IconItem {
-+ MouseArea {
- anchors.fill: parent
-- source: plasmoid.icon
-- active: parent.containsMouse
-- enabled: root.hasTouchpad
-+ onClicked: {
-+ plasmoid.expanded = !plasmoid.expanded;
-+ }
- }
- }
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch
deleted file mode 100644
index 07d741424005..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.4-fix-touchpad-mousearea-lookup.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From aadab772fb81ff3d97c8b5342a8a018f51b2ef60 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Fri, 3 Dec 2021 09:36:47 -0700
-Subject: [PATCH] kcms/touchpad/applet: Fix mousearea lookup
-
-(cherry picked from commit f4060c48b264a5054c2ffa795c208910d42bfd42)
----
- kcms/touchpad/applet/qml/contents/ui/touchpad.qml | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-index 106859c3a..aa1034e59 100644
---- a/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-+++ b/kcms/touchpad/applet/qml/contents/ui/touchpad.qml
-@@ -61,7 +61,7 @@ Item {
- implicitHeight: PlasmaCore.Units.iconSizes.small
-
- source: plasmoid.icon
-- active: parent.containsMouse
-+ active: mousearea.containsMouse
-
- PlasmaCore.ToolTipArea {
- mainText: plasmoid.title
-@@ -69,6 +69,8 @@ Item {
- }
-
- MouseArea {
-+ id: mousearea
-+
- anchors.fill: parent
- onClicked: {
- plasmoid.expanded = !plasmoid.expanded;
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch
new file mode 100644
index 000000000000..e88c78b49be4
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch
@@ -0,0 +1,85 @@
+From 96d62f21f52e543dfb1f114988d4912ef321772f Mon Sep 17 00:00:00 2001
+From: Jakob Petsovits <jpetso@petsovits.com>
+Date: Thu, 4 Apr 2024 19:03:49 -0400
+Subject: [PATCH 1/2] kcms/mouse: Remove unused xorg-evdev dependency
+
+It's not necessary to access it directly anymore, now that we only
+expose settings for libinput.
+
+(cherry picked from commit b4fe3e9115856cdd8a67f11d1ab9b5246e2c4770)
+---
+ kcms/mouse/CMakeLists.txt | 3 ---
+ kcms/mouse/backends/x11.cmake | 1 -
+ kcms/mouse/inputbackend.h | 1 -
+ 3 files changed, 5 deletions(-)
+
+diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
+index 639981380..909ed815d 100644
+--- a/kcms/mouse/CMakeLists.txt
++++ b/kcms/mouse/CMakeLists.txt
+@@ -32,9 +32,6 @@ if (BUILD_KCM_MOUSE_KWIN_WAYLAND)
+ endif()
+
+ if (BUILD_KCM_MOUSE_X11)
+- if (NOT EVDEV_FOUND)
+- list(APPEND MISSING_DEPS "xorg-evdev")
+- endif()
+ if (NOT XORGLIBINPUT_FOUND)
+ list(APPEND MISSING_DEPS "xorg-libinput")
+ endif()
+diff --git a/kcms/mouse/backends/x11.cmake b/kcms/mouse/backends/x11.cmake
+index 3b1601285..c402612de 100644
+--- a/kcms/mouse/backends/x11.cmake
++++ b/kcms/mouse/backends/x11.cmake
+@@ -11,7 +11,6 @@ set(backend_SRCS
+ set(backend_LIBS
+ ${backend_LIBS}
+ PkgConfig::XORGLIBINPUT
+- PkgConfig::EVDEV
+ X11::X11
+ X11::Xi
+ X11::Xcursor
+diff --git a/kcms/mouse/inputbackend.h b/kcms/mouse/inputbackend.h
+index 579634d27..0a6e6ac6a 100644
+--- a/kcms/mouse/inputbackend.h
++++ b/kcms/mouse/inputbackend.h
+@@ -20,7 +20,6 @@ enum class InputBackendMode {
+ #endif
+ #if BUILD_KCM_MOUSE_X11
+ XLibinput = 1,
+- XEvdev = 2,
+ #endif
+ };
+
+--
+2.45.1
+
+
+From fcc965d6a90822b2c6600bf2426dfb0c2b46021a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 20 May 2024 18:41:57 +0200
+Subject: [PATCH 2/2] Cleanup remaining pkg_check_modules(EVDEV) call
+
+Amends 181b6c85ea6d46652b136462d5b6e0c9b56fc5c2 and b4fe3e9115856cdd8a67f11d1ab9b5246e2c4770
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit 2242b7852f1ab746e4f6929e2fcd51b24b2ec37e)
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b475d3c5b..a515367a8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,7 +226,6 @@ add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
+ add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
+
+ pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET)
+-pkg_check_modules(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
+ pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
+
+ ecm_find_qmlmodule(org.kde.pipewire 0.1)
+--
+2.45.1
+
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 98dd3653422b..3e49f87352a5 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -9,10 +9,8 @@
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
<use>
- <flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
<flag name="kaccounts">Build the OpenDesktop integration plugin</flag>
- <flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
</use>
</pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.4-r1.ebuild
deleted file mode 100644
index dcd98ea5397d..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.4-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-1"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
-
-COMMON_DEPEND="
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/attica-${KFMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=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/kded-${KFMIN}:5
- >=kde-frameworks/kdelibs4support-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=kde-plasma/plasma-workspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- virtual/libcrypt:=
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxcb[xkb]
- x11-libs/libxkbfile
- emoji? (
- app-i18n/ibus[emoji]
- dev-libs/glib:2
- media-fonts/noto-emoji
- )
- ibus? (
- app-i18n/ibus
- dev-libs/glib:2
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libxcb
- x11-libs/xcb-util-keysyms
- )
- kaccounts? (
- kde-apps/kaccounts-integration:5
- net-libs/accounts-qt
- )
- policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
- scim? ( app-i18n/scim )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-plasma/user-manager
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
- >=kde-plasma/oxygen-${PVCUT}:5
- sys-apps/util-linux
- x11-apps/setxkbmap
- x11-misc/xdg-user-dirs
- kaccounts? ( net-libs/signon-oauth2 )
- policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
- # 5.23 branch
- "${FILESDIR}"/${P}-fix-panel-initial-sizing.patch
- "${FILESDIR}"/${P}-fix-touchpad-applet-popup-close-on-click.patch # KDE-bug 445982
- "${FILESDIR}"/${P}-fix-touchpad-mousearea-lookup.patch
-)
-
-src_prepare() {
- ecm_src_prepare
-
- if ! use policykit; then
- ecm_punt_bogus_dep KF5 Wallet
- cmake_run_in kcms cmake_comment_add_subdirectory users
- fi
-
- if ! use ibus; then
- sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
- -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
- fi
-
- use emoji || cmake_run_in applets/kimpanel/backend/ibus \
- cmake_comment_add_subdirectory emojier
-
- # TODO: try to get a build switch upstreamed
- if ! use scim; then
- sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
- -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- $(cmake_use_find_package kaccounts AccountsQt5)
- $(cmake_use_find_package kaccounts KAccounts)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
- if ! use emoji && ! use ibus; then
- mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
- fi
-
- ecm_src_configure
-}
-
-src_test() {
- # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
- # test_kio_fonts needs D-Bus, bug #634166
- # lookandfeel-kcmTest is unreliable for a long time, bug #607918
- local myctestargs=(
- -j1
- -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
- )
-
- ecm_src_test
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "screen reader support" app-accessibility/orca
- fi
- ecm_pkg_postinst
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.11.ebuild
index 7a3c7757294a..f64ee0ee6e80 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.27.11.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_HANDBOOK="forceoptional"
ECM_TEST="true"
-KFMIN=5.86.0
+KFMIN=5.106.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
+QTMIN=5.15.9
+inherit ecm plasma.kde.org optfeature
DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-1"
+XORGHDRS="${PN}-override-include-dirs-3"
SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="ibus kaccounts scim screencast +semantic-desktop"
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
COMMON_DEPEND="
+ dev-libs/wayland
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -29,12 +30,11 @@ COMMON_DEPEND="
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwayland-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/attica-${KFMIN}:5
- >=kde-frameworks/kactivities-${KFMIN}:5
- >=kde-frameworks/kactivities-stats-${KFMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kauth-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
@@ -60,31 +60,30 @@ COMMON_DEPEND="
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
>=kde-frameworks/kparts-${KFMIN}:5
>=kde-frameworks/krunner-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
>=kde-plasma/kwin-${PVCUT}:5
>=kde-plasma/libksysguard-${PVCUT}:5
>=kde-plasma/libkworkspace-${PVCUT}:5
- >=kde-plasma/plasma-workspace-${PVCUT}:5
- >=media-libs/phonon-4.11.0
- virtual/libcrypt:=
+ >=kde-plasma/libplasma-${KFMIN}:5
+ >=kde-plasma/plasma-activities-${KFMIN}:5
+ >=kde-plasma/plasma-activities-stats-${KFMIN}:5
+ >=kde-plasma/plasma-workspace-${PVCUT}:5[screencast?]
+ >=media-libs/phonon-4.11.0[qt5(+)]
x11-libs/libX11
+ x11-libs/libXcursor
x11-libs/libXfixes
x11-libs/libXi
- x11-libs/libxcb[xkb]
+ x11-libs/libxcb
+ x11-libs/libxkbcommon
x11-libs/libxkbfile
- emoji? (
- app-i18n/ibus[emoji]
- dev-libs/glib:2
- media-fonts/noto-emoji
- )
ibus? (
app-i18n/ibus
dev-libs/glib:2
@@ -94,53 +93,51 @@ COMMON_DEPEND="
)
kaccounts? (
kde-apps/kaccounts-integration:5
- net-libs/accounts-qt
+ net-libs/accounts-qt[qt5(+)]
)
- policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
scim? ( app-i18n/scim )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
- telemetry? ( dev-libs/kuserfeedback:5 )
"
DEPEND="${COMMON_DEPEND}
+ >=dev-libs/wayland-protocols-1.25
dev-libs/boost
x11-base/xorg-proto
"
RDEPEND="${COMMON_DEPEND}
- !kde-plasma/user-manager
+ !<kde-plasma/kdeplasma-addons-5.25.50
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=dev-qt/qtwaylandscanner-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
+ >=kde-plasma/kde-cli-tools-${PVCUT}:*
>=kde-plasma/oxygen-${PVCUT}:5
+ media-fonts/noto-emoji
sys-apps/util-linux
x11-apps/setxkbmap
x11-misc/xdg-user-dirs
- kaccounts? ( net-libs/signon-oauth2 )
- policykit? ( sys-apps/accountsservice )
+ kaccounts? ( net-libs/signon-oauth2[qt5(+)] )
+ screencast? ( >=kde-plasma/kpipewire-${PVCUT}:5 )
+"
+BDEPEND="
+ dev-util/intltool
+ dev-util/wayland-scanner
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ virtual/pkgconfig
"
-BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+ "${WORKDIR}/${XORGHDRS}/${PN}-5.27.9-override-include-dirs.patch" # downstream patch
)
src_prepare() {
ecm_src_prepare
- if ! use policykit; then
- ecm_punt_kf_module Wallet
- cmake_run_in kcms cmake_comment_add_subdirectory users
- fi
-
if ! use ibus; then
sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
fi
- use emoji || cmake_run_in applets/kimpanel/backend/ibus \
- cmake_comment_add_subdirectory emojier
-
# TODO: try to get a build switch upstreamed
if ! use scim; then
sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
@@ -154,14 +151,11 @@ src_configure() {
-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ $(cmake_use_find_package ibus GLIB2)
$(cmake_use_find_package kaccounts AccountsQt5)
$(cmake_use_find_package kaccounts KAccounts)
$(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
)
- if ! use emoji && ! use ibus; then
- mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
- fi
ecm_src_configure
}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild
new file mode 100644
index 000000000000..f928f890a09a
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=6.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=6.6.2
+inherit ecm plasma.kde.org optfeature
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-4"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="ibus kaccounts scim screencast sdl +semantic-desktop"
+
+RESTRICT="test" # missing selenium-webdriver-at-spi
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
+COMMON_DEPEND="
+ dev-libs/icu:=
+ dev-libs/wayland
+ >=dev-qt/qt5compat-${QTMIN}:6[qml]
+ >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=dev-qt/qtwayland-${QTMIN}:6
+ >=kde-frameworks/attica-${KFMIN}:6
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kauth-${KFMIN}:6
+ >=kde-frameworks/kbookmarks-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcodecs-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kded-${KFMIN}:6
+ >=kde-frameworks/kglobalaccel-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-frameworks/kitemviews-${KFMIN}:6
+ >=kde-frameworks/kjobwidgets-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/knotifyconfig-${KFMIN}:6
+ >=kde-frameworks/kpackage-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/krunner-${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-frameworks/solid-${KFMIN}:6
+ >=kde-frameworks/sonnet-${KFMIN}:6
+ >=kde-plasma/kwin-${PVCUT}:6
+ >=kde-plasma/libksysguard-${PVCUT}:6
+ >=kde-plasma/libplasma-${PVCUT}:6
+ >=kde-plasma/plasma-activities-${PVCUT}:6
+ >=kde-plasma/plasma-activities-stats-${PVCUT}:6
+ >=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?]
+ >=kde-plasma/plasma5support-${PVCUT}:6
+ media-libs/libcanberra
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ ibus? (
+ app-i18n/ibus
+ dev-libs/glib:2
+ x11-libs/xcb-util-keysyms
+ )
+ kaccounts? (
+ kde-apps/kaccounts-integration:6
+ >=net-libs/accounts-qt-1.16_p20220803[qt6]
+ )
+ scim? ( app-i18n/scim )
+ sdl? ( media-libs/libsdl2[joystick] )
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/wayland-protocols-1.25
+ dev-libs/boost
+ x11-base/xorg-proto
+ test? (
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+ >=kde-plasma/kactivitymanagerd-${PVCUT}:6
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !<kde-plasma/kdeplasma-addons-5.25.50
+ dev-libs/kirigami-addons:6
+ >=dev-qt/qtwayland-${QTMIN}:6
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+ >=kde-plasma/kde-cli-tools-${PVCUT}:*
+ >=kde-plasma/oxygen-${PVCUT}:6
+ media-fonts/noto-emoji
+ sys-apps/util-linux
+ x11-apps/setxkbmap
+ x11-misc/xdg-user-dirs
+ kaccounts? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6] )
+ screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 )
+"
+BDEPEND="
+ dev-util/intltool
+ dev-util/wayland-scanner
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-6.0.5-unused-dep.patch" # backport from 6.1/git master
+ "${WORKDIR}/${XORGHDRS}/${PN}-6.0.5-override-include-dirs.patch" # downstream patch
+)
+
+src_prepare() {
+ ecm_src_prepare
+
+ if ! use ibus; then
+ sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+ -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+ fi
+
+ # TODO: try to get a build switch upstreamed
+ if ! use scim; then
+ sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_KCM_MOUSE_X11=ON
+ -DBUILD_KCM_TOUCHPAD_X11=ON
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+ -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
+ $(cmake_use_find_package ibus GLIB2)
+ $(cmake_use_find_package kaccounts AccountsQt6)
+ $(cmake_use_find_package kaccounts KAccounts6)
+ $(cmake_use_find_package sdl SDL2)
+ $(cmake_use_find_package semantic-desktop KF6Baloo)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+ # test_kio_fonts needs D-Bus, bug #634166
+ # lookandfeel-kcmTest is unreliable for a long time, bug #607918
+ local myctestargs=(
+ -j1
+ -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
+ )
+
+ ecm_src_test
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ optfeature "screen reader support" "app-accessibility/orca"
+ fi
+ ecm_pkg_postinst
+}