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

Use the ported kde149705 patch (accidentally committed to kdebase-workspace instead of kdelibs by than).

This commit is contained in:
Kevin Kofler 2009-05-14 16:03:07 +00:00
parent 10ba41a1fc
commit 67be42f91d
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kdelibs-4.1.82-kde149705.patch → kdelibs-4.2.85-kde149705.patch
View File

@ -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 @@
<whatsthis>The name of the widget style, for example &quot;keramik&quot; or &quot;plastik&quot;. Without quotes.</whatsthis>
<default>keramik</default>

2
kdelibs.spec
View File

@ -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