rpms/kdebase4/F-8 kdebase-4.0.2-favicons.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kdebase4.spec, 1.10, 1.11 sources, 1.6, 1.7
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Sun Mar 9 02:18:15 UTC 2008
- Previous message (by thread): rpms/kdebase4/F-7 kdebase-4.0.2-favicons.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kdebase4.spec, 1.8, 1.9 sources, 1.6, 1.7
- Next message (by thread): rebuild-scripts bumpspecfile.py,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29950/F-8
Modified Files:
.cvsignore kdebase4.spec sources
Added Files:
kdebase-4.0.2-favicons.patch
Log Message:
Sync from devel:
* Fri Feb 29 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.0.2-2
- fix favicons infinite loop
* Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1
- 4.0.2
* Mon Feb 18 2008 Than Ngo <than at redhat.com> 4.0.1-4
- fix nsplugins hangs during login
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 7 Feb 2008 18:00:38 -0000 1.6
+++ .cvsignore 9 Mar 2008 02:17:42 -0000 1.7
@@ -1 +1 @@
-kdebase-4.0.1.tar.bz2
+kdebase-4.0.2.tar.bz2
Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/kdebase4.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kdebase4.spec 7 Feb 2008 18:00:38 -0000 1.10
+++ kdebase4.spec 9 Mar 2008 02:17:42 -0000 1.11
@@ -1,7 +1,7 @@
Summary: K Desktop Environment 4 - Core Files
-Version: 4.0.1
-Release: 3%{?dist}
+Version: 4.0.2
+Release: 2%{?dist}
%if 0%{?fedora} > 8
Name: kdebase
@@ -23,6 +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 patches
+Patch0: kdebase-4.0.2-favicons.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kde-filesystem >= 4
@@ -128,6 +130,7 @@
%prep
%setup -q -n kdebase-%{version}
+%patch0 -p0 -b .favicons
%build
@@ -306,6 +309,15 @@
%changelog
+* Fri Feb 29 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.0.2-2
+- fix favicons infinite loop
+
+* Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1
+- 4.0.2
+
+* Mon Feb 18 2008 Than Ngo <than at redhat.com> 4.0.1-4
+- fix nsplugins hangs during login
+
* Mon Feb 04 2008 Than Ngo <than at redhat.com> 4.0.1-3
- respin
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 7 Feb 2008 18:00:38 -0000 1.6
+++ sources 9 Mar 2008 02:17:42 -0000 1.7
@@ -1 +1 @@
-c665c4758ac8739ad120c3ca0070136a kdebase-4.0.1.tar.bz2
+19cb1996626417f2bf23e9bcbd7dbf00 kdebase-4.0.2.tar.bz2
- Previous message (by thread): rpms/kdebase4/F-7 kdebase-4.0.2-favicons.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 kdebase4.spec, 1.8, 1.9 sources, 1.6, 1.7
- Next message (by thread): rebuild-scripts bumpspecfile.py,1.21,1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list