rpms/kdebase-runtime/devel kdebase-runtime-4.1.1-iconthemes-inherit.patch, NONE, 1.1 kdebase-runtime.spec, 1.67, 1.68

Than Ngo than at fedoraproject.org
Tue Sep 16 13:40:25 UTC 2008


Author: than

Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17974

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.1.1-iconthemes-inherit.patch 
Log Message:
- fix inherit issue in iconthemes, preview icons do not show



kdebase-runtime-4.1.1-iconthemes-inherit.patch:

--- NEW FILE kdebase-runtime-4.1.1-iconthemes-inherit.patch ---
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
 {
     const int size = qMin(48, icontheme.defaultSize(KIconLoader::Desktop));
     KSvgRenderer 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()) {
+      foreach(const QString &name, iconnames) {
+        K3Icon icon = KIconTheme(iconthemename).iconPath(QString("%1.png").arg(name), size, KIconLoader::MatchBest);
         if (icon.isValid()) {
             label->setPixmap(QPixmap(icon.path).scaled(size, size));
             return;
         }
-        icon = icontheme.iconPath(QString("%1.svg").arg(name), size, KIconLoader::MatchBest);
+        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);
             if( ! icon.isValid() ) {
                 continue;
             }
@@ -437,6 +438,7 @@ void loadPreview(QLabel *label, KIconThe
             label->setPixmap(pix.scaled(size, size));
             return;
         }
+      }
     }
     label->setPixmap(QPixmap());
 }


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdebase-runtime.spec	1 Sep 2008 16:56:03 -0000	1.67
+++ kdebase-runtime.spec	16 Sep 2008 13:39:54 -0000	1.68
@@ -10,7 +10,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
 Version:       4.1.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -20,6 +20,7 @@
 Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
+Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -102,6 +103,7 @@
 %patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
+%patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
 
@@ -338,6 +340,10 @@
 
 
 %changelog
+* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-3
+- fix inherit issue in iconthemes, preview icons
+  do not show
+
 * Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-2
 - fix #460710, knetattach is kio_remote's wizard program, don't show
   it in the menu.




More information about the fedora-extras-commits mailing list