From d03cc7b82ba310ff78708608c452502599b312dc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 26 May 2016 06:18:37 -0500 Subject: [PATCH] backport 5.6 branch fixes --- ...-icons-from-config-stored-launcher-U.patch | 30 +++++++++++++++ ...Use-Has-Cumulative-instead-of-total-.patch | 34 +++++++++++++++++ ...-t-wait-for-KWin-to-start-on-Wayland.patch | 30 +++++++++++++++ 0004-PanelView-Fix-auto-hide.patch | 37 +++++++++++++++++++ plasma-workspace.spec | 15 +++++++- 5 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 0001-Don-t-read-empty-icons-from-config-stored-launcher-U.patch create mode 100644 0002-Battery-Monitor-Use-Has-Cumulative-instead-of-total-.patch create mode 100644 0003-KSplashQML-Don-t-wait-for-KWin-to-start-on-Wayland.patch create mode 100644 0004-PanelView-Fix-auto-hide.patch diff --git a/0001-Don-t-read-empty-icons-from-config-stored-launcher-U.patch b/0001-Don-t-read-empty-icons-from-config-stored-launcher-U.patch new file mode 100644 index 0000000..59b871b --- /dev/null +++ b/0001-Don-t-read-empty-icons-from-config-stored-launcher-U.patch @@ -0,0 +1,30 @@ +From 3613733a933f4010f8b570f4aa6a1f5cb4dbe5ba Mon Sep 17 00:00:00 2001 +From: Eike Hein +Date: Thu, 12 May 2016 17:34:39 +0900 +Subject: [PATCH 1/4] Don't read empty icons from config-stored launcher URL. + +CCBUG:362957 +--- + libtaskmanager/groupmanager.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libtaskmanager/groupmanager.cpp b/libtaskmanager/groupmanager.cpp +index 528a55e..fb7cdc9 100644 +--- a/libtaskmanager/groupmanager.cpp ++++ b/libtaskmanager/groupmanager.cpp +@@ -1077,7 +1077,11 @@ void GroupManager::setLauncherList(QList launcherList) + pixmap.loadFromData(bytes); + icon.addPixmap(pixmap); + } else { +- icon = QIcon::fromTheme(query.queryItemValue(QStringLiteral("icon"))); ++ QString iconName = query.queryItemValue(QStringLiteral("icon")); ++ ++ if (!iconName.isEmpty()) { ++ icon = QIcon::fromTheme(iconName); ++ } + } + + l.setQuery(QUrlQuery()); +-- +2.7.4 + diff --git a/0002-Battery-Monitor-Use-Has-Cumulative-instead-of-total-.patch b/0002-Battery-Monitor-Use-Has-Cumulative-instead-of-total-.patch new file mode 100644 index 0000000..a6be1d8 --- /dev/null +++ b/0002-Battery-Monitor-Use-Has-Cumulative-instead-of-total-.patch @@ -0,0 +1,34 @@ +From a19fcfaf90db8ebc6e704917448ccfde7ae0ae59 Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik +Date: Thu, 12 May 2016 14:44:18 +0200 +Subject: [PATCH 2/4] [Battery Monitor] Use "Has Cumulative" instead of total + battery count for tray icon + +This fixes the battery icon errorneously showing an empty red battery on a desktop +computer with a wireless mouse/keyboard; instead the "no battery" icon with a +red cross is shown. + +CHANGELOG: Battery icon no longer errorneously reports an empty battery if computer has none + +CCBUG: 362924 +Reviewed-By: mgraesslin +--- + applets/batterymonitor/package/contents/ui/CompactRepresentation.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml +index b4059cb..90d3792 100755 +--- a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml ++++ b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml +@@ -50,7 +50,7 @@ MouseArea { + Item { + id: batteryContainer + +- property bool hasBattery: view.singleBattery ? batterymonitor.batteries.count : model["Plugged in"] ++ property bool hasBattery: view.singleBattery ? view.hasBattery : model["Plugged in"] + property int percent: view.singleBattery ? pmSource.data["Battery"]["Percent"] : model["Percent"] + property bool pluggedIn: pmSource.data["AC Adapter"] && pmSource.data["AC Adapter"]["Plugged in"] && (view.singleBattery || model["Is Power Supply"]) + +-- +2.7.4 + diff --git a/0003-KSplashQML-Don-t-wait-for-KWin-to-start-on-Wayland.patch b/0003-KSplashQML-Don-t-wait-for-KWin-to-start-on-Wayland.patch new file mode 100644 index 0000000..6bdd05b --- /dev/null +++ b/0003-KSplashQML-Don-t-wait-for-KWin-to-start-on-Wayland.patch @@ -0,0 +1,30 @@ +From 9cec9ed2a87b4cba7a1092267456974f86aaf546 Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik +Date: Fri, 13 May 2016 14:14:53 +0200 +Subject: [PATCH 3/4] [KSplashQML] Don't wait for KWin to start on Wayland + +On Wayland KWin is the first thing to start, so KSplash just times out after 30s + +Differential Revision: https://phabricator.kde.org/D1606 +--- + ksplash/ksplashqml/splashapp.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/ksplash/ksplashqml/splashapp.cpp b/ksplash/ksplashqml/splashapp.cpp +index f6b69d8..b3ca365 100644 +--- a/ksplash/ksplashqml/splashapp.cpp ++++ b/ksplash/ksplashqml/splashapp.cpp +@@ -66,6 +66,10 @@ SplashApp::SplashApp(int &argc, char ** argv) + + setStage(QStringLiteral("initial")); + ++ if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) { ++ setStage(QStringLiteral("wm")); ++ } ++ + QPixmap cursor(32, 32); + cursor.fill(Qt::transparent); + setOverrideCursor(QCursor(cursor)); +-- +2.7.4 + diff --git a/0004-PanelView-Fix-auto-hide.patch b/0004-PanelView-Fix-auto-hide.patch new file mode 100644 index 0000000..31ea3b7 --- /dev/null +++ b/0004-PanelView-Fix-auto-hide.patch @@ -0,0 +1,37 @@ +From e1ae057fef297b46d17256d497e8e2f4e24c1264 Mon Sep 17 00:00:00 2001 +From: Kai Uwe Broulik +Date: Wed, 25 May 2016 14:22:47 +0200 +Subject: [PATCH 4/4] [PanelView] Fix auto hide + +The newly introduced HiddenStatus which is used by eg. the desktop pager to completely +hide itself when there is only one virtual desktop, has a higher value than +RequiresAttentionStatus for ABI compatibility reasons, so auto-hide was never actually +enabled if you had this applet (part of the default setup) with just one virtual desktop. + +BUG: 362105 +FIXED-IN: 5.6.5 + +Differential Revision: https://phabricator.kde.org/D1683 +--- + shell/panelview.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/shell/panelview.cpp b/shell/panelview.cpp +index 7809d84..4239419 100644 +--- a/shell/panelview.cpp ++++ b/shell/panelview.cpp +@@ -579,7 +579,10 @@ void PanelView::showConfigurationInterface(Plasma::Applet *applet) + void PanelView::restoreAutoHide() + { + setAutoHideEnabled(edgeActivated() +- && (!containment() || containment()->status() < Plasma::Types::RequiresAttentionStatus) ++ && (!containment() || ++ (containment()->status() < Plasma::Types::RequiresAttentionStatus ++ || containment()->status() == Plasma::Types::HiddenStatus) ++ ) + && !geometry().contains(QCursor::pos()) + ); + } +-- +2.7.4 + diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 3dd9ec0..41ed2bb 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -7,7 +7,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.6.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://quickgit.kde.org/?p=%{name}.git @@ -40,6 +40,10 @@ Patch13: startplasmacompositor.patch Patch1: kde-runtime-4.9.0-installdbgsymbols.patch ## upstream Patches +Patch101: 0001-Don-t-read-empty-icons-from-config-stored-launcher-U.patch +Patch102: 0002-Battery-Monitor-Use-Has-Cumulative-instead-of-total-.patch +Patch103: 0003-KSplashQML-Don-t-wait-for-KWin-to-start-on-Wayland.patch +Patch104: 0004-PanelView-Fix-auto-hide.patch ## master branch Patches @@ -369,6 +373,12 @@ Requires: f24-kde-theme %prep %setup -q +## upstream patches +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 + %patch1 -p1 -b .installdbgsymbols %patch10 -p1 -b .konsole-in-contextmenu %if 0%{?default_lookandfeel:1} @@ -608,6 +618,9 @@ fi %changelog +* Thu May 26 2016 Rex Dieter - 5.6.4-2 +- backport 5.6 branch fixes + * Sat May 14 2016 Rex Dieter - 5.6.4-1 - 5.6.4