From 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 May 2018 14:13:35 +0100 Subject: gentoo resync : 02.05.2018 --- kde-plasma/plasma-workspace/Manifest | 7 +- .../plasma-workspace/files/10-agent-startup.sh | 2 +- .../plasma-workspace-5.12.4-bbc-weather.patch | 155 ------------------ .../plasma-workspace-5.12.4-r1.ebuild | 174 --------------------- .../plasma-workspace-5.12.5.ebuild | 171 ++++++++++++++++++++ 5 files changed, 175 insertions(+), 334 deletions(-) delete mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.12.4-bbc-weather.patch delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.12.4-r1.ebuild create mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.12.5.ebuild (limited to 'kde-plasma/plasma-workspace') diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 74b491d7e099..e00062917c18 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,13 +1,12 @@ AUX 10-agent-shutdown.sh 395 BLAKE2B ee85e72fcdf07b483b0506ee4155f2623f03052ef4066f3a6086d34fb6f03163edef16001e23ae38b872821c6e6d106f19d7e5666f4b2fdfe381c5d6370191b8 SHA512 572b8bdb3ebbaffc51de347f2770fe3f36206f9dc66e1438abf93070775f8f3936865143f090c77e2959d56546cbf311ccc5d10102f7a3fa64112cac56b3b2c6 -AUX 10-agent-startup.sh 2140 BLAKE2B 510b47dd9072893a8733d75e6154bf6a2400a7cc07a6a24866db79aea084d9a70237251a802fc697c7ed467944d0a557a25fa6dbe36b6ed84f0031d885943cef SHA512 487ae7c94ba40ab9818a8410f0da83d50c5125e10d76ecf15b316e624efd2f80398bbcdc957792153eea5c786ef0d24d7d0ce6c934a904ff3434215b73c0c133 +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.10.4-unused-dep.patch 804 BLAKE2B 7c77a4f64185f718da3e8a64540cf651f860ed6312423fce6e42ce0e86f8c7d3c4759acf206bdeeb4df5d4221c937e6771d32bb2fca05fb6cfc311f2fe2b1b96 SHA512 9718f0577ca468a6ec1eed7a665d3c0de236408b7aac442775daef4795040104a422b3c8325e5f2b9bc9e38da3f6d0dedf13826f49d3921a84960a0833557528 AUX plasma-workspace-5.11.5-CVE-2018-6790.patch 17967 BLAKE2B e9c65a902dc68f579f8b9a1f99400ae9d9b70c9c9e3e3692fd2f8d7c67638dd6527ea863ea6bfcd3afcc797ad4926a48a1de690ff7b066e547a1501481306106 SHA512 84e84b54e12ed696644ed87891056c923bafc1aa311b6f18970656e6942388557f330867a87f803c55aa212fde24fb5906e23e1d2931506ee21c0c1ca44dc2aa AUX plasma-workspace-5.11.5-CVE-2018-6791.patch 1087 BLAKE2B d388f92343bca64a810da32a12ff2572e6c2100b1ef86107f43b4e7f8e29a36764c272ba5814228c45ac671b31e35d67135e8e5d4e8df4c92037985d0f800a29 SHA512 dcdc58fe65f72325c851ff361cf47f5521f0b58e8ba2fe0715b8dc0e214b7cbff2c2e653cd06189e394c0bcdf980395942d06dbc281eb8131e228739fbdf3777 -AUX plasma-workspace-5.12.4-bbc-weather.patch 7492 BLAKE2B b1bd0bb323eeaf8cd2dfa6a70113cd5be6973c20d67f300b45c17eb7871e3527bdba74e5c79439c4f348413473c3eae11d9252d78170b5ad95a5e05d975dc667 SHA512 1de05138db5c4e94a4e76f0e2ac6c87b12999def967032d89daeb8888937de6d718e4b4dfb85ceaea6aec8a2cd3d3f3d7a3363f1b5b5aac89fda05c6cdb32065 AUX plasma-workspace-5.4-startkde-script.patch 1090 BLAKE2B bb2b0f20bbc2ed467994c98840ffeefc71d4f621713e413ff09a855689bde66b81a61e607457b3fa1ae51a67a3a3e47049193fec530448483c6f87e63f713981 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84 DIST plasma-workspace-5.11.5.tar.xz 6494360 BLAKE2B de4e3608382ab827f68d61b5095d05168a03fe8da65b219ec5b53e28506e21d5105fce0874d840eb23be1253f3bd3fb3e4ee7d0e3c5e15c895fb4b9f133c062d SHA512 6f15e529665a5fbe24ee0420d1c8fe96ff97dbd2788ae120cd1834889b307b5979ca2aedd4f97d3cadcc7ed5cdb06c0e5f9c704ec732468db4b8ecf89270826f -DIST plasma-workspace-5.12.4.tar.xz 4556108 BLAKE2B 57bc47e266f09dbeb07196b42d668ee4042d08f6853c02368aa6b96a222d72a77111048870e8019b5f391b098472ae158a04fa62f6aa74b872550d535324be91 SHA512 629f0286fffd1e90cf68611a3b14a8934e9770dd821b4c6de25549af00fefd305c848342f55559a9223199433ed8f180975ceac38765904de95179d1980fc3f5 +DIST plasma-workspace-5.12.5.tar.xz 4564204 BLAKE2B fe821adb76f7bca59f03c50a8da649c0a063a0ab61952f48c259d256b7cdfc9ec799625e2ef6b66732ffb9472148dd40d9cedc2f728a4b0fdf127ce3b61cca3b SHA512 c086b13893ab422b701e31652015618d8e3752e4ee5a8b9721eee7085307d251ea716e72bab52f458655cbf49d9a1a94deb47482fd6ecb030b20d7ea1bb52deb EBUILD plasma-workspace-5.11.5-r1.ebuild 4794 BLAKE2B d7a0482fdc50b43d822a51c8999989e648f8f17b460d0e799905ebd1f722521923a776ded6edcbbd3a929ff3ced95f975528b85252b78473d9e2fea32aa4eac2 SHA512 b4af9cb8b01b2c84dd0b2ab741d617283f7f5ee25744053aad08d31f8b399417cc2af8d141ebb09c0c1dff5e551528b99e780e766d368f7466dfbeb3d2d0dbde -EBUILD plasma-workspace-5.12.4-r1.ebuild 4754 BLAKE2B 8fe32cef78f8a3e7f60ee2db215431021c34348f84f1166cf01568faa4cf411ce624b58c74fe351fa98158ebf145d5915765e11342cb21d79e06f4fd78a4e732 SHA512 a041997c9cc616ecf83754fda8950491d4aae8e0279b71f5ce90b488ddcacac24c4921cbbf7761196abfd3a673d5f11e50f7769db9bd1cee50d362e0da51bc01 +EBUILD plasma-workspace-5.12.5.ebuild 4707 BLAKE2B d1fe8a6c2694f16c06716a6ee6ba4af66014105ee52628c372bb890bc8aa1e34d12696ad5861664020aff588fd871a223e600928804e2da58d072a7a9282cca5 SHA512 528b25f1e926ac06fa21bbb2a57423a97c9170fdb2b193d3271ab0db170859175dfc71b2eecb8c394e0e831bdc3eedb49a24968d1ed9cd32572d7cc5dfa3dc71 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f diff --git a/kde-plasma/plasma-workspace/files/10-agent-startup.sh b/kde-plasma/plasma-workspace/files/10-agent-startup.sh index fc5ba70539d9..104822c2407d 100644 --- a/kde-plasma/plasma-workspace/files/10-agent-startup.sh +++ b/kde-plasma/plasma-workspace/files/10-agent-startup.sh @@ -12,7 +12,7 @@ # # If using gpg-agent for ssh instead of ssh-agent, a GUI pinentry program # must be selected either with eselect pinentry or adding an entry to -# $HOME/.gnupg/gpg-agent.conf such as "pinentry-program /usr/bin/pinentry-qt4". +# $HOME/.gnupg/gpg-agent.conf such as "pinentry-program /usr/bin/pinentry-qt". # # If using gnupg-2.1 or later with gpg-agent for ssh instead of ssh-agent, # $HOME/.gnupg/gpg-agent.conf must be edited to include "enable-ssh-support". diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.4-bbc-weather.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.4-bbc-weather.patch deleted file mode 100644 index 01b18e1c4c08..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.4-bbc-weather.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 558a29efc4c9f055799d23ee6c75464e24489e5a Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" -Date: Fri, 30 Mar 2018 17:10:32 +0200 -Subject: [weather dataengine] Fix BBC provider to adapt to change RSS feed - -Summary: -The urls of the BBC weather feeds seem to have changed, resulting in the -dataengine to use no longer existing urls. -... -BUG: 392510 -... - -Differential Revision: https://phabricator.kde.org/D11808 ---- - dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp | 47 +++++++++++++--------- - dataengines/weather/ions/bbcukmet/ion_bbcukmet.h | 4 +- - 2 files changed, 31 insertions(+), 20 deletions(-) - -diff --git a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp -index 6acaa9b..fcf0bae 100644 ---- a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp -+++ b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp -@@ -266,7 +266,19 @@ bool UKMETIon::updateIonSource(const QString& source) - setData(source, QStringLiteral("validate"), QStringLiteral("bbcukmet|malformed")); - return true; - } -- m_place[QStringLiteral("bbcukmet|") +sourceAction[2]].XMLurl = sourceAction[3]; -+ -+ XMLMapInfo& place = m_place[QStringLiteral("bbcukmet|") + sourceAction[2]]; -+ -+ // backward compatibility after rss feed url change in 2018/03 -+ place.sourceExtraArg = sourceAction[3]; -+ if (place.sourceExtraArg.startsWith(QLatin1String("http://open.live.bbc.co.uk/"))) { -+ // Old data source id stored the full (now outdated) observation feed url -+ // http://open.live.bbc.co.uk/weather/feeds/en/STATIOID/observations.rss -+ // as extra argument, so extract the id from that -+ place.stationId = place.sourceExtraArg.section(QLatin1Char('/'), -2, -2); -+ } else { -+ place.stationId = place.sourceExtraArg; -+ } - getXMLData(sourceAction[0] + QLatin1Char('|') + sourceAction[2]); - return true; - } -@@ -288,7 +300,7 @@ void UKMETIon::getXMLData(const QString& source) - } - } - -- const QUrl url(m_place[source].XMLurl); -+ const QUrl url(QStringLiteral("https://weather-broker-cdn.api.bbci.co.uk/en/observation/rss/") + m_place[source].stationId); - - KIO::TransferJob* getJob = KIO::get(url, KIO::Reload, KIO::HideProgressInfo); - getJob->addMetaData(QStringLiteral("cookies"), QStringLiteral("none")); // Disable displaying cookies -@@ -328,13 +340,8 @@ void UKMETIon::findPlace(const QString& place, const QString& source) - void UKMETIon::getFiveDayForecast(const QString& source) - { - XMLMapInfo& place = m_place[source]; -- QUrl xmlMap(place.forecastHTMLUrl); -- -- const QString stationID = xmlMap.path().section(QLatin1Char('/'), -1); -- -- place.XMLforecastURL = QStringLiteral("http://open.live.bbc.co.uk/weather/feeds/en/") + stationID + QStringLiteral("/3dayforecast.rss") + xmlMap.query(); - -- const QUrl url(place.XMLforecastURL); -+ const QUrl url(QStringLiteral("https://weather-broker-cdn.api.bbci.co.uk/en/forecast/rss/3day/") + place.stationId); - - KIO::TransferJob* getJob = KIO::get(url, KIO::Reload, KIO::HideProgressInfo); - getJob->addMetaData(QStringLiteral("cookies"), QStringLiteral("none")); // Disable displaying cookies -@@ -362,8 +369,6 @@ void UKMETIon::readSearchHTMLData(const QString& source, const QByteArray& html) - const QString fullName = result.value(QStringLiteral("fullName")).toString(); - - if (!id.isEmpty() && !fullName.isEmpty()) { -- const QString url = QStringLiteral("http://open.live.bbc.co.uk/weather/feeds/en/") + id + QStringLiteral("/observations.rss"); -- - QString tmp = QStringLiteral("bbcukmet|") + fullName; - - // Duplicate places can exist -@@ -372,7 +377,7 @@ void UKMETIon::readSearchHTMLData(const QString& source, const QByteArray& html) - counter++; - } - XMLMapInfo& place = m_place[tmp]; -- place.XMLurl = url; -+ place.stationId = id; - place.place = fullName; - m_locations.append(tmp); - } -@@ -561,6 +566,9 @@ void UKMETIon::parseWeatherForecast(const QString& source, QXmlStreamReader& xml - if (xml.isStartElement()) { - if (elementName == QLatin1String("item")) { - parseFiveDayForecast(source, xml); -+ } else if (elementName == QLatin1String("link") && -+ xml.namespaceUri().isEmpty()) { -+ m_place[source].forecastHTMLUrl = xml.readElementText(); - } else { - parseUnknownElement(xml); - } -@@ -644,9 +652,6 @@ void UKMETIon::parseWeatherObservation(const QString& source, WeatherData& data, - } - } - -- } else if (elementName == QLatin1String("link")) { -- m_place[source].forecastHTMLUrl = xml.readElementText(); -- - } else if (elementName == QLatin1String("description")) { - QString observeString = xml.readElementText(); - const QStringList observeData = observeString.split(QLatin1Char(':')); -@@ -871,7 +876,7 @@ void UKMETIon::validate(const QString& source) - QString placeList; - for (const QString& place : qAsConst(m_locations)) { - const QString p = place.section(QLatin1Char('|'), 1, 1); -- placeList.append(QStringLiteral("|place|") + p + QStringLiteral("|extra|") + m_place[place].XMLurl); -+ placeList.append(QStringLiteral("|place|") + p + QStringLiteral("|extra|") + m_place[place].stationId); - } - if (m_locations.count() > 1) { - setData(source, QStringLiteral("validate"), -@@ -897,12 +902,18 @@ void UKMETIon::updateWeather(const QString& source) - QString weatherSource = source; - // TODO: why the replacement here instead of just a new string? - weatherSource.replace(QStringLiteral("bbcukmet|"), QStringLiteral("bbcukmet|weather|")); -- weatherSource.append(QLatin1Char('|') + place.XMLurl); -+ weatherSource.append(QLatin1Char('|') + place.sourceExtraArg); - - Plasma::DataEngine::Data data; - -- data.insert(QStringLiteral("Place"), weatherData.stationName); -- data.insert(QStringLiteral("Station"), weatherData.stationName); -+ // work-around for buggy observation RSS feed missing the station name -+ QString stationName = weatherData.stationName; -+ if (stationName.isEmpty() || stationName == QLatin1String(",")) { -+ stationName = source.section(QLatin1Char('|'), 1, 1); -+ } -+ -+ data.insert(QStringLiteral("Place"), stationName); -+ data.insert(QStringLiteral("Station"), stationName); - if (weatherData.observationDateTime.isValid()) { - data.insert(QStringLiteral("Observation Timestamp"), weatherData.observationDateTime); - } -diff --git a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h -index a1026f4..d9d3ad3 100644 ---- a/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h -+++ b/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h -@@ -155,10 +155,10 @@ private: - - private: - struct XMLMapInfo { -+ QString stationId; - QString place; -- QString XMLurl; - QString forecastHTMLUrl; -- QString XMLforecastURL; -+ QString sourceExtraArg; - }; - - // Key dicts --- -cgit v0.11.2 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.4-r1.ebuild deleted file mode 100644 index 6ed2c658078a..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.4-r1.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 prison qalculate +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 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 kjs) - $(add_frameworks_dep kjsembed) - $(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_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtscript) - $(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 ) - prison? ( $(add_frameworks_dep prison) ) - qalculate? ( sci-libs/libqalculate:= ) - semantic-desktop? ( $(add_frameworks_dep baloo) ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kded) - $(add_frameworks_dep kdesu) - $(add_kdeapps_dep kio-extras) - $(add_plasma_dep kde-cli-tools) - $(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') - app-text/iso-codes - x11-apps/mkfontdir - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xset - x11-apps/xsetroot - systemd? ( sys-apps/dbus[user-session] ) - !systemd? ( sys-apps/dbus ) - !dev-libs/xembed-sni-proxy - !kde-plasma/freespacenotifier:4 - !kde-plasma/libtaskmanager:4 - !kde-plasma/kcminit:4 - !kde-plasma/kdebase-startkde:4 - !kde-plasma/klipper:4 - !kde-plasma/krunner:4 - !kde-plasma/ksmserver:4 - !kde-plasma/ksplash:4 - !kde-plasma/plasma-workspace:4 -" -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtconcurrent) - x11-proto/xproto -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4-startkde-script.patch" - "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" - "${FILESDIR}/${PN}-5.10.4-unused-dep.patch" - "${FILESDIR}/${P}-bbc-weather.patch" -) - -RESTRICT+=" test" - -src_prepare() { - kde5_src_prepare - - sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ - -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die -} - -src_configure() { - local mycmakeargs=( - $(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 prison KF5Prison) - $(cmake-utils_use_find_package qalculate Qalculate) - $(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 - - echo - 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" - echo -} diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.5.ebuild new file mode 100644 index 000000000000..f21293f4fe5c --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.5.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 prison qalculate +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 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 kjs) + $(add_frameworks_dep kjsembed) + $(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_qt_dep qtdbus) + $(add_qt_dep qtdeclarative 'widgets') + $(add_qt_dep qtgui 'jpeg') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtscript) + $(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 ) + prison? ( $(add_frameworks_dep prison) ) + qalculate? ( sci-libs/libqalculate:= ) + semantic-desktop? ( $(add_frameworks_dep baloo) ) +" +RDEPEND="${COMMON_DEPEND} + $(add_frameworks_dep kded) + $(add_frameworks_dep kdesu) + $(add_kdeapps_dep kio-extras) + $(add_plasma_dep kde-cli-tools) + $(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') + app-text/iso-codes + x11-apps/mkfontdir + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + x11-apps/xset + x11-apps/xsetroot + systemd? ( sys-apps/dbus[user-session] ) + !systemd? ( sys-apps/dbus ) + !dev-libs/xembed-sni-proxy + !kde-plasma/freespacenotifier:4 + !kde-plasma/libtaskmanager:4 + !kde-plasma/kcminit:4 + !kde-plasma/kdebase-startkde:4 + !kde-plasma/klipper:4 + !kde-plasma/krunner:4 + !kde-plasma/ksmserver:4 + !kde-plasma/ksplash:4 + !kde-plasma/plasma-workspace:4 +" +DEPEND="${COMMON_DEPEND} + $(add_qt_dep qtconcurrent) + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}/${PN}-5.4-startkde-script.patch" + "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" + "${FILESDIR}/${PN}-5.10.4-unused-dep.patch" +) + +RESTRICT+=" test" + +src_prepare() { + kde5_src_prepare + + sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ + -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die +} + +src_configure() { + local mycmakeargs=( + $(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 prison KF5Prison) + $(cmake-utils_use_find_package qalculate Qalculate) + $(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" +} -- cgit v1.2.3