* Fri Mar 11 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.6.1-3
- set the plugin path in KApplication, don't rely on QT_PLUGIN_PATH being set, fixes kpackagekitsmarticon not getting themed (#682300, kde#267770)
This commit is contained in:
parent
cbd3aea034
commit
30fab2d5a0
27
kdelibs-4.6.1-kde#267770.patch
Normal file
27
kdelibs-4.6.1-kde#267770.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
diff -ur kdelibs-4.6.1/kdeui/kernel/kapplication.cpp kdelibs-4.6.1-kde#267770/kdeui/kernel/kapplication.cpp
|
||||||
|
--- kdelibs-4.6.1/kdeui/kernel/kapplication.cpp 2011-02-25 23:00:34.000000000 +0100
|
||||||
|
+++ kdelibs-4.6.1-kde#267770/kdeui/kernel/kapplication.cpp 2011-03-11 02:34:26.000000000 +0100
|
||||||
|
@@ -466,6 +466,23 @@
|
||||||
|
|
||||||
|
KApplication::KApp = q;
|
||||||
|
|
||||||
|
+ // ensure the KDE Qt plugins are found
|
||||||
|
+ // (QT_PLUGIN_PATH is not set in all situations.)
|
||||||
|
+ QStringList pluginPaths = KGlobal::dirs()->resourceDirs("qtplugins");
|
||||||
|
+
|
||||||
|
+ // reverse plugin paths because QCoreApplication::addLibraryPath prepends
|
||||||
|
+ QStringList pluginPathsReversed:
|
||||||
|
+ foreach (const QString &pluginPath, pluginPaths)
|
||||||
|
+ pluginPathsReversed.prepend(pluginPath);
|
||||||
|
+
|
||||||
|
+ foreach (const QString &pluginPath, pluginPathsReversed) {
|
||||||
|
+ // prevent duplicates
|
||||||
|
+ QCoreApplication::removeLibraryPath(pluginPath);
|
||||||
|
+
|
||||||
|
+ // add the path (to the front)
|
||||||
|
+ QCoreApplication::addLibraryPath(pluginPath);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
// make sure the clipboard is created before setting the window icon (bug 209263)
|
||||||
|
if(GUIenabled)
|
||||||
|
(void) QApplication::clipboard();
|
10
kdelibs.spec
10
kdelibs.spec
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.6.1
|
Version: 4.6.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -83,6 +83,9 @@ Patch24: kdelibs-4.3.1-drkonq.patch
|
|||||||
# paths (like /usr/lib64) already! With this, we can drop
|
# paths (like /usr/lib64) already! With this, we can drop
|
||||||
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
|
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
|
||||||
Patch27: kdelibs-4.5.80-no_rpath.patch
|
Patch27: kdelibs-4.5.80-no_rpath.patch
|
||||||
|
# set the plugin path in KApplication, don't rely on QT_PLUGIN_PATH being set
|
||||||
|
# fixes kpackagekitsmarticon not getting themed (#682300, kde#267770)
|
||||||
|
Patch28: kdelibs-4.6.1-kde#267770.patch
|
||||||
|
|
||||||
## upstreamable
|
## upstreamable
|
||||||
# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/
|
# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/
|
||||||
@ -272,6 +275,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||||||
%patch24 -p1 -b .drkonq
|
%patch24 -p1 -b .drkonq
|
||||||
%endif
|
%endif
|
||||||
%patch27 -p1 -b .no_rpath
|
%patch27 -p1 -b .no_rpath
|
||||||
|
%patch28 -p1 -b .kde#267770
|
||||||
|
|
||||||
# upstreamable patches
|
# upstreamable patches
|
||||||
%patch50 -p1 -b .knewstuff_gpg2
|
%patch50 -p1 -b .knewstuff_gpg2
|
||||||
@ -533,6 +537,10 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 11 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.6.1-3
|
||||||
|
- set the plugin path in KApplication, don't rely on QT_PLUGIN_PATH being set,
|
||||||
|
fixes kpackagekitsmarticon not getting themed (#682300, kde#267770)
|
||||||
|
|
||||||
* Tue Mar 08 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.1-2
|
* Tue Mar 08 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.1-2
|
||||||
- Dolphin shows no files... (kde#267709)
|
- Dolphin shows no files... (kde#267709)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user