rpms
/
plasma-desktop
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport 5.6 branch fixes

Browse Source
epel9
Rex Dieter 9 years ago
parent 988fcb125d
commit 67a25f6151
7 changed files with 376 additions and 6 deletions
Show Stats Download Patch File Download Diff File

92
0001-Fix-icon-never-turning-visible-when-transitioning-fr.patch
Unescape View File

@ -0,0 +1,92 @@
From b55b14a00785e454ab5f0bc80a1bb8da4ecfd944 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Thu, 12 May 2016 17:36:57 +0900
Subject: [PATCH 1/6] Fix icon never turning visible when transitioning from
startup.
Also stops blanking the icon while running the startup throbber, which
we used to do to hide ugly morphs from launcher to window icons, which
we no longer need to do since we default to launcher icons.
BUG:362957
---
applets/taskmanager/package/contents/ui/Task.qml | 36 ++++++------------------
1 file changed, 9 insertions(+), 27 deletions(-)
diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml
index 25ac039..2d94b0f 100644
--- a/applets/taskmanager/package/contents/ui/Task.qml
+++ b/applets/taskmanager/package/contents/ui/Task.qml
@@ -75,9 +75,6 @@ MouseArea {
onIsStartupChanged: {
if (!isStartup) {
tasks.itemGeometryChanged(task, itemId);
- busyIndicator.visible = false;
- busyIndicator.running = false;
- icon.visible = true;
}
}
@@ -299,19 +296,21 @@ MouseArea {
anchors.fill: parent
- visible: false
-
active: task.containsMouse || task.showingContextMenu
enabled: true
usesPlasmaTheme: false
source: model.DecorationRole
+ }
- onVisibleChanged: {
- if (visible && busyIndicator) {
- busyIndicator.destroy();
- }
- }
+ PlasmaComponents.BusyIndicator {
+ id: busyIndicator
+
+ anchors.fill: parent
+
+ visible: (model.IsStartup === true)
+
+ running: visible
}
Loader {
@@ -322,16 +321,6 @@ MouseArea {
&& icon.visible && task.smartLauncherItem && task.smartLauncherItem.countVisible
}
- PlasmaComponents.BusyIndicator {
- id: busyIndicator
-
- anchors.fill: parent
-
- visible: false
-
- running: false
- }
-
states: [
// Using a state transition avoids a binding loop between label.visible and
// the text label margin, which derives from the icon width.
@@ -422,13 +411,6 @@ MouseArea {
]
Component.onCompleted: {
- if (model.IsStartup) {
- busyIndicator.running = true;
- busyIndicator.visible = true;
- } else {
- icon.visible = true;
- }
-
if (model.hasModelChildren) {
var component = Qt.createComponent("GroupExpanderOverlay.qml");
component.createObject(task);
--
2.7.4

27
0002-Clear-error-string-on-refresh.patch
Unescape View File

@ -0,0 +1,27 @@
From 99e278d7635986f3aa3cea19d98526803689b962 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Mon, 16 May 2016 21:29:33 +0900
Subject: [PATCH 2/6] Clear error string on refresh.
BUG:363112
---
containments/desktop/plugins/folder/foldermodel.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp
index abbd98a..d9dd8be 100644
--- a/containments/desktop/plugins/folder/foldermodel.cpp
+++ b/containments/desktop/plugins/folder/foldermodel.cpp
@@ -1416,6 +1416,9 @@ void FolderModel::pasteTo()
void FolderModel::refresh()
{
+ m_errorString.clear();
+ emit errorStringChanged();
+
m_dirModel->dirLister()->updateDirectory(m_dirModel->dirLister()->url());
}
--
2.7.4

158
0003-Cleanup-and-fixup-KConfig-handling-for-componentchoo.patch
Unescape View File

@ -0,0 +1,158 @@
From 27ebf75bd44101976d8392eec4ff4d20f495fb69 Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Tue, 17 May 2016 22:16:53 +0200
Subject: [PATCH 3/6] Cleanup and fixup KConfig handling for componentchooser
Fixup for reviews 123288 and 123281.
REVIEW: 127918
---
kcms/componentchooser/componentchooserbrowser.cpp | 4 ++--
.../componentchooserfilemanager.cpp | 2 +-
kcms/componentchooser/componentchooserterminal.cpp | 4 ++--
kcms/input/mouse.cpp | 25 +++++++++++-----------
kcms/migrationlib/kdelibs4config.h | 15 ++++++-------
5 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/kcms/componentchooser/componentchooserbrowser.cpp b/kcms/componentchooser/componentchooserbrowser.cpp
index 5795c2b..d2be681 100644
--- a/kcms/componentchooser/componentchooserbrowser.cpp
+++ b/kcms/componentchooser/componentchooserbrowser.cpp
@@ -83,7 +83,7 @@ void CfgBrowser::load(KConfig *)
void CfgBrowser::save(KConfig *)
{
- KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::SimpleConfig);
+ KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("kdeglobals"));
KConfigGroup config(profile, QStringLiteral("General"));
QString exec;
if (radioExec->isChecked())
@@ -97,7 +97,7 @@ void CfgBrowser::save(KConfig *)
config.writePathEntry( QStringLiteral("BrowserApplication"), exec); // KConfig::Normal|KConfig::Global
config.sync();
- Kdelibs4SharedConfig::syncConfigGroup(&config, QStringLiteral("kdeglobals"));
+ Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("General"), "kdeglobals");
KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged);
diff --git a/kcms/componentchooser/componentchooserfilemanager.cpp b/kcms/componentchooser/componentchooserfilemanager.cpp
index a04cced..f1b8071 100644
--- a/kcms/componentchooser/componentchooserfilemanager.cpp
+++ b/kcms/componentchooser/componentchooserfilemanager.cpp
@@ -106,7 +106,7 @@ void CfgFileManager::save(KConfig *)
KConfigGroup defaultApp(profile, s_DefaultApplications);
defaultApp.writeXdgListEntry(mime, QStringList(storageId));
- Kdelibs4SharedConfig::syncConfigGroup(&addedApps, QStringLiteral("mimeapps.list"));
+ Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("Added Associations"), QStringLiteral("mimeapps.list"));
profile->sync();
diff --git a/kcms/componentchooser/componentchooserterminal.cpp b/kcms/componentchooser/componentchooserterminal.cpp
index 36f1296..9df3365 100644
--- a/kcms/componentchooser/componentchooserterminal.cpp
+++ b/kcms/componentchooser/componentchooserterminal.cpp
@@ -79,13 +79,13 @@ void CfgTerminalEmulator::load(KConfig *) {
void CfgTerminalEmulator::save(KConfig *)
{
- KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::SimpleConfig);
+ KSharedConfig::Ptr profile = KSharedConfig::openConfig(QStringLiteral("kdeglobals"));
KConfigGroup config(profile, QStringLiteral("General"));
const QString terminal = terminalCB->isChecked() ? QStringLiteral("konsole") : terminalLE->text();
config.writePathEntry("TerminalApplication", terminal); // KConfig::Normal|KConfig::Global);
config.sync();
- Kdelibs4SharedConfig::syncConfigGroup(&config, QStringLiteral("kdeglobals"));
+ Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("General"), "kdeglobals");
KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged);
diff --git a/kcms/input/mouse.cpp b/kcms/input/mouse.cpp
index f7d030f..3b1f4dd 100644
--- a/kcms/input/mouse.cpp
+++ b/kcms/input/mouse.cpp
@@ -441,10 +441,10 @@ void MouseConfig::save()
settings->reverseScrollPolarity = generalTab->cbScrollPolarity->isChecked();
settings->apply();
- KConfig config( "kcminputrc", KConfig::SimpleConfig );
+ KConfig config( "kcminputrc" );
settings->save(&config);
- KConfig ac("kaccessrc", KConfig::SimpleConfig);
+ KConfig ac("kaccessrc");
KConfigGroup group = ac.group("Mouse");
@@ -728,26 +728,27 @@ void MouseSettings::apply(bool force)
void MouseSettings::save(KConfig *config)
{
- KConfigGroup group = config->group("Mouse");
- group.writeEntry("Acceleration",accelRate);
- group.writeEntry("Threshold",thresholdMove);
+ KSharedConfig::Ptr kcminputProfile = KSharedConfig::openConfig("kcminputrc");
+ KConfigGroup kcminputGroup(kcminputProfile, "Mouse");
+ kcminputGroup.writeEntry("Acceleration",accelRate);
+ kcminputGroup.writeEntry("Threshold",thresholdMove);
if (handed == RIGHT_HANDED)
- group.writeEntry("MouseButtonMapping",QString("RightHanded"));
+ kcminputGroup.writeEntry("MouseButtonMapping",QString("RightHanded"));
else
- group.writeEntry("MouseButtonMapping",QString("LeftHanded"));
- group.writeEntry( "ReverseScrollPolarity", reverseScrollPolarity );
+ kcminputGroup.writeEntry("MouseButtonMapping",QString("LeftHanded"));
+ kcminputGroup.writeEntry( "ReverseScrollPolarity", reverseScrollPolarity );
- Kdelibs4SharedConfig::syncConfigGroup(&group, "kinputrc");
+ Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("Mouse"), "kcminputrc");
- KSharedConfig::Ptr profile = KSharedConfig::openConfig("kdeglobals", KConfig::SimpleConfig);
- group = KConfigGroup(profile, "KDE");
+ KSharedConfig::Ptr profile = KSharedConfig::openConfig("kdeglobals");
+ KConfigGroup group(profile, "KDE");
group.writeEntry("DoubleClickInterval", doubleClickInterval, KConfig::Persistent);
group.writeEntry("StartDragTime", dragStartTime, KConfig::Persistent);
group.writeEntry("StartDragDist", dragStartDist, KConfig::Persistent);
group.writeEntry("WheelScrollLines", wheelScrollLines, KConfig::Persistent);
group.writeEntry("SingleClick", singleClick, KConfig::Persistent);
- Kdelibs4SharedConfig::syncConfigGroup(&group, "kdeglobals");
+ Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("KDE"), "kdeglobals");
group.sync();
config->sync();
diff --git a/kcms/migrationlib/kdelibs4config.h b/kcms/migrationlib/kdelibs4config.h
index bb2dca2..a2f4139 100644
--- a/kcms/migrationlib/kdelibs4config.h
+++ b/kcms/migrationlib/kdelibs4config.h
@@ -25,18 +25,15 @@
class Kdelibs4SharedConfig
{
public:
- static KSharedConfig::Ptr openConfig(const QString &fileName, KConfig::OpenFlags mode=KConfig::SimpleConfig)
+ static void syncConfigGroup(const QLatin1String &sourceGroup, const QString &fileName)
{
Kdelibs4Migration migration;
QString configDirPath = migration.saveLocation("config");
- return KSharedConfig::openConfig(configDirPath + '/' + fileName);
- }
-
- static void syncConfigGroup(KConfigGroup *sourceGroup, const QString &fileName)
- {
- KSharedConfigPtr kde4Config = openConfig(fileName);
- KConfigGroup kde4ConfigGroup = kde4Config->group(sourceGroup->name());
- sourceGroup->copyTo(&kde4ConfigGroup);
+ KSharedConfigPtr kde4Config = KSharedConfig::openConfig(configDirPath + '/' + fileName);
+ KSharedConfigPtr simpleConfig = KSharedConfig::openConfig("kdeglobals", KConfig::SimpleConfig);
+ KConfigGroup simpleConfigGroup(simpleConfig, sourceGroup);
+ KConfigGroup kde4ConfigGroup = kde4Config->group(sourceGroup);
+ simpleConfigGroup.copyTo(&kde4ConfigGroup);
kde4ConfigGroup.sync();
}
--
2.7.4

51
0004-taskmanager-Fixing-typos.patch
Unescape View File

@ -0,0 +1,51 @@
From d44faae67cf724987e7838494c5d3b01c4a0db57 Mon Sep 17 00:00:00 2001
From: Anthony Fieroni <bvbfan@abv.bg>
Date: Wed, 18 May 2016 22:26:35 +0300
Subject: [PATCH 4/6] [taskmanager] Fixing typos
REVIEW: 127753
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
---
applets/taskmanager/package/contents/ui/Task.qml | 4 ++--
applets/taskmanager/package/contents/ui/ToolTipDelegate.qml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml
index 2d94b0f..5b16cf9 100644
--- a/applets/taskmanager/package/contents/ui/Task.qml
+++ b/applets/taskmanager/package/contents/ui/Task.qml
@@ -353,7 +353,7 @@ MouseArea {
bottomMargin: taskFrame.margins.bottom
}
- visible: (inPopup || !iconsOnly && !model.IsLauncher && (parent.width - LayoutManager.horizontalMargins()) >= (theme.mSize(theme.defaultFont).width * 7))
+ visible: inPopup || (!iconsOnly && !model.IsLauncher && (parent.width - LayoutManager.horizontalMargins()) >= (theme.mSize(theme.defaultFont).width * 7))
enabled: true
@@ -401,7 +401,7 @@ MouseArea {
},
State {
name: "active"
- when: model.Active || groupDialog.visible && groupDialog.target == task
+ when: model.Active || (groupDialog.visible && groupDialog.target == task)
PropertyChanges {
target: frame
diff --git a/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml b/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml
index 383c4a4..2ba4ae6 100644
--- a/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml
+++ b/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml
@@ -173,7 +173,7 @@ Column {
PlasmaCore.WindowThumbnail {
id: windowThumbnail
- y: -s
+ y: _s
width: thumbnailWidth
height: thumbnailHeight
--
2.7.4

12
0001-Fix-building-on-Linux-with-clang-libc.patch → 0005-Fix-building-on-Linux-with-clang-libc.patch
Unescape View File

@ -1,7 +1,7 @@
From 3a3bbc39d5cba8d77c89f6652c5b9c24c9980497 Mon Sep 17 00:00:00 2001 From d8197688122e6b3787283ef59fa5ddd3c518662b Mon Sep 17 00:00:00 2001
From: Armin K <krejzi@email.com> From: Luca Beltrame <lbeltrame@kde.org>
Date: Sun, 13 Mar 2016 21:11:44 +0100 Date: Mon, 23 May 2016 15:42:30 +0200
Subject: [PATCH] Fix building on Linux with clang/libc++ Subject: [PATCH 5/6] Fix building on Linux with clang/libc++
When using libc++, cmath isn't being pulled in, When using libc++, cmath isn't being pulled in,
resulting in resulting in
@ -9,6 +9,8 @@ resulting in
error: no member named 'sqrt' in namespace 'std' error: no member named 'sqrt' in namespace 'std'
Adding explicit include fixes it Adding explicit include fixes it
(cherry picked from commit 3a3bbc39d5cba8d77c89f6652c5b9c24c9980497)
--- ---
kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 1 + kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
@ -26,5 +28,5 @@ index d4742bf..eb222ae 100644
#include "synapticstouchpad.h" #include "synapticstouchpad.h"
-- --
2.7.3 2.7.4

29
0006-Fix-opening-recent-docs-on-newer-KF5.patch
Unescape View File

@ -0,0 +1,29 @@
From 8a9772d8673a58583317b4906a9352d6bf44a8e2 Mon Sep 17 00:00:00 2001
From: Eike Hein <hein@kde.org>
Date: Tue, 24 May 2016 18:50:15 +0900
Subject: [PATCH 6/6] Fix opening recent docs on newer KF5.
The KActivities model can return scheme-less local paths, and execution
didn't go through the code path already handling this.
BUG:363337
---
applets/kicker/plugin/recentusagemodel.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applets/kicker/plugin/recentusagemodel.cpp b/applets/kicker/plugin/recentusagemodel.cpp
index d6fe840..0003016 100644
--- a/applets/kicker/plugin/recentusagemodel.cpp
+++ b/applets/kicker/plugin/recentusagemodel.cpp
@@ -273,7 +273,7 @@ bool RecentUsageModel::trigger(int row, const QString &actionId, const QVariant
const QString &resource = resourceAt(row);
if (!resource.startsWith(QLatin1String("applications:"))) {
- new KRun(QUrl(resource), 0);
+ new KRun(docData(resource, Kicker::UrlRole).toUrl(), 0);
return true;
}
--
2.7.4

13
plasma-desktop.spec
Unescape View File

@ -28,9 +28,14 @@ Patch101: plasma-desktop-5.4.0-default_favorites_f22.patch
Patch102: plasma-desktop-fedora_layout.patch Patch102: plasma-desktop-fedora_layout.patch
## upstream patches ## upstream patches
Patch1: 0001-Fix-icon-never-turning-visible-when-transitioning-fr.patch
Patch2: 0002-Clear-error-string-on-refresh.patch
Patch3: 0003-Cleanup-and-fixup-KConfig-handling-for-componentchoo.patch
Patch4: 0004-taskmanager-Fixing-typos.patch
Patch5: 0005-Fix-building-on-Linux-with-clang-libc.patch
Patch6: 0006-Fix-opening-recent-docs-on-newer-KF5.patch
## upstream patches (master branch) ## upstream patches (master branch)
Patch1: 0001-Fix-building-on-Linux-with-clang-libc.patch
Patch65: 0065-muon-discover-plasma-discover.patch Patch65: 0065-muon-discover-plasma-discover.patch
## upstreamable patches ## upstreamable patches
@ -183,6 +188,11 @@ BuildArch: noarch
%setup -q %setup -q
%patch1 -p1 -b .0001 %patch1 -p1 -b .0001
%patch2 -p1 -b .0002
%patch3 -p1 -b .0003
%patch4 -p1 -b .0004
%patch5 -p1 -b .0005
%patch6 -p1 -b .0006
## muon-discover => plasma-discover rename on f24+ only ## muon-discover => plasma-discover rename on f24+ only
%if 0%{?fedora} > 23 %if 0%{?fedora} > 23
%patch65 -p1 -b .0065 %patch65 -p1 -b .0065
@ -344,6 +354,7 @@ fi
%changelog %changelog
* Thu May 26 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.4-2 * Thu May 26 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.4-2
- fix kickoff kcm_useraccount => user_manager (kde#363528) - fix kickoff kcm_useraccount => user_manager (kde#363528)
- backport 5.6 branch fixes
* Sat May 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.4-1 * Sat May 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.4-1
- 5.6.4 - 5.6.4

Write Preview
Loading…
Cancel
Save