Update KDE4 to 4.3.2

KDE 4.3.2 brings a nice number of bugfixes, some critical, some just
fixing small annoyances:
* Many crashers have been fixed in KDE's core libraries, bringing more
  stability to all applications
* KWin's window compositing effects have been further stabilized by fixing
  a number of bugs in effect plugins such as the famous coverswitch window
  switcher
* The biggest number of bugs for this release has been fixed in KMail,
  KDE's email client, making it more reliable and usable by correcting a
  number of display issues
* Saving files over themselves works again in Okular, KDE's document viewer

7 files changed, 6 insertions, 128 deletions

diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 14ac396a78f..0967d1be7e3 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 21:24:27 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -8,8 +8,6 @@ COMMENT=	Personal Information Management tools for the KDE desktop
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 CMAKE_ARGS+=-DMAL_BASE:STRING=${BUILDLINK_PREFIX.libmal}
 
 CHECK_PORTABILITY_SKIP+=ktimetracker/test/booktime-baddate.sh \
diff --git a/misc/kdepim4/PLIST b/misc/kdepim4/PLIST
index f78d0c574a5..af583afbe2b 100644
--- a/misc/kdepim4/PLIST
+++ b/misc/kdepim4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:39 markd Exp $
 bin/akregator
 bin/akregatorstorageexporter
 bin/egroupwarewizard
@@ -730,59 +730,35 @@ share/icons/oxygen/128x128/apps/kalarm.png
 share/icons/oxygen/128x128/apps/kleopatra.png
 share/icons/oxygen/16x16/actions/edit-delete-page.png
 share/icons/oxygen/16x16/actions/ldap_lookup.png
-share/icons/oxygen/16x16/actions/mail-forwarded-replied.png
-share/icons/oxygen/16x16/actions/mail-forwarded.png
-share/icons/oxygen/16x16/actions/mail-reply-custom.png
-share/icons/oxygen/16x16/actions/mail-signed-fully.png
-share/icons/oxygen/16x16/actions/mail-signed-part.png
-share/icons/oxygen/16x16/actions/mail-signed.png
 share/icons/oxygen/16x16/actions/smallclock.png
 share/icons/oxygen/16x16/actions/upindicator.png
 share/icons/oxygen/16x16/apps/kalarm.png
 share/icons/oxygen/16x16/apps/kleopatra.png
 share/icons/oxygen/16x16/apps/kmailcvt.png
 share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/16x16/status/mail-sent.png
-share/icons/oxygen/16x16/status/mail-tagged.png
-share/icons/oxygen/16x16/status/mail-task.png
 share/icons/oxygen/22x22/actions/button_fewer.png
 share/icons/oxygen/22x22/actions/button_more.png
 share/icons/oxygen/22x22/actions/checkmark.png
 share/icons/oxygen/22x22/actions/edit-delete-page.png
-share/icons/oxygen/22x22/actions/mail-reply-custom.png
 share/icons/oxygen/22x22/apps/kalarm.png
 share/icons/oxygen/22x22/apps/kleopatra.png
 share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/22x22/status/mail-tagged.png
-share/icons/oxygen/22x22/status/mail-task.png
 share/icons/oxygen/32x32/actions/edit-delete-page.png
-share/icons/oxygen/32x32/actions/mail-reply-custom.png
 share/icons/oxygen/32x32/apps/kalarm.png
 share/icons/oxygen/32x32/apps/kleopatra.png
 share/icons/oxygen/32x32/apps/kmailcvt.png
 share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/32x32/status/mail-tagged.png
 share/icons/oxygen/48x48/actions/edit-delete-page.png
-share/icons/oxygen/48x48/actions/mail-reply-custom.png
 share/icons/oxygen/48x48/apps/kalarm.png
 share/icons/oxygen/48x48/apps/kleopatra.png
 share/icons/oxygen/48x48/apps/kmailcvt.png
 share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/48x48/status/mail-tagged.png
 share/icons/oxygen/64x64/apps/kalarm.png
 share/icons/oxygen/64x64/apps/kleopatra.png
 share/icons/oxygen/scalable/actions/edit-delete-page.svgz
-share/icons/oxygen/scalable/actions/mail-forwarded-replied.svgz
-share/icons/oxygen/scalable/actions/mail-forwarded.svgz
-share/icons/oxygen/scalable/actions/mail-reply-custom.svgz
-share/icons/oxygen/scalable/actions/mail-signed-fully.svgz
-share/icons/oxygen/scalable/actions/mail-signed-part.svgz
-share/icons/oxygen/scalable/actions/mail-signed.svgz
 share/icons/oxygen/scalable/apps/kalarm.svgz
 share/icons/oxygen/scalable/apps/kleopatra.svgz
 share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
-share/icons/oxygen/scalable/status/mail-tagged.svgz
-share/icons/oxygen/scalable/status/mail-task.svgz
 share/kde/apps/akregator/about/akregator.css
 share/kde/apps/akregator/about/main.html
 share/kde/apps/akregator/about/top-left-akregator.png
diff --git a/misc/kdepim4/distinfo b/misc/kdepim4/distinfo
index e5430248d04..d8beaa828f0 100644
--- a/misc/kdepim4/distinfo
+++ b/misc/kdepim4/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/02 21:24:27 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $
 
