rpms/kdebase-runtime/F-9 kdebase-runtime-4.1.1-iconthemes-inherit.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 kdebase-runtime.spec, 1.54, 1.55 sources, 1.15, 1.16

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19575

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.1.1-iconthemes-inherit.patch 
Log Message:
* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
- 4.1.2


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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	25 Jul 2008 13:55:54 -0000	1.14
+++ .cvsignore	28 Sep 2008 20:44:21 -0000	1.15
@@ -1,2 +1 @@
-kdebase-runtime-4.0.99.tar.bz2
-kdebase-runtime-4.1.0.tar.bz2
+kdebase-runtime-4.1.2.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kdebase-runtime.spec	1 Sep 2008 16:57:55 -0000	1.54
+++ kdebase-runtime.spec	28 Sep 2008 20:44:21 -0000	1.55
@@ -9,8 +9,8 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.1.1
-Release:       2%{?dist}
+Version:       4.1.2
+Release:       1%{?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,13 @@
 
 
 %changelog
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
+- 4.1.2
+
+* 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	29 Aug 2008 18:47:11 -0000	1.15
+++ sources	28 Sep 2008 20:44:21 -0000	1.16
@@ -1 +1 @@
-f03488d19c3bd95634b797229ac55127  kdebase-runtime-4.1.1.tar.bz2
+1f17bdfa4bee4bf1c7afc2bd5bdbae59  kdebase-runtime-4.1.2.tar.bz2