Author: lmontel
Date: Fri Feb 2 13:49:12 2007
New Revision: 115907
Added:
packages/cooker/kdepim/current/SOURCES/kdepim-3.5.6-fix-pb-debug.patch
packages/cooker/kdepim/current/SOURCES/kdepim-3.5.6-kmail-140660.patch
packages/cooker/kdepim/current/SOURCES/kdepim-3.5.6-kmail-templates.patch
Modified:
packages/cooker/kdepim/current/SPECS/kdepim.spec
Log:
fix kmail bugs
Added: packages/cooker/kdepim/current/SOURCES/kdepim-3.5.6-fix-pb-debug.patch
==============================================================================
--- (empty file)
+++ packages/cooker/kdepim/current/SOURCES/kdepim-3.5.6-fix-pb-debug.patch
Fri Feb 2 13:49:12 2007
@@ -0,0 +1,13 @@
+--- kdepim-3.5.6/kresources/groupwise/soap/stdsoap2.h-- 2007-02-02
13:35:49.000000000 +0100
++++ kdepim-3.5.6/kresources/groupwise/soap/stdsoap2.h 2007-02-02
13:36:07.000000000 +0100
+@@ -507,8 +507,9 @@
+ # endif
+ #endif
+
++#ifdef I_KNOW_WHAT_IM_DOING
+ #define DEBUG /* Uncomment to debug sending (in file SENT.log) receiving (in
file RECV.log) and messages (in file TEST.log) */
+-
++#endif
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
Added: packages/cooker/kdepim/current/SOURCES/kdepim-3.5.6-kmail-140660.patch
==============================================================================
--- (empty file)
+++ packages/cooker/kdepim/current/SOURCES/kdepim-3.5.6-kmail-140660.patch
Fri Feb 2 13:49:12 2007
@@ -0,0 +1,19 @@
+Index: kmfolder.cpp
+===================================================================
+--- kmail/kmfolder.cpp (revision 627528)
++++ kmail/kmfolder.cpp (working copy)
+@@ -426,12 +426,12 @@ int KMFolder::moveMsg(QPtrList<KMMessage
+
+ int KMFolder::find( const KMMsgBase* msg ) const
+ {
+- return mStorage->find( msg );
++ return mStorage ? mStorage->find( msg ) : 0;
+ }
+
+ int KMFolder::find( const KMMessage* msg ) const
+ {
+- return mStorage->find( msg );
++ return mStorage ? mStorage->find( msg ) : 0;
+ }
+
+ int KMFolder::count( bool cache ) const
Added: packages/cooker/kdepim/current/SOURCES/kdepim-3.5.6-kmail-templates.patch
==============================================================================
--- (empty file)
+++ packages/cooker/kdepim/current/SOURCES/kdepim-3.5.6-kmail-templates.patch
Fri Feb 2 13:49:12 2007
@@ -0,0 +1,20 @@
+--- kmail/kmfolder.cpp 2006/10/28 17:04:18 599816
++++ kmail/kmfolder.cpp 2007/01/27 00:32:53 627548
+@@ -631,11 +631,13 @@
+ mWhoField = "From";
+ if ( this == kmkernel->outboxFolder() ||
+ this == kmkernel->sentFolder() ||
+- this == kmkernel->draftsFolder() )
++ this == kmkernel->draftsFolder() ||
++ this == kmkernel->templatesFolder() )
+ mWhoField = "To";
+- } else if ( identity.drafts() == idString()
+- || identity.fcc() == idString() )
+- // drafts or sent of the identity
++ } else if ( identity.drafts() == idString() ||
++ identity.templates() == idString() ||
++ identity.fcc() == idString() )
++ // drafts, templates or sent of the identity
+ mWhoField = "To";
+ else
+ mWhoField = "From";
Modified: packages/cooker/kdepim/current/SPECS/kdepim.spec
==============================================================================
--- packages/cooker/kdepim/current/SPECS/kdepim.spec (original)
+++ packages/cooker/kdepim/current/SPECS/kdepim.spec Fri Feb 2 13:49:12 2007
@@ -30,7 +30,7 @@
Name: kdepim
Version: 3.5.6
-Release: %mkrel 2
+Release: %mkrel 3
Epoch: 1
Group: Graphical desktop/KDE
Summary: K Desktop Environment - Person Information Management
@@ -62,6 +62,9 @@
Patch209: kdepim-3.5.4-korganizer-avoid-spam-example_net.patch
Patch210: kdepim-3.5.4-korganizer-use-sys-timezone.patch
Patch211: kdepim-3.5.4-kontact-sidebar-disable-show-text.patch
+Patch212: kdepim-3.5.6-fix-pb-debug.patch
+Patch213: kdepim-3.5.6-kmail-140660.patch
+Patch214: kdepim-3.5.6-kmail-templates.patch
BuildRoot: %_tmppath/%name-%version-%release-root
Conflicts: kdenetwork <= 3.1.92
BuildRequires: kdelibs-devel >= 3.2-13mdk
@@ -1229,6 +1232,9 @@
%patch209 -p1 -b .korganizer_dont_spam_example_net
%patch210 -p1 -b .korganizer_use_sys_timezone
%patch211 -p1 -b .kontact_sidebar_dont_show_text
+%patch212 -p1 -b .fix_debug
+%patch213 -p0 -b .kmail
+%patch214 -p0 -b .fix_kmail_template
%build
export QTDIR=%_prefix/lib/qt3