-SHA1 (kdepim-4.3.1.tar.bz2) = 6fd0309dbd911e2667ec1c08d1f10f2626a54534
-RMD160 (kdepim-4.3.1.tar.bz2) = fb1cac7ddb1e656c537f8db8abf2b4340db10171
-Size (kdepim-4.3.1.tar.bz2) = 11323109 bytes
+SHA1 (kdepim-4.3.2.tar.bz2) = 0de9c7f1c4544f7520128016a6e06f10e6ed1173
+RMD160 (kdepim-4.3.2.tar.bz2) = b22f2888582f2623c07cf96110e0d340938c109f
+Size (kdepim-4.3.2.tar.bz2) = 11250502 bytes
 SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494
 SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18
 SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f
-SHA1 (patch-ae) = 473c76678f4d0329fb6e9bcc1bad44eb0c7192ac
-SHA1 (patch-af) = 5d6f44cfcadb47fd71f024d0bb2c78d9d4dcb7a7
-SHA1 (patch-ag) = 03a751708b841d4f1bc22d33ccdc6efbcb4d6536
-SHA1 (patch-ah) = 04b0b44700daf3179d38f40227b1f734712ed107
diff --git a/misc/kdepim4/patches/patch-ae b/misc/kdepim4/patches/patch-ae
deleted file mode 100644
index 410961e5cba..00000000000
--- a/misc/kdepim4/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
-KDE svn 1019115
-
---- libkdepim/addresseelineedit.cpp.orig	2009-08-27 20:18:28.000000000 +1200
-+++ libkdepim/addresseelineedit.cpp
-@@ -800,7 +800,7 @@ void AddresseeLineEdit::startLoadingLDAP
- 
- void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
- {
--  if ( s_LDAPLineEdit != this ) {
-+  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
-     return;
-   }
- 
diff --git a/misc/kdepim4/patches/patch-af b/misc/kdepim4/patches/patch-af
deleted file mode 100644
index ced979fadc0..00000000000
--- a/misc/kdepim4/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
-KDE svn 1022963
-
---- kmail/cachedimapjob.cpp.orig	2009-05-28 07:54:17.000000000 +1200
-+++ kmail/cachedimapjob.cpp
-@@ -510,7 +510,7 @@ void CachedImapJob::slotPutMessageResult
-         bool b = kmkernel->iCalIface().isResourceQuiet();
-         kmkernel->iCalIface().setResourceQuiet( true );
- 
--        mFolder->take( i );
-+        mFolder->takeTemporarily( i );
-         mFolder->addMsgKeepUID( mMsg );
-         mMsg->setTransferInProgress( false );
- 
diff --git a/misc/kdepim4/patches/patch-ag b/misc/kdepim4/patches/patch-ag
deleted file mode 100644
index ea61a75d000..00000000000
--- a/misc/kdepim4/patches/patch-ag
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
-KDE svn 1022963
-
---- kmail/kmfoldercachedimap.h.orig	2009-05-28 07:54:17.000000000 +1200
-+++ kmail/kmfoldercachedimap.h
-@@ -228,10 +228,23 @@ class KMFolderCachedImap : public KMFold
-     /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */
-     virtual int rename( const QString &aName, KMFolderDir *aParent = 0 );
- 
--    /** Reimplemented from KMFolderMaildir */
--    virtual KMMessage *take( int idx );
-     bool canDeleteMessages() const;
- 
-+    /**
-+     * Reimplemented from KMFolderMaildir
-+     * This deletes the message permanently, also from the server. For this,
-+     * rememberDeletion() is called, so that the message can be deleted from
-+     * the server on the next sync.
-+     */
-+    virtual KMMessage* take( int idx );
-+
-+    /**
-+     * Like take(), only that the deletion is not remembered, i.e. the
-+     * message will not be deleted from the server. Calling this can cause
-+     * inconsistencies, so make sure you re-add the message later!
-+     */
-+    void takeTemporarily( int idx );
-+
-     /** Reimplemented from KMFolderMaildir */
-     virtual int addMsg( KMMessage *msg, int *index_return = 0 );
- 
diff --git a/misc/kdepim4/patches/patch-ah b/misc/kdepim4/patches/patch-ah
deleted file mode 100644
index 725df138b4c..00000000000
--- a/misc/kdepim4/patches/patch-ah
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
-
-KDE svn 1022963 and 1022964
-
---- kmail/kmfoldercachedimap.cpp.orig	2009-05-28 07:54:17.000000000 +1200
-+++ kmail/kmfoldercachedimap.cpp
-@@ -527,6 +527,11 @@ KMMessage *KMFolderCachedImap::take( int
-   return KMFolderMaildir::take( idx );
- }
- 
-+void KMFolderCachedImap::takeTemporarily( int idx )
-+{
-+  KMFolderMaildir::take( idx );
-+}
-+
- int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index_return )
- {
-   // Possible optimization: Only dirty if not filtered below
-@@ -1673,6 +1678,11 @@ bool KMFolderCachedImap::deleteMessages(
-     job->start();
-     return true;
-   } else {
-+
-+    // Nothing to delete on the server, make sure the map is clear again.
-+    // Normally this wouldn't be necessary, but there can be stale maps because of
-+    // https://issues.kolab.org/issue3833.
-+    mDeletedUIDsSinceLastSync.clear();
-     return false;
-   }
- }