backport fix for update scripts

epel9
Rex Dieter 10 years ago
parent b51177cfaf
commit 63abaa4023

@ -0,0 +1,32 @@
diff --git a/shell/scripting/scriptengine.cpp b/shell/scripting/scriptengine.cpp
index 9a916af..c4c60a1 100644
--- a/shell/scripting/scriptengine.cpp
+++ b/shell/scripting/scriptengine.cpp
@@ -875,7 +875,7 @@ QStringList ScriptEngine::pendingUpdateScripts(Plasma::Corona *corona)
const QString appName = corona->package().metadata().pluginName();
QStringList scripts;
- const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, appName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
+ const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "plasma/shells/" + appName + QStringLiteral("/updates"), QStandardPaths::LocateDirectory);
Q_FOREACH(const QString& dir, dirs) {
QDirIterator it(dir, QStringList() << QStringLiteral("*.js"));
while (it.hasNext()) {
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index 9f190d6..9c9d52c 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -552,7 +552,13 @@ void ShellCorona::processUpdateScripts()
qDebug() << msg;
});
foreach (const QString &script, WorkspaceScripting::ScriptEngine::pendingUpdateScripts(this)) {
- scriptEngine.evaluateScript(script);
+ QFile file(script);
+ if (file.open(QIODevice::ReadOnly | QIODevice::Text) ) {
+ QString code = file.readAll();
+ scriptEngine.evaluateScript(code);
+ } else {
+ qWarning() << "Unable to open the script file" << script << "for reading";
+ }
}
}

@ -1,6 +1,6 @@
Name: plasma-workspace Name: plasma-workspace
Version: 5.2.2 Version: 5.2.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: Plasma workspace, applications and applets Summary: Plasma workspace, applications and applets
License: GPLv2+ License: GPLv2+
URL: https://projects.kde.org/projects/kde/workspace/plasma-workspace URL: https://projects.kde.org/projects/kde/workspace/plasma-workspace
@ -26,6 +26,9 @@ Source11: startkde.cmake
# http://commits.kde.org/plasma-workspace/24f24e03793c8214a5d1f3414a5aeb48eccef4f4 # http://commits.kde.org/plasma-workspace/24f24e03793c8214a5d1f3414a5aeb48eccef4f4
Patch4: 0004-Workaround-the-lockscreen-password-field-focus-issue.patch Patch4: 0004-Workaround-the-lockscreen-password-field-focus-issue.patch
## master branch Patches
Patch5: fix-update-scripts.patch
# udev # udev
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: dbusmenu-qt5-devel BuildRequires: dbusmenu-qt5-devel
@ -274,6 +277,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/{plasma-windowed,org
%changelog %changelog
* Mon Mar 30 2015 Rex Dieter <rdieter@fedoraproject.org> 5.2.2-3
- backport fix for update scripts
* Wed Mar 25 2015 Rex Dieter <rdieter@fedoraproject.org> 5.2.2-2 * Wed Mar 25 2015 Rex Dieter <rdieter@fedoraproject.org> 5.2.2-2
- Lockscreen: Password field does not have focus (kde#344823) - Lockscreen: Password field does not have focus (kde#344823)

Loading…
Cancel
Save