rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

plasma-pk: fix plasmapkg (#1065688) 

* Sat Feb 15 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> - 6:4.12.2-3
- Plasma PackageKit integration: fix plasmapkg to not query Plasma for available
  script engines if component is not Plasma/*, but e.g. KWin/Script (#1065688)
This commit is contained in:
Kevin Kofler 2014-02-16 00:31:34 +01:00
parent cfe4b28c0f
commit 558270b8dc
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
0002-Trigger-installation-of-missing-components-when-inst.patch
View File

@ -13,7 +13,7 @@ diff -up kdelibs-4.8.90/plasma/package.cpp.libplasma-pk-0002 kdelibs-4.8.90/plas
#include "private/package_p.h" #include "private/package_p.h"
#include "private/plasmoidservice_p.h" #include "private/plasmoidservice_p.h"
#include "private/service_p.h" #include "private/service_p.h"
@@ -580,6 +583,41 @@ bool Package::installPackage(const QStri @@ -580,6 +583,42 @@ bool Package::installPackage(const QStri
// no need to remove the temp dir (which has been successfully moved if it's an archive) // no need to remove the temp dir (which has been successfully moved if it's an archive)
tempdir.setAutoRemove(false); tempdir.setAutoRemove(false);
} }
@ -35,7 +35,8 @@ diff -up kdelibs-4.8.90/plasma/package.cpp.libplasma-pk-0002 kdelibs-4.8.90/plas
+ if (serviceTypes.contains("Plasma/Wallpaper")) { + if (serviceTypes.contains("Plasma/Wallpaper")) {
+ componentTypes |= WallpaperComponent; + componentTypes |= WallpaperComponent;
+ } + }
+ if (!knownLanguages(componentTypes).contains(requiredScriptEngine)) { + if (componentTypes // ignore non-Plasma/* components (e.g. KWin/Script)
+ && !knownLanguages(componentTypes).contains(requiredScriptEngine)) {
+ // install the missing script engine + // install the missing script engine
+ // force prompting because the user has just explicitly installed a widget + // force prompting because the user has just explicitly installed a widget
+ ComponentInstaller::self()->installMissingComponent("scriptengine", requiredScriptEngine, 0, true); + ComponentInstaller::self()->installMissingComponent("scriptengine", requiredScriptEngine, 0, true);

6
kdelibs.spec
View File

@ -39,7 +39,7 @@
Summary: KDE Libraries Summary: KDE Libraries
Version: 4.12.2 Version: 4.12.2
Release: 2%{?dist} Release: 3%{?dist}
Name: kdelibs Name: kdelibs
Epoch: 6 Epoch: 6
@ -624,6 +624,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog %changelog
* Sat Feb 15 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> - 6:4.12.2-3
- Plasma PackageKit integration: fix plasmapkg to not query Plasma for available
script engines if component is not Plasma/*, but e.g. KWin/Script (#1065688)
* Sun Feb 02 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.12.2-2 * Sun Feb 02 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.12.2-2
- drop autostart-debug.patch - drop autostart-debug.patch