diff options
Diffstat (limited to 'kde-plasma/plasma-workspace')
-rw-r--r-- | kde-plasma/plasma-workspace/Manifest | 11 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch | 40 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch | 39 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch | 91 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch | 25 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch | 38 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild | 168 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild | 220 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/plasma-workspace-5.17.5.ebuild (renamed from kde-plasma/plasma-workspace/plasma-workspace-5.17.4.ebuild) | 114 |
9 files changed, 326 insertions, 420 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index d2c0648906b5..0815802aa462 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,13 +1,10 @@ AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678 -AUX plasma-workspace-5.10-startplasmacompositor-script.patch 1213 BLAKE2B 2558a43db9cc65706fe2c3382918e47552ad702e9ac6a5071ae3c620bc05097306046e0cd3f74de68985d787120013ce76697cbe107bc3b0c5ace5d5d03a05c1 SHA512 eb7126ec8a7991c59c1c056c81d9b8d6934cf9c702cc70534a97b585eaf1ea3e33499e5525e821ce4e8682573a09538ed1d59db561c58a7464a144e9a24c5275 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d -AUX plasma-workspace-5.14.80-startkde-script.patch 1207 BLAKE2B ee59b775f3ffb3d876d1c4c27f8221c9854af155fc4c0dc0c6cb591fc944f07c3196d64438011db6c2833b4030d0ef76e6a49752dcd1267a94e7686af06e5bda SHA512 e8de504db8b4f23ef6c09aae9d9fe88f88ed3623b6b5766e5cf57ccf72d5d31778f8f8ba5483ca200ad6d6fbae1346655f73ca1ef880d3eb1a5775f258501938 -AUX plasma-workspace-5.16.3-x11sessionrename.patch 2435 BLAKE2B 3ec4c08af77f24dd264e547ed1f33e2dcd21a501fe83638c56c51e3ea17502b7622b1d6829927cd1396f01356957f686fb76a825de272541afc7e67436d20a46 SHA512 69eaa3393b3e0dd0251df4a577002e4bcef4604b4293f08e5ad9a5ef98367a5ce67d2238e3f84acb8845e4fdd80d570a651ff5f475e43439763ad3dbc994241e -AUX plasma-workspace-5.16.4-no-share-dataengine.patch 904 BLAKE2B ea9c8b6505e3bfd9b35a0ef02f4e6fcb4ba5ad011872bf3803ac12dd07115bceed58fce5d9a7b8042c0bd7c26a592561dc120e8f4f908cd352c46ff6f9d86db3 SHA512 bc79f69a50119d11035c0644a6d05281ea23ae29e662808a0a3384f3ec63049121b73bc1bb8c06b58c5b3f42fec8d5d45c9139e50466c628aa1261edb45b877a AUX plasma-workspace-5.17.2-waylandsessionrename.patch 2568 BLAKE2B 45be5b7221f60e6e1f2d449887f348f0462458ea25cc0559b4a48ca9e3726cd241ea6d32d23f61cc0ee755e1e7d42bda1ac8dfd454bf55bb69b53f3d60c6df7e SHA512 f36882781987e85b76bc2d2ebabae355f26d9579fe194fa32c3425c0fb8d4cabb6f7f34e8596026e0cedba5f65fc0036f432d91f6a20bf689938717db1e4f235 -DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369 +AUX plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch 1136 BLAKE2B 8e10813738c6018e60d33566172fb23be4f4ae198633aeb8b5d596724d30a30c98ec491a967880b0146ce39c06af9640e711ea0fdfae4d6a67cf351f798d66e7 SHA512 024b9c7c82547890401142691669068455141145d77032830b713d2b8cf839b30fb200c0935d1c42e91cdf3cf51743a4219751ccad618f51043acd80e882191d DIST plasma-workspace-5.17.4.tar.xz 4962200 BLAKE2B 2050dbf77dbdf144017e0ddf4b827b9dbe27b8f475eedaed969a442e036f162cabad5d6b47fd650491ed5989cade48ebafbd5f599dbc790c14515ce01ebfd626 SHA512 3f5aa07ccd19604bc399bb1d30dd16ac82e1405613c1f4a939e3c2cba3b4a478213095617052440dda222f1712608533e5806939117752d31b0616a6009cf45b -EBUILD plasma-workspace-5.16.5.ebuild 4696 BLAKE2B 3701c3d0721a0ed497c7f5bf749be05c5b3071cb90b98df0bad2f0b2de0b7042b392ef7fb7ed4ffe60e4a2c08c206bee51e9f1fa49841110b78a655436acc93b SHA512 8a4ac267c2cb2207d1e44e970f88b7d33ee76282c94a2868584d836261021644b934be8ea592ec29aa5e4a0f144991b3545bfa0aebd7dc7cf3ba28bf4a20f663 -EBUILD plasma-workspace-5.17.4.ebuild 6444 BLAKE2B dd08a383c63f41091833291ef860bee4b66d43a1a53ec7064bdec985d64d083d6863eebc73862059bb08189d66b6c1d1b358fb5b8b8239ab38193dbe07a6df7b SHA512 dd384dc39ee547001d53b9f545badc0f98465763c0418acc381bc5fc3159cc3f55059968c6473cd9d7e2a8b6e6d188fdbff10d6c5b9f8264ad22d269426e66ac +DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a +EBUILD plasma-workspace-5.17.4-r1.ebuild 6844 BLAKE2B 86929dad901ee5d5b8d8e965b463f9ae3352f6ba9e24742969e011f48e5d5aa4738fc478aa28f185f7dd7205b45a5e1f2706d7b06c17e7a5a10b187579fd5a3e SHA512 99c6ed1d9b66e1a1ae0d6813c316306dae4cfda6e491a9d61d04196e87f391ea888f2711f20591dea0c419645c97416da96c7192e26f3f67c4b603f0ed4c6752 +EBUILD plasma-workspace-5.17.5.ebuild 6790 BLAKE2B c7bbbe3436c7f7f317ec5bd4f88a4f1842df931188afeac79fb03ab17a9c6613918ad9f69152ca8d92df6276030d00837c5546537cf136413c4f9a80430b1b40 SHA512 4103bae272daa63ca0d41a39c3dab4ae1388e7585e9754ab44745e9053702dec23069e8cf717a22ce2375a38d13fcd85a763ec9350f6e7daea8dc27aeeb65af1 MISC metadata.xml 643 BLAKE2B 28c9374aff890daac8a279eee05792f453a1e15b81d4e8182c3ff1bfb352e00859ede5792580b171615bc0af866fd8f5060486fb2fc3013d408a36343f78c2ba SHA512 eb5d1e325403d3f22422642b6d32a250f4450b06bf0f1275bc88b5dcae004ccb0f12bab318d36a24991bf2bffc590fcf7d43419d58e3d2bf9a396ed7e3f8778c diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch deleted file mode 100644 index de56ffe236c7..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a9b685f0dab7f21dfa3ed55011c035bab1c972d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= <koalinux@gmail.com> -Date: Tue, 1 Aug 2017 23:09:24 +0300 -Subject: [PATCH] Source files in /etc/plasma/{startup,shutdown} - ---- - startkde/startplasmacompositor.cmake | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake -index 5bcf26a..e965f19 100644 ---- a/startkde/startplasmacompositor.cmake -+++ b/startkde/startplasmacompositor.cmake -@@ -157,6 +157,11 @@ for prefix in `echo $scriptpath`; do - done - done - -+# Gentoo part for FHS installs -+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do -+ test -r "${file}" && . "${file}" -+done -+ - echo 'startplasmacompositor: Starting up...' 1>&2 - - # Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. -@@ -232,6 +237,11 @@ fi - - echo 'startplasmacompositor: Shutting down...' 1>&2 - -+# Gentoo part for FHS installs -+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do -+ test -r "${file}" && . "${file}" -+done -+ - unset KDE_FULL_SESSION - xprop -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --- -2.13.0 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch deleted file mode 100644 index 44e86a0169c3..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bf569560bf195ac4e79d65d4103a7161a6a2f2ac Mon Sep 17 00:00:00 2001 -From: Elias Probst <mail@eliasprobst.eu> -Date: Sat, 4 Jul 2015 11:33:01 +0200 -Subject: [PATCH] [startkde] Gentoo FHS script support - ---- - startkde/startkde.cmake | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 2585600..9350158 100644 ---- a/startkde/startkde.cmake -+++ b/startkde/startkde.cmake -@@ -210,6 +210,11 @@ for prefix in `echo $scriptpath`; do - done - done - -+# Gentoo part for FHS installs -+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do -+ test -r "${file}" && . "${file}" -+done -+ - # Set a left cursor instead of the standard X11 "X" cursor, since I've heard - # from some users that they're confused and don't know what to do. This is - # especially necessary on slow machines, where starting KDE takes one or two -@@ -417,6 +422,11 @@ for prefix in `echo "$scriptpath"`; do - done - done - -+# Gentoo part for FHS installs -+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do -+ test -r "${file}" && . "${file}" -+done -+ - unset KDE_FULL_SESSION - xprop -root -remove KDE_FULL_SESSION - unset KDE_SESSION_VERSION --- -2.3.6 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch deleted file mode 100644 index a851f5f54b82..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch +++ /dev/null @@ -1,91 +0,0 @@ -From bcabb38b1f07a52847752fb54eb61696a1312a61 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 2 Jul 2019 10:13:54 +0200 -Subject: [PATCH] Fix Name conflict between plasma.desktop and - plasmawayland.desktop - -Summary: -SDDM as of 0.18.1 appends " (Wayland)" to the Name of any session file it -finds in wayland-sessions dir, and Plasma is relying on that behaviour to -distinguish between its X11 and Wayland sessions. This leads to duplicate -"Plasma" entries on any other DM not applying the same hack, e.g. lightdm, -and users are lost without downstream patching. - -Instead of waiting for which of (SDDM, Plasma) is doing something about -it first, renaming X11 session to "Plasma on Xorg" appears to be the most -elegant solution out of the deadlock. SDDM can be fixed any time later. - -CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409 -See also: https://github.com/sddm/sddm/pull/997 - -Reviewers: #plasma - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D22210 ---- - plasma.desktop.cmake | 46 +---------------------------- - 1 file changed, 1 insertion(+), 45 deletions(-) - -diff --git a/plasma.desktop.cmake b/plasma.desktop.cmake -index 4d361606d..099de2908 100644 ---- a/plasma.desktop.cmake -+++ b/plasma.desktop.cmake -@@ -3,51 +3,7 @@ Type=XSession - Exec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11 - TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11 - DesktopNames=KDE --Name=Plasma --Name[ar]=بلازما --Name[bs]=Plazma --Name[ca]=Plasma --Name[ca@valencia]=Plasma --Name[cs]=Plasma --Name[da]=Plasma --Name[de]=Plasma --Name[el]=Plasma --Name[en_GB]=Plasma --Name[es]=Plasma --Name[et]=Plasma --Name[eu]=Plasma --Name[fi]=Plasma --Name[fr]=Plasma --Name[gl]=Plasma --Name[he]=פלזמה --Name[hu]=Plasma --Name[id]=Plasma --Name[is]=Plasma --Name[it]=Plasma --Name[ja]=プラズマ --Name[ko]=Plasma --Name[lt]=Plasma --Name[nb]=Plasma --Name[nds]=Plasma --Name[nl]=Plasma --Name[nn]=Plasma --Name[pa]=ਪਲਾਜ਼ਮਾ --Name[pl]=Plazma --Name[pt]=Plasma --Name[pt_BR]=Plasma --Name[ru]=Plasma --Name[sk]=Plasma --Name[sl]=Plasma --Name[sr]=Плазма --Name[sr@ijekavian]=Плазма --Name[sr@ijekavianlatin]=Plasma --Name[sr@latin]=Plasma --Name[sv]=Plasma --Name[tr]=Plama --Name[uk]=Плазма --Name[x-test]=xxPlasmaxx --Name[zh_CN]=Plasma --Name[zh_TW]=Plasma -+Name=Plasma on Xorg - Comment=Plasma by KDE - Comment[ar]=بلازما كدي - Comment[bs]=Plazma od strane KDe --- -2.22.0 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch deleted file mode 100644 index dc5214b30361..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch +++ /dev/null @@ -1,25 +0,0 @@ -See also: https://phabricator.kde.org/D22691 - -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ - include(KDEPackageAppTemplates) - - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS -- Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet -+ Plasma DocTools Runner NotifyConfig Su NewStuff Wallet - IdleTime Declarative I18n KCMUtils TextWidgets KDELibs4Support Crash GlobalAccel - DBusAddons Wayland CoreAddons) - find_package(KDED CONFIG REQUIRED) -diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt ---- a/dataengines/CMakeLists.txt -+++ b/dataengines/CMakeLists.txt -@@ -24,7 +24,6 @@ - add_subdirectory(time) - add_subdirectory(weather) - add_subdirectory(statusnotifieritem) --add_subdirectory(share) - - if(NOT WIN32) - add_subdirectory(mouse) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch new file mode 100644 index 000000000000..c6d2f4425dad --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch @@ -0,0 +1,38 @@ +From 895e31d6946b63ddba923e58eb08d1ece7de85df Mon Sep 17 00:00:00 2001 +From: Tranter Madi <trmdi@yandex.com> +Date: Wed, 4 Dec 2019 20:34:49 -0700 +Subject: Use the right value of EnableMagicMimeActions + +Summary: BUG: 409801 + +Test Plan: The bug is fixed. + +Reviewers: #plasma, ngraham, apol + +Reviewed By: ngraham + +Subscribers: davidedmundson, ngraham, plasma-devel, #plasma + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D25310 +--- + klipper/urlgrabber.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp +index 28d8ce0..eef9784 100644 +--- a/klipper/urlgrabber.cpp ++++ b/klipper/urlgrabber.cpp +@@ -102,8 +102,7 @@ void URLGrabber::setActionList( const ActionList& list ) + void URLGrabber::matchingMimeActions(const QString& clipData) + { + QUrl url(clipData); +- KConfigGroup cg(KSharedConfig::openConfig(), "Actions"); +- if(!cg.readEntry("EnableMagicMimeActions",true)) { ++ if(!KlipperSettings::enableMagicMimeActions()) { + //qCDebug(KLIPPER_LOG) << "skipping mime magic due to configuration"; + return; + } +-- +cgit v1.1 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild deleted file mode 100644 index ee469f3edd9b..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 qmake-utils - -DESCRIPTION="KDE Plasma workspace" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd" - -REQUIRED_USE="gps? ( geolocation )" - -COMMON_DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_plasma_dep kscreenlocker) - $(add_plasma_dep kwin) - $(add_plasma_dep libksysguard) - $(add_plasma_dep libkworkspace) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtsql) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) - calendar? ( $(add_frameworks_dep kholidays) ) - geolocation? ( $(add_frameworks_dep networkmanager-qt) ) - gps? ( sci-geosciences/gpsd ) - qalculate? ( sci-libs/libqalculate:= ) - qrcode? ( $(add_frameworks_dep prison) ) - semantic-desktop? ( $(add_frameworks_dep baloo) ) -" -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtconcurrent) - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kdesu) - $(add_frameworks_dep kirigami) - $(add_kdeapps_dep kio-extras) - $(add_plasma_dep ksysguard) - $(add_plasma_dep milou) - $(add_plasma_dep plasma-integration) - $(add_qt_dep qdbus) - $(add_qt_dep qtgraphicaleffects) - $(add_qt_dep qtpaths) - $(add_qt_dep qtquickcontrols 'widgets') - $(add_qt_dep qtquickcontrols2) - app-text/iso-codes - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - systemd? ( sys-apps/dbus[user-session] ) - !systemd? ( sys-apps/dbus ) - !<kde-plasma/plasma-desktop-5.14.80:5 -" -PDEPEND=" - $(add_plasma_dep kde-cli-tools) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.14.80-startkde-script.patch" - "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" - "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" - "${FILESDIR}/${PN}-5.16.3-x11sessionrename.patch" - "${FILESDIR}/${PN}-5.16.4-no-share-dataengine.patch" -) - -RESTRICT+=" test" - -src_prepare() { - kde5_src_prepare - - 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 -} - -src_configure() { - local mycmakeargs=( - -DBUILD_xembed-sni-proxy=OFF - $(cmake-utils_use_find_package appstream AppStreamQt) - $(cmake-utils_use_find_package calendar KF5Holidays) - $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt) - $(cmake-utils_use_find_package qalculate Qalculate) - $(cmake-utils_use_find_package qrcode KF5Prison) - $(cmake-utils_use_find_package semantic-desktop KF5Baloo) - ) - - use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) ) - - kde5_src_configure -} - -src_install() { - kde5_src_install - - # startup and shutdown scripts - insinto /etc/plasma/startup - doins "${FILESDIR}/10-agent-startup.sh" - - insinto /etc/plasma/shutdown - doins "${FILESDIR}/10-agent-shutdown.sh" -} - -pkg_postinst () { - kde5_pkg_postinst - - elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," - elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and" - elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" -} diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild new file mode 100644 index 000000000000..d1821bb98a65 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild @@ -0,0 +1,220 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.64.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE Plasma workspace" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="amd64 ~arm arm64 x86" +IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd" + +REQUIRED_USE="gps? ( geolocation )" + +# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0 +COMMON_DEPEND=" + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${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/kidletime-${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/kpackage-${KFMIN}:5 + >=kde-frameworks/kpeople-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktexteditor-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwayland-${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-plasma/kscreenlocker-${PVCUT}:5 + >=kde-plasma/kwin-${PVCUT}:5 + >=kde-plasma/libkscreen-${PVCUT}:5 + >=kde-plasma/libksysguard-${PVCUT}:5 + >=kde-plasma/libkworkspace-${PVCUT}:5 + >=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/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + media-libs/phonon[qt5(+)] + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXtst + x11-libs/xcb-util + x11-libs/xcb-util-image + appstream? ( dev-libs/appstream[qt5] ) + calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) + geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) + gps? ( sci-geosciences/gpsd ) + qalculate? ( sci-libs/libqalculate:= ) + qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kdesu-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-apps/kio-extras-19.04.3:5 + >=kde-plasma/ksysguard-${PVCUT}:5 + >=kde-plasma/milou-${PVCUT}:5 + >=kde-plasma/plasma-integration-${PVCUT}:5 + >=dev-qt/qdbus-${QTMIN}:5 + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtpaths-${QTMIN}:5 + >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + app-text/iso-codes + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + x11-apps/xsetroot + systemd? ( sys-apps/dbus[user-session] ) + !systemd? ( sys-apps/dbus ) + !<kde-plasma/plasma-desktop-5.16.80:5 +" +PDEPEND=" + >=kde-plasma/kde-cli-tools-${PVCUT}:5 +" + +PATCHES=( + "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" + "${FILESDIR}/${PN}-5.17.2-waylandsessionrename.patch" + "${FILESDIR}/${P}-fix-disable-mime-based-actions.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 +} + +src_configure() { + local mycmakeargs=( + -DBUILD_xembed-sni-proxy=OFF + $(cmake_use_find_package appstream AppStreamQt) + $(cmake_use_find_package calendar KF5Holidays) + $(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) + ) + + use gps && mycmakeargs+=( $(cmake_use_find_package gps libgps) ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + + # default startup and shutdown scripts + insinto /etc/xdg/plasma-workspace/env + doins "${T}"/10-agent-startup.sh + + insinto /etc/xdg/plasma-workspace/shutdown + doins "${T}"/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 + + elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," + elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" + elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" +} diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.5.ebuild index b522d47f4492..682fbeb00f29 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,6 +22,14 @@ REQUIRED_USE="gps? ( geolocation )" # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0 COMMON_DEPEND=" + >=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/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/kactivities-stats-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 @@ -65,14 +73,6 @@ COMMON_DEPEND=" >=kde-plasma/libkscreen-${PVCUT}:5 >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 - >=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/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE @@ -98,18 +98,18 @@ DEPEND="${COMMON_DEPEND} x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} - >=kde-frameworks/kdesu-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-apps/kio-extras-19.04.3:5 - >=kde-plasma/ksysguard-${PVCUT}:5 - >=kde-plasma/milou-${PVCUT}:5 - >=kde-plasma/plasma-integration-${PVCUT}:5 + app-text/iso-codes >=dev-qt/qdbus-${QTMIN}:5 >=dev-qt/qtgraphicaleffects-${QTMIN}:5 >=dev-qt/qtpaths-${QTMIN}:5 >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] >=dev-qt/qtquickcontrols2-${QTMIN}:5 - app-text/iso-codes + >=kde-apps/kio-extras-19.04.3:5 + >=kde-frameworks/kdesu-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-plasma/ksysguard-${PVCUT}:5 + >=kde-plasma/milou-${PVCUT}:5 + >=kde-plasma/plasma-integration-${PVCUT}:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb @@ -129,15 +129,42 @@ PATCHES=( RESTRICT+=" test" -# used for agent scripts migration -OLDST=/etc/plasma/startup/10-agent-startup.sh -NEWST=/etc/xdg/plasma-workspace/env/10-agent-startup.sh -OLDSH=/etc/plasma/shutdown/10-agent-shutdown.sh -NEWSH=/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh +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 @@ -165,41 +192,28 @@ src_install() { ecm_src_install # default startup and shutdown scripts - insinto "$(dirname ${NEWST})" - doins "${FILESDIR}/$(basename ${NEWST})" + insinto /etc/xdg/plasma-workspace/env + doins "${T}"/10-agent-startup.sh - insinto "$(dirname ${NEWSH})" - doins "${FILESDIR}/$(basename ${NEWSH})" - fperms +x "${NEWSH}" -} - -pkg_preinst() { - ecm_pkg_preinst - - # migrate existing agent scripts to new layout if no files there yet - if [[ -r "${EROOT}${OLDST}" && ! -f "${EROOT}${NEWST}" ]]; then - mkdir -p "${EROOT}$(dirname ${NEWST})" && cp "${EROOT}${OLDST}" "${EROOT}${NEWST}" && \ - elog "${EROOT}${OLDST} has been migrated to ${EROOT}${NEWST}, please delete old file." - fi - if [[ -r "${EROOT}${OLDSH}" && ! -f "${EROOT}${NEWSH}" ]]; then - mkdir -p "${EROOT}$(dirname ${NEWSH})" && cp "${EROOT}${OLDSH}" "${EROOT}${NEWSH}" && \ - chmod +x "${EROOT}${NEWSH}" && \ - elog "${EROOT}${OLDSH} has been migrated to ${EROOT}${NEWSH}, please delete old file." - fi + insinto /etc/xdg/plasma-workspace/shutdown + doins "${T}"/10-agent-shutdown.sh + fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh } pkg_postinst () { ecm_pkg_postinst - # warn about any leftover user scripts - if [[ -d "${EROOT}"/etc/plasma/startup && -n "$(ls "${EROOT}"/etc/plasma/startup)" ]] || \ - [[ -d "${EROOT}"/etc/plasma/shutdown && -n "$(ls "${EROOT}"/etc/plasma/shutdown)" ]]; then - elog "You appear to have scripts in ${EROOT}/etc/plasma/{startup,shutdown}." - elog "They will no longer work since plasma-workspace-5.17" + # 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 - elog " * Edit ${EROOT}${NEWST} and uncomment" - elog " the lines enabling ssh-agent." - elog " * Edit ${EROOT}${NEWSH} uncomment" - elog " the respective lines to properly kill the agent when the session ends." + elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," + elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" + elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" } |