rpms/kdepim/F-7 kdepim-3.5.x-kmail-imap-crash.patch, NONE, 1.1 kdepim.spec, 1.135, 1.136
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Mon Feb 18 23:39:46 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdepim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26348/F-7
Modified Files:
kdepim.spec
Added Files:
kdepim-3.5.x-kmail-imap-crash.patch
Log Message:
Sync from devel:
* Mon Feb 18 2008 Than Ngo <than at redhat.com> 3.5.9-4
- backport upstream patch to fix kmail crash on startup
kdepim-3.5.x-kmail-imap-crash.patch:
--- NEW FILE kdepim-3.5.x-kmail-imap-crash.patch ---
Index: kmail/kmfoldertree.cpp
===================================================================
--- kmail/kmfoldertree.cpp (Revision 776091)
+++ kmail/kmfoldertree.cpp (Revision 776092)
@@ -1540,8 +1540,8 @@
{
KMFolderImap *folder = static_cast<KMFolderImap*>( fti->folder()->storage() );
// if we should list all folders we limit this to the root folder
- if ( !folder->account()->listOnlyOpenFolders() &&
- fti->parent() )
+ if ( !folder->account() || ( !folder->account()->listOnlyOpenFolders() &&
+ fti->parent() ) )
return;
if ( folder->getSubfolderState() == KMFolderImap::imapNoInformation )
{
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-7/kdepim.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- kdepim.spec 15 Feb 2008 22:20:36 -0000 1.135
+++ kdepim.spec 18 Feb 2008 23:39:07 -0000 1.136
@@ -37,7 +37,7 @@
Release: 3.%{ent_date}svn.ent%{?dist}
%else
-Release: 3%{?dist}
+Release: 4%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
%endif
@@ -58,6 +58,7 @@
Patch4: kdepim-3.5.9-kde#127696.patch
## upstream patches
+Patch100: kdepim-3.5.x-kmail-imap-crash.patch
Provides: kdepim3 = %{version}-%{release}
@@ -173,6 +174,8 @@
%patch4 -p0 -b .kde127696
+%patch100 -p0 -b .kmail-imap-crash
+
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
@@ -304,6 +307,9 @@
%changelog
+* Mon Feb 18 2008 Than Ngo <than at redhat.com> 3.5.9-4
+- backport upstream patch to fix kmail crash on startup
+
* Fri Feb 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.9-3
- backport upstream fix for kde#127696 from enterprise branch
More information about the fedora-extras-commits
mailing list