diff options
author | 2016-10-14 09:59:40 +0200 | |
---|---|---|
committer | 2016-10-14 10:22:22 +0200 | |
commit | 743e84d6a370cd8ad771b20caab43c55eb1a6bb7 (patch) | |
tree | 9fb50cff3396ca298e2c51f981f8cdb2021ede9f /kde-plasma/kscreen | |
parent | net-irc/hexchat: Minor correction to the previous commit. (diff) | |
download | gentoo-743e84d6a370cd8ad771b20caab43c55eb1a6bb7.tar.gz gentoo-743e84d6a370cd8ad771b20caab43c55eb1a6bb7.tar.bz2 gentoo-743e84d6a370cd8ad771b20caab43c55eb1a6bb7.zip |
kde-plasma: Remove KDE Plasma 5.6.5
Package-Manager: portage-2.3.2
Diffstat (limited to 'kde-plasma/kscreen')
-rw-r--r-- | kde-plasma/kscreen/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/kscreen/files/kscreen-5.6.5-config-fix.patch | 159 | ||||
-rw-r--r-- | kde-plasma/kscreen/kscreen-5.6.5-r1.ebuild | 40 |
3 files changed, 0 insertions, 200 deletions
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest index 8856823c2919..cf89e4bd185d 100644 --- a/kde-plasma/kscreen/Manifest +++ b/kde-plasma/kscreen/Manifest @@ -1,4 +1,3 @@ -DIST kscreen-5.6.5.tar.xz 122108 SHA256 f9f301bde43c1171b7064834fad144bdc5df9b5882133f5a94c7dc5d27709699 SHA512 bf809392999b43b8fa3957df39a5bbf1a8a6877f7faee8ab17e91b4b68e2f892e2caa617744e8a76aadf40172c87ebbb017d48456bc3ba4e8489d754085b0b6c WHIRLPOOL 38a3cdea1786531d7bb97d5b74790b95d68ec225d8c6e537f37928fffa143e6d352f25e0beb0802eaeff51ee0531b0b425068318396140d5acb1790f11536136 DIST kscreen-5.7.5.tar.xz 109144 SHA256 8d1d8c28591b2369510440f99321b0d97468ea9aa5a6eefa2a3385671f5e56c2 SHA512 df057cb36b095385d0e634a149faabd6a7f9413256569e7a2dcb759387e80ed517ccc21b1e0a7f79950444579fb0f2e2a28ee597f1d14cd3ea9667c41517f43d WHIRLPOOL aea5c49a9b3d17d2393893097fc03902136aef15678d1139c7b6f7045d9598121b53f503dad18974e525cfe6e946415501ca20d67a6b19c6d39bd1e9b138530c DIST kscreen-5.8.0.tar.xz 112688 SHA256 fdfb6d8b98dc5c024809fc010db840f6f8f9a6a9e874c4396a30951cb1cbe1a6 SHA512 d9513f5dcedd21755bb28b705c78874d417430b34997b2558f341d48a01a3f56e1c9a17f762a182b4a41c664c043b607cda9f77a274c85e2f82414a3f0bda873 WHIRLPOOL 2bb6b64c128a2994558275becfb00ea771b5457b6ed1f85118ba96f418b7d7df10b1e2d2d4ad450eb9b7c47f8bdc0377c98392fdd6c3ecb2fc8515e84bcef2d7 DIST kscreen-5.8.1.tar.xz 112728 SHA256 d16d16a7d58e5775e0392ebb26683486d790632d71a119ffdc68c44d6e6d2d55 SHA512 26f3024c6676c14110b2e236240433f19d7ad2d16714aa6dc87bba2f423d263871d1d262557291eb8d3f4d745e99592e50bfe442166c03d0e850b9487c7c774c WHIRLPOOL e89f6f24de3cd97cc607d1c0cbe49cb88f478da4ec47f62bc207143dbad31490699f6864ecab238cc5b642132d7151d314ff14dae0616aae0fb22cfeca95cfc1 diff --git a/kde-plasma/kscreen/files/kscreen-5.6.5-config-fix.patch b/kde-plasma/kscreen/files/kscreen-5.6.5-config-fix.patch deleted file mode 100644 index 56474aaa147b..000000000000 --- a/kde-plasma/kscreen/files/kscreen-5.6.5-config-fix.patch +++ /dev/null @@ -1,159 +0,0 @@ -From: Sebastian Kügler <sebas@kde.org> -Date: Wed, 01 Jun 2016 14:54:16 +0000 -Subject: address race condition around setoperation -X-Git-Tag: v5.6.95 -X-Git-Url: http://quickgit.kde.org/?p=kscreen.git&a=commitdiff&h=17199d32f292f7c44eb8cdce5b35396d3bd19eb8 ---- -address race condition around setoperation - -Summary: -Use a timer to avoid catching configChanged signals after we set -changes. - -The long version: - -TL;DR: We have a race condition when the kscreen daemon starts. It looks -up a known config, then applies it and subsequently resaves the config. -The same happens on config changes, it writes, then re-reads and then -re-writes the config change. -I've managed to prevent this from happening by adding a timer that does -avoids saving the config as a direct reaction to our own config changes. - -So what happens on kded5 startup after loading the kscreen2 module: - -- the kscreen config is requested and received -- the kscreen daemon (KD) looks into its config directory for a suitable -config file -(a config file is identified by a combined hash of all screen -attached, so unique per connected set of outputs) -- KD usually finds a config -- KD ignores configChanged events before it starts ... -- a KScreen::SetConfigOperation to apply the "known config" -- SetConfigOperation returns after a while (say 100ms later) -- we re-enable the change monitor -- we receive a configChanged signal -- we save the new config (usually to the existing config file) - -I don't think this behavior is desirable. I don't see a reason why the -daemon should save its config right after applying it. I think this -causes more problems than we want, since the startup may overwrite the -user's config. This behavior seems to be desired by the code in KD, it's -already blocking configChanged signals during the SetOperation (which, -to be honest may result in nightmarish behavior in any way, so it might -be a kludge which aims too short). - -From libkscreen perspective, SetConfigOperation::finished cannot -guarantee that all configChanged signals are already fired and that it's -safe to watch for new, independent changes now. At least on X11, we -simply don't know, and what we can do is wait a bit and cross fingers -that we're not catching our own noise. The changed signal *may* come -from a re-request of the edid information, but this is a bit hard to -track down, and not too useful, anyway, since changed Edid may affect a -large number of a screen's properties. -In the Wayland backend, that's a different story and we can prevent this -behavior at an earlier stage, so this timer is "probably not needed" (I -haven't tested that). - -This effectively prevents KD from catching reactions to its own changes -and does not trigger saving the config file on every login. It still -reacts to changes from libkscreen, but will avoid re-saving the config a -few times. The timer may not be the neatest of solutions for this, but -it does help narrowing down the problem and may be a last resort action. -Most importantly, it avoids the re-writing of the config on startup and -plugging/unplugging a monitor effectively. - -The timer value of 100ms is also used in kwin, which should make the -behavior (which is no problem in kwin) more solid. - -CCBUG:346961 -CCBUG:358011 - -Reviewers: graesslin - -Reviewed By: graesslin - -Subscribers: plasma-devel, #plasma - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D1730 ---- - - ---- a/kded/daemon.cpp -+++ b/kded/daemon.cpp -@@ -23,6 +23,7 @@ - #include "kscreenadaptor.h" - #include "debug.h" - -+#include <QElapsedTimer> - #include <QTimer> - #include <QAction> - #include <QShortcut> -@@ -52,6 +53,7 @@ - , m_buttonTimer(new QTimer()) - , m_saveTimer(new QTimer()) - , m_lidClosedTimer(new QTimer()) -+ , m_changeBlockTimer(new QElapsedTimer()) - - { - QMetaObject::invokeMethod(this, "requestConfig", Qt::QueuedConnection); -@@ -82,6 +84,7 @@ - delete m_saveTimer; - delete m_buttonTimer; - delete m_lidClosedTimer; -+ delete m_changeBlockTimer; - - Generator::destroy(); - Device::destroy(); -@@ -112,7 +115,6 @@ - m_lidClosedTimer->setInterval(1000); - m_lidClosedTimer->setSingleShot(true); - connect(m_lidClosedTimer, &QTimer::timeout, this, &KScreenDaemon::lidClosedTimeout); -- - - connect(Device::self(), &Device::lidClosedChanged, this, &KScreenDaemon::lidClosedChanged); - connect(Device::self(), &Device::resumingFromSuspend, -@@ -145,6 +147,9 @@ - connect(new KScreen::SetConfigOperation(config), &KScreen::SetConfigOperation::finished, - [&]() { - qCDebug(KSCREEN_KDED) << "Config applied"; -+ // We enable monitoring already, but we will ignore the first signals that come -+ // in the next 100ms, since these are likely our own changes still flushing out -+ m_changeBlockTimer->start(); - setMonitorForChanges(true); - }); - } -@@ -182,6 +187,12 @@ - - void KScreenDaemon::configChanged() - { -+ if (m_changeBlockTimer->isValid() && !m_changeBlockTimer->hasExpired(100)) { -+ m_changeBlockTimer->start(); -+ qCDebug(KSCREEN_KDED) << "Change detected, but ignoring since it's our own noise"; -+ return; -+ } -+ m_changeBlockTimer->invalidate(); - qCDebug(KSCREEN_KDED) << "Change detected"; - // Reset timer, delay the writeback - m_saveTimer->start(); - ---- a/kded/daemon.h -+++ b/kded/daemon.h -@@ -27,6 +27,7 @@ - - #include "generator.h" - -+class QElapsedTimer; - class QTimer; - - namespace KScreen -@@ -79,6 +80,7 @@ - QTimer* m_buttonTimer; - QTimer* m_saveTimer; - QTimer* m_lidClosedTimer; -+ QElapsedTimer* m_changeBlockTimer; - }; - - #endif /*KSCREN_DAEMON_H*/ - diff --git a/kde-plasma/kscreen/kscreen-5.6.5-r1.ebuild b/kde-plasma/kscreen/kscreen-5.6.5-r1.ebuild deleted file mode 100644 index 8a32d0801e0c..000000000000 --- a/kde-plasma/kscreen/kscreen-5.6.5-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_TEST="forceoptional" -inherit kde5 - -DESCRIPTION="KDE Plasma screen management" -HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen" - -KEYWORDS="amd64 ~arm x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_plasma_dep libkscreen) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND} - $(add_plasma_dep kde-cli-tools) - $(add_qt_dep qtgraphicaleffects) - !kde-misc/kscreen -" - -PATCHES=( "${FILESDIR}/${P}-config-fix.patch" ) - -# bug #580440, last checked 5.6.3 -RESTRICT="test" |