summaryrefslogtreecommitdiff
path: root/kde-plasma/plasma-workspace
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/plasma-workspace')
-rw-r--r--kde-plasma/plasma-workspace/Manifest11
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch94
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch93
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch46
-rw-r--r--kde-plasma/plasma-workspace/metadata.xml1
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild (renamed from kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r1.ebuild)4
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.20.3.ebuild (renamed from kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild)100
7 files changed, 92 insertions, 257 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 57a9539b6e9c..b32e6ecd2c9e 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,13 +1,12 @@
AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190
AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
-AUX plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch 3503 BLAKE2B 360e27d03d8429d7d2b1c11f9b40ac0049108ab0461e9428cb5f2fe67241708190796d3a60a503e0ab1903dee61c27dfe7d2a187e36032518632a4966fe10215 SHA512 f7367acf43a4c3aed20ee42853fb0657f64182222a208511f97657b734a430eb8d24c6cf10b6a276ae3313d791938905abbc33387adc272725addc606a86f482
-AUX plasma-workspace-5.18.5-stop-multiplying-duration-values.patch 3899 BLAKE2B 434e8c1df5bac91b68085258641194a9ced7fbbaa35f7a97bc29a1921d00dd59c0a39fed948325d7d686c075514c9621391b1000869bd93de266cb179f538b6d SHA512 24927936b7940bf181c05a87a95e4b6d87f1658b9ab94cb980f0fc697b4cbd2fdbf8a7a141413c1bad6d040408ff24b419a44a3a404bc02accfaf9d9250cb110
AUX plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1780 BLAKE2B 1462650fed75b2b33c945e34281cfec1304f9d325a41deeeea5d0030d5469f270e7d2c50cab3b897298229f9c285c335c37f9a5d330d8a19e15da7711a403b50 SHA512 c7fb22f77a8841450c1c6c3f448401bfa29f5ca4bd58d30674dae29b7acc8db9ac367f4eac2cd1dc151893dea526c167744ae2a52d08797d0e8bba8486224bbc
AUX plasma-workspace-5.19.5-gpsd-3.21.patch 997 BLAKE2B 034a08a4c524ce7b4be4d41ba945f049d03e30e4810fa107d2f7198913476a90aef0e9e0fa381413f94bd1725a4694a07eeafa147b31e2baa2810257ee0e608c SHA512 6d8eadea96bb388a64704e1b1c30190cd06b0c872b084a8b6e16f1c510fd619dd2e64ae0b9c65b39e3c020a312a451a73a8ba241b3c8575870528e97c59d46fd
+AUX plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch 1608 BLAKE2B 1d6b2679d7f41863f83c69a2d11791b972275f7e9b838bc8a252c8ed4661f5774d6b43c019d9c4653f7f9af407b154869378d6845fec878972b6bd59e4fdbfa8 SHA512 08971de678b6e4c9148c4f55b44eb64870a639c9b0ecbeacdcea3565e9204f720205fd9707cc52c3284d94c0228d3f2e1464a70551582af4d49e95172f64f390
AUX plasma-workspace-5.19.5-login-button-size.patch 2035 BLAKE2B 57618eda7a8d5071501998c9b420bfb007acd181df81068a2982fd2d40ba18398876177f221203de8daa4c53c4ec00260cb85a9f8f10c3bbe5d2f9449d9bf831 SHA512 16ae3fc015318d24c8e01adfabff4b304c98292854b805384328c47c7823d7749ad52eeb6acccc1ae9f2a2d4547929a4039e4174ab58db87de6c864b91d0f135
-DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
-EBUILD plasma-workspace-5.18.5-r1.ebuild 7241 BLAKE2B 7a1ea14452de71a0d514f8ad75f489ea9a9b549517cc1c51b91cf319c91de6988869fe9b1c962cf0f79a64129464f98410e5e63198c828bb2d0c8f61e739a775 SHA512 8e91e8b6e377aafd493fc6a1b64a797f6ac4a0433f9feeab945e1c48b6146e54fa625720b0995b00f4cf88f49e85af5818234c2088413eb024d65567eb4b6fe2
-EBUILD plasma-workspace-5.19.5-r1.ebuild 7020 BLAKE2B 8e3928bebc84ffb54d82143359c422d50dd2e5b3ddaa1e57e6d910b2645c77b0226e6d60a29f74f8638f85e2e82213d131bae3facaa547fc992786d7b065c2d4 SHA512 9a6f86a031d0509147aa6afadac64869e116042d77be04d61773415579b88ac885c31111eceb334e92a60d734bab7c0069baae619888a92acda7871696d06420
-MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
+DIST plasma-workspace-5.20.3.tar.xz 9031572 BLAKE2B 242286eef9d15b9dacec0dca3a7899c538141490611f932e0ebff59e1ea7a54cbad56e3bcad6e4a720b4f7610de2fc0e128288c3fe3d2b9e8255ffe16e0b86fa SHA512 c1daa19834ea7997a8e44fcb6ce9745d5bac56a0a4d99320e1e3e42e9cb5489aa36887e3c2bd8e385644d555d355211c9dba6c40edf2471478566c531a2d9c89
+EBUILD plasma-workspace-5.19.5-r2.ebuild 7161 BLAKE2B 616371d4525a652790da41eb4e8f126f35f73b200bb90cec0715b2194b249dd9b0db638c93b40c042a261268c87c22d8ae95324790592f2841c43629c3c9d0d1 SHA512 6e757950dd26c93fdec581dcb8a04eaf5b090d9d12843a8309a142e278e3cbd2278a170616a48dd72ac64ce6face681d72ee48b2bec407f14f3537319564c149
+EBUILD plasma-workspace-5.20.3.ebuild 5955 BLAKE2B 1638d4c45b99755ab7e7b060e77870637c7c88266d7664f1507a386dc7a035475095b3ea6cc4d51130c818105fbfd5033af43014a495af5eb9b147326a5a836d SHA512 3e3204e35fd23be45a809394bd8f5185e7008c8a8dfc21c1fad2f1fc0db9a232ddd6ede5ccd67d4cb67ce74e5afce0d493e5e80404c520d8fe76183244681eb1
+MISC metadata.xml 848 BLAKE2B 60b6be066ec5e396d88f6e57774e7bde6e9906de72b808d7e4887fde6f8fdd4e99667e30e244602e92c10aa8950d583adf78b6e122b4a9dc60a7a538aa69663b SHA512 77e385066c166cb8a43b531e0e079f39004d645364237d1ead4a26816297edec7283cf551310f1c0643692eb8794bce74a949b00b049f140da2e2f7a6fb2689a
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
deleted file mode 100644
index 7cbe139a1669..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 68601675d13bdf44248991a56e888093e58c56c3 Mon Sep 17 00:00:00 2001
-From: Filip Fila <filipfila.kde@gmail.com>
-Date: Wed, 13 May 2020 18:08:27 +0200
-Subject: [sddm-theme] Prevent the logo from leaking in after a fadeout
-
-Summary:
-Even when the vendor logo is turned off it can be briefly seen when the login screen changes from the fadeout state back into normal.
-
-Comments in other code say that "OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)" so this patch replaces it with NumberAnimation.
-
-There's also a minor fix included - placing the drop shadow sooner in the hierarchy because it should be drawn underneath an object, not in front of it.
-
-Test Plan:
-Reduce the fadeout time to something small and then:
-
-`sddm-greeter --test-mode --theme /usr/share/sddm/themes/breeze`
-
-Reviewers: ngraham, cblack, #plasma, mart
-
-Reviewed By: ngraham, #plasma, mart
-
-Subscribers: mart, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29351
----
- sddm-theme/Main.qml | 44 +++++++++++++++++++++++---------------------
- 1 file changed, 23 insertions(+), 21 deletions(-)
-
-diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml
-index 6746238..9910e7f 100644
---- a/sddm-theme/Main.qml
-+++ b/sddm-theme/Main.qml
-@@ -411,26 +411,6 @@ PlasmaCore.ColorScope {
- }
- }
-
-- Image {
-- id: logo
-- visible: config.showlogo == "shown"
-- source: config.logo
-- anchors.horizontalCenter: parent.horizontalCenter
-- anchors.bottom: footer.top
-- anchors.bottomMargin: units.largeSpacing
-- asynchronous: true
-- sourceSize.height: height
-- opacity: loginScreenRoot.uiVisible ? 0 : 1
-- fillMode: Image.PreserveAspectFit
-- height: Math.round(units.gridUnit * 3.5)
-- Behavior on opacity {
-- OpacityAnimator {
-- duration: units.longDuration
-- easing.type: Easing.InOutQuad
-- }
-- }
-- }
--
- DropShadow {
- id: logoShadow
- anchors.fill: logo
-@@ -444,7 +424,29 @@ PlasmaCore.ColorScope {
- color: "black" // matches Breeze window decoration and desktopcontainment
- opacity: loginScreenRoot.uiVisible ? 0 : 1
- Behavior on opacity {
-- OpacityAnimator {
-+ //OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
-+ NumberAnimation {
-+ duration: units.longDuration
-+ easing.type: Easing.InOutQuad
-+ }
-+ }
-+ }
-+
-+ Image {
-+ id: logo
-+ visible: config.showlogo == "shown"
-+ source: config.logo
-+ anchors.horizontalCenter: parent.horizontalCenter
-+ anchors.bottom: footer.top
-+ anchors.bottomMargin: units.largeSpacing
-+ asynchronous: true
-+ sourceSize.height: height
-+ opacity: loginScreenRoot.uiVisible ? 0 : 1
-+ fillMode: Image.PreserveAspectFit
-+ height: Math.round(units.gridUnit * 3.5)
-+ Behavior on opacity {
-+ // OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
-+ NumberAnimation {
- duration: units.longDuration
- easing.type: Easing.InOutQuad
- }
---
-cgit v1.1
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
deleted file mode 100644
index 83539c14c043..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 2958702524348e9e4fcbdf490be731e92b353dad Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 24 Mar 2020 08:10:54 -0600
-Subject: Stop multiplying duration values
-
-Summary:
-After D28144, some animations are now too long because they were inappropriately
-multiplying a duration value. That's no longer necessary, so let's remove the
-multiplication.
-
-Depends on D28144
-
-Test Plan: Various things that were a bit too slow before feel just right now
-
-Reviewers: #vdg, #plasma, cblack
-
-Reviewed By: #vdg, #plasma, cblack
-
-Subscribers: cblack, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D28238
----
- applets/devicenotifier/package/contents/ui/FullRepresentation.qml | 2 +-
- applets/systemtray/package/contents/ui/ExpanderArrow.qml | 2 +-
- lookandfeel/contents/components/ActionButton.qml | 4 ++--
- lookandfeel/contents/components/UserDelegate.qml | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
-index d15e47c..80b9c73 100644
---- a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
-+++ b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
-@@ -225,7 +225,7 @@ MouseArea {
- popupIconTimer.restart()
- }
- }
-- Behavior on height { NumberAnimation { duration: units.shortDuration * 3 } }
-+ Behavior on height { NumberAnimation { duration: units.shortDuration } }
- }
- }
- }
-diff --git a/applets/systemtray/package/contents/ui/ExpanderArrow.qml b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
-index 9baf654..729f56b 100644
---- a/applets/systemtray/package/contents/ui/ExpanderArrow.qml
-+++ b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
-@@ -37,7 +37,7 @@ PlasmaCore.ToolTipArea {
- anchors.fill: parent
- onClicked: root.expanded = !root.expanded
-
-- readonly property int arrowAnimationDuration: units.shortDuration * 3
-+ readonly property int arrowAnimationDuration: units.shortDuration
-
- PlasmaCore.Svg {
- id: arrowSvg
-diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/contents/components/ActionButton.qml
-index 9fbd2a8..7a66c56 100644
---- a/lookandfeel/contents/components/ActionButton.qml
-+++ b/lookandfeel/contents/components/ActionButton.qml
-@@ -44,7 +44,7 @@ Item {
- opacity: activeFocus || containsMouse ? 1 : 0.85
- Behavior on opacity {
- PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
-- duration: units.longDuration * 2
-+ duration: units.longDuration
- easing.type: Easing.InOutQuad
- }
- }
-@@ -59,7 +59,7 @@ Item {
- opacity: activeFocus || containsMouse ? (softwareRendering ? 0.8 : 0.15) : (softwareRendering ? 0.6 : 0)
- Behavior on opacity {
- PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
-- duration: units.longDuration * 3
-+ duration: units.longDuration
- easing.type: Easing.InOutQuad
- }
- }
-diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml
-index 8882e39..cdb55f1 100644
---- a/lookandfeel/contents/components/UserDelegate.qml
-+++ b/lookandfeel/contents/components/UserDelegate.qml
-@@ -72,7 +72,7 @@ Item {
- Behavior on width {
- PropertyAnimation {
- from: faceSize
-- duration: units.longDuration * 2;
-+ duration: units.longDuration;
- }
- }
- width: isCurrent ? faceSize : faceSize - units.largeSpacing
---
-cgit v1.1
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch
new file mode 100644
index 000000000000..21e335315907
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch
@@ -0,0 +1,46 @@
+From 5cb38daedbfa5ef26a47d82d197c96230a004b0f Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 30 Sep 2020 08:56:16 +0000
+Subject: [PATCH] [containmentactions] Guard against having no virtual desktops
+
+It can apparently happen that virtual desktops is empty at a given point
+in time. Potentially due to other bugs on the system.
+
+Calls to desktopIds.at(N) will fail.
+
+BUG: 427106
+
+
+(cherry picked from commit 2441c82a2a92535ccc0a9643715427eb362c98e8)
+---
+ containmentactions/switchdesktop/desktop.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/containmentactions/switchdesktop/desktop.cpp b/containmentactions/switchdesktop/desktop.cpp
+index 809543a49..dda78c584 100644
+--- a/containmentactions/switchdesktop/desktop.cpp
++++ b/containmentactions/switchdesktop/desktop.cpp
+@@ -85,6 +85,10 @@ void SwitchDesktop::switchTo()
+ void SwitchDesktop::performNextAction()
+ {
+ const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds();
++ if (desktopIds.isEmpty()) {
++ return;
++ }
++
+ const QVariant &currentDesktop = m_virtualDesktopInfo->currentDesktop();
+ const int currentDesktopIndex = desktopIds.indexOf(currentDesktop);
+
+@@ -100,6 +104,9 @@ void SwitchDesktop::performNextAction()
+ void SwitchDesktop::performPreviousAction()
+ {
+ const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds();
++ if (desktopIds.isEmpty()) {
++ return;
++ }
+ const QVariant &currentDesktop = m_virtualDesktopInfo->currentDesktop();
+ const int currentDesktopIndex = desktopIds.indexOf(currentDesktop);
+
+--
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 81b172506439..b52b6b485856 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -10,6 +10,7 @@
<flag name="geolocation">Enables dataengine providing location information</flag>
<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
<flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag>
+ <flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
<flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
</use>
</pkgmetadata>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
index 232540bdbe82..472f6c66c2de 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
REQUIRED_USE="gps? ( geolocation )"
@@ -128,6 +128,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
"${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392
"${FILESDIR}/${P}-login-button-size.patch"
+ "${FILESDIR}/${P}-guard-against-no-virtual-desktops.patch" # KDE-Bug #427106
)
RESTRICT+=" test"
@@ -216,6 +217,7 @@ pkg_postinst () {
rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
fi
+ rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.3.ebuild
index a47bf9b9589e..f0d127a1c238 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.3.ebuild
@@ -5,9 +5,9 @@ EAPI=7
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
@@ -15,18 +15,21 @@ DESCRIPTION="KDE Plasma workspace"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
REQUIRED_USE="gps? ( geolocation )"
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="virtual/pkgconfig"
COMMON_DEPEND="
+ >=dev-libs/wayland-1.15
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
>=dev-qt/qtgui-${QTMIN}:5=[jpeg]
>=dev-qt/qtnetwork-${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
@@ -67,19 +70,21 @@ COMMON_DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/prison-${KFMIN}:5[qml]
>=kde-frameworks/solid-${KFMIN}:5
>=kde-plasma/kscreenlocker-${PVCUT}:5
>=kde-plasma/kwin-${PVCUT}:5
>=kde-plasma/libkscreen-${PVCUT}:5
>=kde-plasma/libksysguard-${PVCUT}:5
>=kde-plasma/libkworkspace-${PVCUT}:5
- media-libs/phonon[qt5(+)]
+ >=media-libs/phonon-4.11.0
sys-libs/zlib
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXau
x11-libs/libxcb
+ x11-libs/libXcursor
x11-libs/libXfixes
x11-libs/libXrender
x11-libs/libXtst
@@ -87,16 +92,27 @@ COMMON_DEPEND="
x11-libs/xcb-util-image
appstream? ( dev-libs/appstream[qt5] )
calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+ fontconfig? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
gps? ( sci-geosciences/gpsd )
qalculate? ( sci-libs/libqalculate:= )
- qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+ screencast? (
+ >=media-video/pipewire-0.3:=
+ x11-libs/libdrm
+ )
semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
telemetry? ( dev-libs/kuserfeedback:5 )
"
DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.1.1
>=dev-qt/qtconcurrent-${QTMIN}:5
x11-base/xorg-proto
+ fontconfig? ( x11-libs/libXrender )
"
RDEPEND="${COMMON_DEPEND}
app-text/iso-codes
@@ -106,9 +122,9 @@ RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=kde-apps/kio-extras-19.04.3:5
- >=kde-frameworks/kquickcharts-${KFMIN}:5
>=kde-frameworks/kdesu-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kquickcharts-${KFMIN}:5
>=kde-plasma/ksysguard-${PVCUT}:5
>=kde-plasma/milou-${PVCUT}:5
>=kde-plasma/plasma-integration-${PVCUT}:5
@@ -118,65 +134,30 @@ RDEPEND="${COMMON_DEPEND}
x11-apps/xsetroot
systemd? ( sys-apps/dbus[user-session] )
!systemd? ( sys-apps/dbus )
- !<kde-plasma/plasma-desktop-5.16.80:5
+ !<kde-plasma/plasma-desktop-5.19.80:5
"
PDEPEND="
>=kde-plasma/kde-cli-tools-${PVCUT}:5
"
-PATCHES=(
- "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" # downstream patch
-
- "${FILESDIR}/${P}-sddm-theme-prevent-logo-leaking.patch" # in Plasma/5.18
-
- # Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backport):
- # https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
- "${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
RESTRICT+=" test"
-pkg_setup() {
- ecm_pkg_setup
-
- local md5
- local srcfile=/etc/plasma/XX/10-agent-XX.sh
- local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
-
- if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
- md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
- if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
- elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
- elog "Copying to ${newdir}/env/10-agent-startup.sh..."
- cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
- fi
- fi
-
- if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
- md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
- if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
- elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
- elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
- cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
- fi
- fi
-}
-
src_prepare() {
ecm_src_prepare
- if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
- cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
- fi
- if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
- cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
- fi
-
cmake_comment_add_subdirectory libkworkspace
# delete colliding libkworkspace translations
if [[ ${KDE_BUILD_TYPE} = release ]]; then
find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
fi
+
+ # 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() {
@@ -184,9 +165,9 @@ src_configure() {
-DBUILD_xembed-sni-proxy=OFF
$(cmake_use_find_package appstream AppStreamQt)
$(cmake_use_find_package calendar KF5Holidays)
+ $(cmake_use_find_package fontconfig Fontconfig)
$(cmake_use_find_package geolocation KF5NetworkManagerQt)
$(cmake_use_find_package qalculate Qalculate)
- $(cmake_use_find_package qrcode KF5Prison)
$(cmake_use_find_package semantic-desktop KF5Baloo)
$(cmake_use_find_package telemetry KUserFeedback)
)
@@ -201,25 +182,18 @@ src_install() {
# default startup and shutdown scripts
insinto /etc/xdg/plasma-workspace/env
- doins "${T}"/10-agent-startup.sh
+ doins "${FILESDIR}"/10-agent-startup.sh
insinto /etc/xdg/plasma-workspace/shutdown
- doins "${T}"/10-agent-shutdown.sh
+ doins "${FILESDIR}"/10-agent-shutdown.sh
fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
}
pkg_postinst () {
ecm_pkg_postinst
- # Clean up pre-5.17.4 scripts
- if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
- rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
- elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
- fi
- if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
- rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
- elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
- fi
+ # Clean up pre-5.17.4 dirs
+ rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 19:55:20 +0000