diff options
author | Johannes Huber <johu@gentoo.org> | 2017-01-31 14:09:52 +0100 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2017-01-31 14:32:35 +0100 |
commit | 3d1f056d2df041d50353d9dfe95c47bf228466ab (patch) | |
tree | 612fb5ca10aa1a95ad9b55cfec6e9d524d9bbb4e /kde-plasma/plasma-workspace | |
parent | www-misc/shellinabox: turn openssl into a hard dependency and remove ssl USE ... (diff) | |
download | gentoo-3d1f056d2df041d50353d9dfe95c47bf228466ab.tar.gz gentoo-3d1f056d2df041d50353d9dfe95c47bf228466ab.tar.bz2 gentoo-3d1f056d2df041d50353d9dfe95c47bf228466ab.zip |
kde-plasma: Remove KDE Plasma 5.8.3
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'kde-plasma/plasma-workspace')
7 files changed, 0 insertions, 433 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 4a7094c8b65c..ef563582f717 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,3 +1,2 @@ DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802 -DIST plasma-workspace-5.8.3.tar.xz 6955700 SHA256 8b2f455bdf355d7d771bd6fb4e19510ec4b131c093b23268cb9c1a321c75059a SHA512 7ed6887dfd7b10c98bfba128a7d0bc6b534f067f519495fb389023308bec178043154bbe755158df6dc65623987f390389b9fde1b9d1780a87fd4450e41bdbeb WHIRLPOOL 3afa4bba6148c4e14cd17e83b71c744288a802161a711179c12b3190dc27c746d97476c8148130fd0cb39505697da1c4044af613dd4ba8ebc3a7682f4022227e DIST plasma-workspace-5.8.5.tar.xz 6989928 SHA256 6d25077205436e3e721d7dfa4dffce7aea62a6e652ee7897952885e52b2f6ea1 SHA512 c4173bd4db3dc31c0435192b1569bdb44488f9f17b4cb5468b4af562b9dbb0934106caf92ea65e9e6b24f8dadcdda08cee07d64bee8b0f52398e07f39fbb97f6 WHIRLPOOL 1f42679ab9f9e1abd446474f03cb8b65c1d49875f2f1dc689311c1e62985d7e8b4276774fc1717ad8512b8e90b1f654f5f0a93aa7da06083e5a0e4b7c5251936 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-all-outputs-known.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-all-outputs-known.patch deleted file mode 100644 index 8e5b0f3fed8d..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-all-outputs-known.patch +++ /dev/null @@ -1,71 +0,0 @@ -From: Marco Martin <notmart@gmail.com> -Date: Wed, 09 Nov 2016 14:54:42 +0000 -Subject: make sure all outputs are known -X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=b8d3e09b3687082037a6d280d2032617121ae5e5 ---- -make sure all outputs are known - -at startup, if a screen id is missing from the screenpool mapping -containment::screen() will return -1 for a moment in the startup -phase even if it has a valid lastScreen - -populate mappings of eventual missing stuff at screenpool ctor - -make sure destroyed containments don't get assigned a view - -reviewed-by: David Edmundson - -CCBUG:372099 -CCBUG:371858 -CCBUG:371991 -CCBUG:371819 -CCBUG:371734 ---- - - ---- a/shell/screenpool.cpp -+++ b/shell/screenpool.cpp -@@ -49,6 +49,17 @@ - m_idForConnector[connector] = key.toInt(); - } else if (m_idForConnector.value(connector) != key.toInt()) { - m_configGroup.deleteEntry(key); -+ } -+ } -+ -+ // if there are already connected unknown screens, map those -+ // all needs to be populated as soon as possible, otherwise -+ // containment->screen() will return an incorrect -1 -+ // at startup, if it' asked before corona::addOutput() -+ // is performed, driving to the creation of a new containment -+ for (QScreen* screen : qGuiApp->screens()) { -+ if (!m_idForConnector.contains(screen->name())) { -+ insertScreenMapping(firstAvailableId(), screen->name()); - } - } - } - ---- a/shell/shellcorona.cpp -+++ b/shell/shellcorona.cpp -@@ -1178,7 +1178,12 @@ - { - if (m_desktopContainments.contains(activity)) { - for (Plasma::Containment *cont : m_desktopContainments.value(activity)) { -- if (cont->screen() == screenNum && cont->activity() == activity) { -+ //in the case of a corrupt config file -+ //with multiple containments with same lastScreen -+ //it can happen two insertContainment happen for -+ //the same screen, leading to the old containment -+ //to be destroyed -+ if (!cont->destroyed() && cont->screen() == screenNum && cont->activity() == activity) { - return cont; - } - } -@@ -1832,6 +1837,7 @@ - // qDebug() << "ShellCorona screenForContainment: " << containment << " Last screen is " << containment->lastScreen(); - - for (auto screen : qGuiApp->screens()) { -+ // containment->lastScreen() == m_screenPool->id(screen->name()) to check if the lastScreen refers to a screen that exists/it's known - if (containment->lastScreen() == m_screenPool->id(screen->name()) && - (containment->activity() == m_activityController->currentActivity() || - containment->containmentType() == Plasma::Types::PanelContainment || containment->containmentType() == Plasma::Types::CustomPanelContainment)) { - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-dont-connect-twice.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-dont-connect-twice.patch deleted file mode 100644 index 81365ebb4927..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-dont-connect-twice.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 8a472f17ce11f3b79d740cdc21096d82b8683f3d -Author: David Edmundson <kde@davidedmundson.co.uk> -Date: Thu Nov 10 10:28:16 2016 +0000 - - Avoid connecting to screen changed signals twice - - Summary: - load() can be called multiple times; either from setShell or - loadLookAndFeelDefaultLayout. We still only want addOutput once when a - screen is added - - Reviewers: #plasma, apol - - Reviewed By: apol - - Subscribers: plasma-devel - - Tags: #plasma - - Differential Revision: https://phabricator.kde.org/D3320 - - CCBUG:372099 - CCBUG:371858 - CBUG:371991 - CCBUG:371819 - CCBUG:371734 - -diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp -index af2f555..0007f0b 100644 ---- a/shell/shellcorona.cpp -+++ b/shell/shellcorona.cpp -@@ -675,9 +675,9 @@ void ShellCorona::load() - addOutput(screen); - } - } -- connect(qGuiApp, &QGuiApplication::screenAdded, this, &ShellCorona::addOutput); -- connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &ShellCorona::primaryOutputChanged); -- connect(qGuiApp, &QGuiApplication::screenRemoved, this, &ShellCorona::screenRemoved); -+ connect(qGuiApp, &QGuiApplication::screenAdded, this, &ShellCorona::addOutput, Qt::UniqueConnection); -+ connect(qGuiApp, &QGuiApplication::primaryScreenChanged, this, &ShellCorona::primaryOutputChanged, Qt::UniqueConnection); -+ connect(qGuiApp, &QGuiApplication::screenRemoved, this, &ShellCorona::screenRemoved, Qt::UniqueConnection); - - if (!m_waitingPanels.isEmpty()) { - m_waitingPanelsTimer.start(); diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch deleted file mode 100644 index 2d4f7eca0b32..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-krunner-crash.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 238ec3ee671bcf6716348122bebefb20c25d1101 -Author: David Edmundson <kde@davidedmundson.co.uk> -Date: Thu, 17 Nov 2016 10:53:48 +0000 - - [Windowed Widgets Runner] Don't access invalid KPluginInfo - - BUG: 372017 - FIXED-IN: 5.8.4 - -diff --git a/runners/windowedwidgets/windowedwidgetsrunner.cpp b/runners/windowedwidgets/windowedwidgetsrunner.cpp -index 5ccbd27..f86159a 100644 ---- a/runners/windowedwidgets/windowedwidgetsrunner.cpp -+++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp -@@ -60,6 +60,9 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context) - - foreach (const KPluginInfo &info, Plasma::PluginLoader::self()->listAppletInfo(QString())) { - KService::Ptr service = info.service(); -+ if (!service || !service->isValid()) { -+ continue; -+ } - - if (((service->name().contains(term, Qt::CaseInsensitive) || - service->genericName().contains(term, Qt::CaseInsensitive) || diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-screenpool-screenchange.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-screenpool-screenchange.patch deleted file mode 100644 index bd668743c5fc..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-screenpool-screenchange.patch +++ /dev/null @@ -1,95 +0,0 @@ -commit 7154fb681adc73c482e862febc7ad008f77058dd -Author: David Edmundson <kde@davidedmundson.co.uk> -Date: Thu Nov 10 10:29:27 2016 +0000 - - Load screenpool at the same time as we connect to screenchanged signals - - Summary: - Otherwise we have a gap during load (waiting querying kactivities)) - between screen pool being created and us connecting to the screen - changed signals, which in turn are used to update screen pool. - - In particular the primary screen can get out of sync between the current - state and the screen pool. - - Test Plan: Based on Christopher Feck's research and initial patch - - Reviewers: #plasma - - Subscribers: mart, rwooninck, fvogt, cfeck, plasma-devel - - Tags: #plasma - - Differential Revision: https://phabricator.kde.org/D3319 - - CCBUG:372099 - CCBUG:371858 - CBUG:371991 - CCBUG:371819 - CCBUG:371734 - -diff --git a/shell/autotests/screenpooltest.cpp b/shell/autotests/screenpooltest.cpp -index 5d0522f..5fc844a 100644 ---- a/shell/autotests/screenpooltest.cpp -+++ b/shell/autotests/screenpooltest.cpp -@@ -51,6 +51,7 @@ void ScreenPoolTest::initTestCase() - cg.deleteGroup(); - cg.sync(); - m_screenPool = new ScreenPool(KSharedConfig::openConfig(), this); -+ m_screenPool->load(); - } - - void ScreenPoolTest::cleanupTestCase() -diff --git a/shell/screenpool.cpp b/shell/screenpool.cpp -index 011300d..b60cca1 100644 ---- a/shell/screenpool.cpp -+++ b/shell/screenpool.cpp -@@ -30,6 +30,14 @@ ScreenPool::ScreenPool(KSharedConfig::Ptr config, QObject *parent) - connect(&m_configSaveTimer, &QTimer::timeout, this, [this](){ - m_configGroup.sync(); - }); -+} -+ -+void ScreenPool::load() -+{ -+ m_primaryConnector = QString(); -+ m_connectorForId.clear(); -+ m_idForConnector.clear(); -+ - QScreen *primary = qGuiApp->primaryScreen(); - if (primary) { - m_primaryConnector = primary->name(); -diff --git a/shell/screenpool.h b/shell/screenpool.h -index 046d18b..9b3a9af 100644 ---- a/shell/screenpool.h -+++ b/shell/screenpool.h -@@ -33,6 +33,7 @@ class ScreenPool : public QObject { - - public: - ScreenPool(KSharedConfig::Ptr config, QObject *parent = nullptr); -+ void load(); - ~ScreenPool() override; - - QString primaryConnector() const; -diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp -index 0007f0b..1475374 100644 ---- a/shell/shellcorona.cpp -+++ b/shell/shellcorona.cpp -@@ -627,6 +627,8 @@ void ShellCorona::load() - - disconnect(m_activityController, &KActivities::Controller::serviceStatusChanged, this, &ShellCorona::load); - -+ m_screenPool->load(); -+ - //TODO: a kconf_update script is needed - QString configFileName(QStringLiteral("plasma-") + m_shell + QStringLiteral("-appletsrc")); - -@@ -1184,7 +1186,7 @@ Plasma::Containment *ShellCorona::createContainmentForActivity(const QString& ac - //in the case of a corrupt config file - //with multiple containments with same lastScreen - //it can happen two insertContainment happen for -- //the same screen, leading to the old containment -+ //the same screen, leading to the old containment - //to be destroyed - if (!cont->destroyed() && cont->screen() == screenNum && cont->activity() == activity) { - return cont; diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-sync-app-w-applets-config.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-sync-app-w-applets-config.patch deleted file mode 100644 index 44ec35fe6ba9..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.8.3-sync-app-w-applets-config.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Wed, 09 Nov 2016 15:11:52 +0000 -Subject: Sync app config in sync with applets config -X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=329f00dc90f6645ff6e531542212ea73fb8ef274 ---- -Sync app config in sync with applets config ---- - - ---- a/shell/shellcorona.cpp -+++ b/shell/shellcorona.cpp -@@ -114,6 +114,9 @@ - m_appConfigSyncTimer.setSingleShot(true); - m_appConfigSyncTimer.setInterval(s_configSyncDelay); - connect(&m_appConfigSyncTimer, &QTimer::timeout, this, &ShellCorona::syncAppConfig); -+ //we want our application config with screen mapping to always be in sync with the applets one, so a crash at any time will still -+ //leave containments pointing to the correct screens -+ connect(this, &Corona::configSynced, this, &ShellCorona::syncAppConfig); - - m_waitingPanelsTimer.setSingleShot(true); - m_waitingPanelsTimer.setInterval(250); - diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild deleted file mode 100644 index c8e4c3ad43c0..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.8.3-r4.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 multilib qmake-utils - -DESCRIPTION="KDE Plasma workspace" -KEYWORDS="amd64 ~arm x86" -IUSE="+calendar geolocation gps prison qalculate +semantic-desktop" - -COMMON_DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(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 kdesu) - $(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 kxmlrpcclient) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_plasma_dep kscreenlocker) - $(add_plasma_dep kwin) - $(add_plasma_dep libksysguard) - $(add_qt_dep qtconcurrent) - $(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) - dev-libs/libdbusmenu-qt[qt5] - || ( >=kde-frameworks/kpackage-5.28.0-r1 <kde-frameworks/kpackage-5.28.0 ) - 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/xcb-util - x11-libs/xcb-util-image - calendar? ( $(add_kdeapps_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_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 - !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} - x11-proto/xproto -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4-startkde-script.patch" - # stable branch - "${FILESDIR}/${PN}-5.8.3-all-outputs-known.patch" - "${FILESDIR}/${PN}-5.8.3-sync-app-w-applets-config.patch" - "${FILESDIR}/${PN}-5.8.3-dont-connect-twice.patch" - "${FILESDIR}/${PN}-5.8.3-screenpool-screenchange.patch" - "${FILESDIR}/${PN}-5.8.3-krunner-crash.patch" - # master - "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" - "${FILESDIR}/${PN}-5.8.3-systray-cpuload.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 calendar KF5Holidays) - $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt) - $(cmake-utils_use_find_package gps libgps) - $(cmake-utils_use_find_package prison KF5Prison) - $(cmake-utils_use_find_package qalculate Qalculate) - $(cmake-utils_use_find_package semantic-desktop KF5Baloo) - ) - - 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 -} |