rpms/kdebase/devel kdebase-4.0.2-favicons.patch, NONE, 1.1 kdebase.spec, 1.298, 1.299

[Lukas Tinkl (ltinkl)]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14467

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.0.2-favicons.patch 
Log Message:
upstream patch: fix infinite loop in favicons


kdebase-4.0.2-favicons.patch:

--- NEW FILE kdebase-4.0.2-favicons.patch ---
--- apps/lib/konq/favicons/favicons.cpp	2008/02/28 19:30:44	780317
+++ apps/lib/konq/favicons/favicons.cpp	2008/02/28 19:32:10	780318
@@ -232,9 +232,11 @@
         if( ir.canRead() ) {
 
             while( ir.imageCount() > 1
-              && ir.currentImageRect() != QRect( 0, 0, desired.width(), desired.height() )
-              && ir.imageCount() >= ir.currentImageNumber() )
-                ir.jumpToNextImage();
+              && ir.currentImageRect() != QRect(0, 0, desired.width(), desired.height())) {
+                if (!ir.jumpToNextImage()) {
+                    break;
+                }
+            }
             ir.setScaledSize( desired );
             QImage img = ir.read();
             if( !img.isNull() ) {


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- kdebase.spec	28 Feb 2008 17:52:48 -0000	1.298
+++ kdebase.spec	29 Feb 2008 08:40:33 -0000	1.299
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -23,7 +23,8 @@
 Group: User Interface/Desktops
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
-# upstream pathes
+# upstream patches
+Patch:     kdebase-4.0.2-favicons.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde-filesystem >= 4
@@ -129,6 +130,7 @@
 
 %prep
 %setup -q -n kdebase-%{version}
+%patch -p0 -b .favicons
 
 %build
 
@@ -307,6 +309,9 @@
 
 
 %changelog
+* Fri Feb 29 2008 Lukáš Tinkl <ltinkl at redhat.com>
+- fix favicons infinite loop
+
 * Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1
 - 4.0.2