diff options
| author | markd <markd@pkgsrc.org> | 2007-02-03 01:52:55 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2007-02-03 01:52:55 +0000 |
| commit | 89fe0fbc569efd0e1256499728cc86afa4714dd0 (patch) | |
| tree | a19ea4bd0a0f231a5e223707d983702833428320 /misc | |
| parent | 67c71be27e6d969ba331a26b9b9c251d5c7b6050 (diff) | |
| download | pkgsrc-89fe0fbc569efd0e1256499728cc86afa4714dd0.tar.gz | |
Couple of patches from KDE SVN for crashes with filtering and the new
templates feature in kmail. Bump PKGREVISION.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/kdepim3/Makefile | 3 | ||||
| -rw-r--r-- | misc/kdepim3/distinfo | 3 | ||||
| -rw-r--r-- | misc/kdepim3/patches/patch-ae | 39 |
3 files changed, 43 insertions, 2 deletions
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile index 4d33d89ba3e..c4ab7368715 100644 --- a/misc/kdepim3/Makefile +++ b/misc/kdepim3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.71 2007/01/26 03:17:09 markd Exp $ +# $NetBSD: Makefile,v 1.72 2007/02/03 01:52:55 markd Exp $ DISTNAME= kdepim-${_KDE_VERSION} +PKGREVISION= 1 CATEGORIES= misc COMMENT= Personal Information Management tools for the KDE desktop diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo index 8a566a4b812..577e1a2bdf6 100644 --- a/misc/kdepim3/distinfo +++ b/misc/kdepim3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.51 2007/01/26 03:17:09 markd Exp $ +$NetBSD: distinfo,v 1.52 2007/02/03 01:52:55 markd Exp $ SHA1 (kdepim-3.5.6.tar.bz2) = a84ad8dd9f84eb3f33070e07ed56f6d694db2cb4 RMD160 (kdepim-3.5.6.tar.bz2) = 85f64349d8eedb531895a3591f6fee07c68bf1eb @@ -7,6 +7,7 @@ SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c SHA1 (patch-ac) = 3f29a28a022e7e691f3cd1f5d2cee37c6407323c SHA1 (patch-ad) = cca7ee6fc88170e0277883532a6a607ec4e5efa0 +SHA1 (patch-ae) = 74a9321776c2b8dc9c76571e1d22b83355ec3d25 SHA1 (patch-ai) = 401c9b7dcb49fd7ee3c03e400e52edc421649692 SHA1 (patch-ak) = cac11150a708f2f4258b9371f9aaa72b133a821d SHA1 (patch-al) = 723424b7c39c5e0e0899b340a30e5a3f32c90a6a diff --git a/misc/kdepim3/patches/patch-ae b/misc/kdepim3/patches/patch-ae new file mode 100644 index 00000000000..f7d5c55f4bc --- /dev/null +++ b/misc/kdepim3/patches/patch-ae @@ -0,0 +1,39 @@ +$NetBSD: patch-ae,v 1.11 2007/02/03 01:52:55 markd Exp $ + +kde svn 627548 and 627641. + +--- kmail/kmfolder.cpp.orig 2007-01-16 00:28:47.000000000 +1300 ++++ kmail/kmfolder.cpp +@@ -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 +@@ -631,11 +631,13 @@ void KMFolder::setUserWhoField( const QS + 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"; |