diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-12 17:05:19 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-12 17:22:16 +0200 |
commit | 0393d101c6723f32717cbf5670f5e95a9d058f67 (patch) | |
tree | aed5afc77299083b42726989b7d2e165e1e5c022 /kde-plasma/plasma-workspace/files | |
parent | dev-util/eric: remove old (diff) | |
download | gentoo-0393d101c6723f32717cbf5670f5e95a9d058f67.tar.gz gentoo-0393d101c6723f32717cbf5670f5e95a9d058f67.tar.bz2 gentoo-0393d101c6723f32717cbf5670f5e95a9d058f67.zip |
kde-plasma: Drop KDE Plasma 5.9.5
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Diffstat (limited to 'kde-plasma/plasma-workspace/files')
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-pinned-launchers.patch | 56 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-startup-crash.patch | 47 |
2 files changed, 0 insertions, 103 deletions
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-pinned-launchers.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-pinned-launchers.patch deleted file mode 100644 index ea1084d417d2..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-pinned-launchers.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 89b244a1ff72925805da6e5f44979ad4cb647468 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org> -Date: Mon, 22 May 2017 10:08:16 +0200 -Subject: We should not forget the launchers that are not currently shown - -Summary: -The pinned launchers that are assigned to other activities -will have a -1 as the order. We should not forget them -when saving to the configuration file. - -Reviewers: hein, mart - -Reviewed By: hein - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D5933 ---- - libtaskmanager/tasksmodel.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libtaskmanager/tasksmodel.cpp b/libtaskmanager/tasksmodel.cpp -index 19f1bca..0150761 100644 ---- a/libtaskmanager/tasksmodel.cpp -+++ b/libtaskmanager/tasksmodel.cpp -@@ -1545,6 +1545,7 @@ void TasksModel::syncLaunchers() - } - - QMap<int, QString> sortedShownLaunchers; -+ QStringList sortedHiddenLaunchers; - - foreach(const QString &launcherUrlStr, launcherList()) { - int row = -1; -@@ -1564,6 +1565,8 @@ void TasksModel::syncLaunchers() - - if (row != -1) { - sortedShownLaunchers.insert(row, launcherUrlStr); -+ } else { -+ sortedHiddenLaunchers << launcherUrlStr; - } - } - -@@ -1588,7 +1591,8 @@ void TasksModel::syncLaunchers() - d->sortedPreFilterRows.replace(sortMapIndices.at(i), preFilterRows.at(i)); - } - } -- setLauncherList(sortedShownLaunchers.values()); -+ -+ setLauncherList(sortedShownLaunchers.values() + sortedHiddenLaunchers); - d->launcherSortingDirty = false; - } - --- -cgit v0.11.2 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-startup-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-startup-crash.patch deleted file mode 100644 index 0c2e27c67ce4..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.9.5.1-startup-crash.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d602198f6807bbfa175b6aaaa1bdf1708fce703e Mon Sep 17 00:00:00 2001 -From: Marco Martin <notmart@gmail.com> -Date: Mon, 22 May 2017 17:37:56 +0200 -Subject: don't check for panel visible during startup - -if any kscreen related activities occurred -during startup, the panel wouldn't be visible -yet, and this would assert. This often happens -when a screen gets disabled at startup - -CCBUG:377280 ---- - shell/panelview.cpp | 1 + - shell/shellcorona.cpp | 6 +++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/shell/panelview.cpp b/shell/panelview.cpp -index 70d74cb..cacf0c0 100644 ---- a/shell/panelview.cpp -+++ b/shell/panelview.cpp -@@ -117,6 +117,7 @@ PanelView::~PanelView() - - KConfigGroup PanelView::panelConfig(ShellCorona *corona, Plasma::Containment *containment, QScreen *screen) - { -+ qWarning()<<"AAAA"<<containment<<screen; - if (!containment || !screen) { - return KConfigGroup(); - } -diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp -index e40da45..b6b5ed8 100644 ---- a/shell/shellcorona.cpp -+++ b/shell/shellcorona.cpp -@@ -778,7 +778,11 @@ void ShellCorona::screenInvariants() const - foreach (const PanelView *panel, panelsForScreen(screen)) { - Q_ASSERT(panel->containment()); - Q_ASSERT(panel->containment()->screen() == id || panel->containment()->screen() == -1); -- Q_ASSERT(panel->isVisible()); -+ //If any kscreen related activities occurred -+ //during startup, the panel wouldn't be visible yet, and this would assert -+ if (panel->containment()->isUiReady()) { -+ Q_ASSERT(panel->isVisible()); -+ } - } - - screens.insert(screen); --- -cgit v0.11.2 |