[kdebase-runtime] adapted patch

[Than Ngo]

commit 3fdf38b8d246c86d8a91c03ca7f8d7c19131ed09
Author: Than Ngo <than at redhat.com>
Date:   Tue Jun 28 16:39:16 2011 +0200

    adapted patch

 ...kdebase-runtime-4.6.90-iconthemes-inherit.patch |   14 +++++++-------
 kdebase-runtime.spec                               |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/kdebase-runtime-4.1.1-iconthemes-inherit.patch b/kdebase-runtime-4.6.90-iconthemes-inherit.patch
similarity index 70%
rename from kdebase-runtime-4.1.1-iconthemes-inherit.patch
rename to kdebase-runtime-4.6.90-iconthemes-inherit.patch
index a6e437d..2a0e249 100644
--- a/kdebase-runtime-4.1.1-iconthemes-inherit.patch
+++ b/kdebase-runtime-4.6.90-iconthemes-inherit.patch
@@ -1,10 +1,10 @@
-diff -up kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp.orig kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp
---- kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp.orig	2008-09-16 13:24:43.000000000 +0200
-+++ kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp	2008-09-16 15:30:14.000000000 +0200
-@@ -415,15 +415,16 @@ void loadPreview(QLabel *label, KIconThe
+diff -up kde-runtime-4.6.90/kcontrol/icons/iconthemes.cpp.iconthemes-inherit kde-runtime-4.6.90/kcontrol/icons/iconthemes.cpp
+--- kde-runtime-4.6.90/kcontrol/icons/iconthemes.cpp.iconthemes-inherit	2011-06-22 16:30:08.000000000 +0200
++++ kde-runtime-4.6.90/kcontrol/icons/iconthemes.cpp	2011-06-28 16:30:03.000000000 +0200
+@@ -412,15 +412,16 @@ void loadPreview(QLabel *label, KIconThe
  {
      const int size = qMin(48, icontheme.defaultSize(KIconLoader::Desktop));
-     KSvgRenderer renderer;
+     QSvgRenderer renderer;
 -    foreach(const QString &name, iconnames) {
 -        K3Icon icon = icontheme.iconPath(QString("%1.png").arg(name), size, KIconLoader::MatchBest);
 +    foreach(const QString &iconthemename, QStringList() << icontheme.internalName() << icontheme.inherits()) {
@@ -18,11 +18,11 @@ diff -up kdebase-runtime-4.1.1/kcontrol/icons/iconthemes.cpp.orig kdebase-runtim
 +        icon = KIconTheme(iconthemename).iconPath(QString("%1.svg").arg(name), size, KIconLoader::MatchBest);
          if( ! icon.isValid() ) {
 -            icon = icontheme.iconPath(QString("%1.svgz").arg(name), size, KIconLoader::MatchBest);
-+            icon = KIconTheme(iconthemename).iconPath(QString("%1.svgz").arg(name), size, KIconLoader::MatchBest);
++            icon = KIconTheme(iconthemename).iconPath(QString("%1.svg").arg(name), size, KIconLoader::MatchBest);
              if( ! icon.isValid() ) {
                  continue;
              }
-@@ -437,6 +438,7 @@ void loadPreview(QLabel *label, KIconThe
+@@ -434,6 +435,7 @@ void loadPreview(QLabel *label, KIconThe
              label->setPixmap(pix.scaled(size, size));
              return;
          }
diff --git a/kdebase-runtime.spec b/kdebase-runtime.spec
index 26f2d46..8bb6415 100644
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@ -27,7 +27,7 @@ Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 
 # make icontheme inherit working
-Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
+Patch3:        kdebase-runtime-4.6.90-iconthemes-inherit.patch
 
 # add OnlyShowIn=KDE  to Desktop/Home.desktop (like trash.desktop)
 Patch6:        kdebase-runtime-4.3.3-home_onlyshowin_kde.patch