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

Merge remote-tracking branch 'origin/master' into f14/master

This commit is contained in:
Rex Dieter 2011-03-14 07:32:34 -05:00
parent cd262aa261 91b310e667
commit a3c1583f31
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
kdelibs-4.6.1-kde#267770.patch Normal file
View File

@ -0,0 +1,43 @@
From 6eed9cd36808e77a18acf554bb5753978906c1aa Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Fri, 11 Mar 2011 21:01:24 +0100
Subject: [PATCH] Add paths to qt plugins (from kstandarddirs) before qapp is created.
Necessary for apps started through d-bus activation, so that the kde widget
style is loaded.
FIXED-IN: 4.6.2
BUG: 267770
---
kdecore/kernel/kcomponentdata.cpp | 2 +-
kdeui/kernel/kapplication.cpp | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/kdecore/kernel/kcomponentdata.cpp b/kdecore/kernel/kcomponentdata.cpp
index 38bda18..933623a 100644
--- a/kdecore/kernel/kcomponentdata.cpp
+++ b/kdecore/kernel/kcomponentdata.cpp
@@ -144,7 +144,7 @@ void KComponentDataPrivate::lazyInit(const KComponentData &component)
}
// the first KComponentData sets the KDE Qt plugin paths
- if (QCoreApplication::instance() && dirs && kdeLibraryPathsAdded != KdeLibraryPathsAddedDone) {
+ if (dirs && kdeLibraryPathsAdded != KdeLibraryPathsAddedDone) {
kdeLibraryPathsAdded = KdeLibraryPathsAddedDone;
const QStringList &plugins = dirs->resourceDirs("qtplugins");
QStringList::ConstIterator it = plugins.begin();
diff --git a/kdeui/kernel/kapplication.cpp b/kdeui/kernel/kapplication.cpp
index 1403601..8ec47ca 100644
--- a/kdeui/kernel/kapplication.cpp
+++ b/kdeui/kernel/kapplication.cpp
@@ -407,6 +407,8 @@ KApplication::KApplication(Display *display, int& argc, char** argv, const QByte
void KApplicationPrivate::preqapplicationhack()
{
preread_app_startup_id();
+
+ KGlobal::config(); // initialize qt plugin path (see KComponentDataPrivate::lazyInit)
}
int KApplication::xioErrhandler( Display* dpy )
--
1.7.1

13
kdelibs.spec
View File

@ -16,7 +16,7 @@
Summary: KDE Libraries
Version: 4.6.1
Release: 2%{?dist}
Release: 4%{?dist}
Name: kdelibs
Epoch: 6
@ -93,6 +93,9 @@ Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
## upstream
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/51707e7154082b549216b8a8ecde73505302fadc
Patch100: kdelibs-4.6.1-dirlister.patch
# set the plugin path in kdelibs, don't rely on QT_PLUGIN_PATH being set
# fixes kpackagekitsmarticon not getting themed (#682300, kde#267770)
Patch101: kdelibs-4.6.1-kde#267770.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@ -278,6 +281,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstream patches
%patch100 -p1 -b .dirlister
%patch101 -p1 -b .kde#267770
# security fix
%patch200 -p1 -b .CVE-2009-2702
@ -533,6 +537,13 @@ rm -rf %{buildroot}
%changelog
* Fri Mar 11 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.6.1-4
- use upstream patch for #682300 (kde#267770), my previous one didn't work
* 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
- Dolphin shows no files... (kde#267709)