From 67be42f91df0f4b9e2e72e2f72c4f729f18f80e8 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 14 May 2009 16:03:07 +0000 Subject: [PATCH] Use the ported kde149705 patch (accidentally committed to kdebase-workspace instead of kdelibs by than). --- ...05.patch => kdelibs-4.2.85-kde149705.patch | 30 +++++++++---------- kdelibs.spec | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) rename kdelibs-4.1.82-kde149705.patch => kdelibs-4.2.85-kde149705.patch (54%) diff --git a/kdelibs-4.1.82-kde149705.patch b/kdelibs-4.2.85-kde149705.patch similarity index 54% rename from kdelibs-4.1.82-kde149705.patch rename to kdelibs-4.2.85-kde149705.patch index 32cb216..9e7af74 100644 --- a/kdelibs-4.1.82-kde149705.patch +++ b/kdelibs-4.2.85-kde149705.patch @@ -1,19 +1,19 @@ -diff -Naurw kdelibs-4.1.82/kdeui/icons/kicontheme.cpp kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp ---- kdelibs-4.1.82/kdeui/icons/kicontheme.cpp 2008-10-23 01:05:04.000000000 +0200 -+++ kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp 2008-12-09 14:15:14.000000000 +0100 -@@ -516,7 +516,7 @@ - return *_theme; +diff -up kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.2.85/kdeui/icons/kicontheme.cpp +--- kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 2009-04-15 12:26:44.000000000 +0200 ++++ kdelibs-4.2.85/kdeui/icons/kicontheme.cpp 2009-05-11 16:01:29.000000000 +0200 +@@ -525,7 +525,7 @@ QString KIconTheme::current() + } KConfigGroup cg(KGlobal::config(), "Icons"); - *_theme = cg.readEntry("Theme", defaultThemeName()); + *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName())); - if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName(); - /* if (_theme->isEmpty()) - { -diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp ---- kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp 2008-11-28 16:40:11.000000000 +0100 -+++ kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp 2008-12-09 14:17:51.000000000 +0100 -@@ -831,7 +831,7 @@ + if ( *_theme == QLatin1String("hicolor") ) { + *_theme = defaultThemeName(); + } +diff -up kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp +--- kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 2009-03-27 15:47:33.000000000 +0100 ++++ kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp 2009-05-11 16:00:06.000000000 +0200 +@@ -856,7 +856,7 @@ void KGlobalSettings::Private::applyGUIS if (kde_overrideStyle.isEmpty()) { const QString &defaultStyle = KStyle::defaultStyle(); const KConfigGroup pConfig(KGlobal::config(), "General"); @@ -22,9 +22,9 @@ diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde14 if (styleStr.isEmpty() || // check whether we already use the correct style to return then -diff -Naurw kdelibs-4.1.82/kutils/kdeglobals.kcfg kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg ---- kdelibs-4.1.82/kutils/kdeglobals.kcfg 2008-05-21 13:08:56.000000000 +0200 -+++ kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg 2008-12-09 14:15:14.000000000 +0100 +diff -up kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.2.85/kutils/kdeglobals.kcfg +--- kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 2009-04-15 12:26:45.000000000 +0200 ++++ kdelibs-4.2.85/kutils/kdeglobals.kcfg 2009-05-11 16:00:06.000000000 +0200 @@ -24,6 +24,10 @@ The name of the widget style, for example "keramik" or "plastik". Without quotes. keramik diff --git a/kdelibs.spec b/kdelibs.spec index d4dc22f..2be6a8f 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -55,7 +55,7 @@ Source2: kde4.csh # make -devel packages parallel-installable Patch0: kdelibs-4.1.96-parallel_devel.patch # fix kde#149705 -Patch2: kdelibs-4.1.82-kde149705.patch +Patch2: kdelibs-4.2.85-kde149705.patch # Hunspell support for K3Spell # http://fedoraproject.org/wiki/Releases/FeatureDictionary # http://bugs.kde.org/show_bug.cgi?id=154561