Import KDE4.3.1 from wip

OKed during freeze by wiz and agc

7 files changed, 140 insertions, 0 deletions

diff --git a/misc/kdepim4/patches/patch-ab b/misc/kdepim4/patches/patch-ab
new file mode 100644
index 00000000000..a435bbf8856
--- /dev/null
+++ b/misc/kdepim4/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
+
+--- kmail/kconf_update/kmail.upd.orig	2007-08-29 21:55:21.000000000 +1200
++++ kmail/kconf_update/kmail.upd
+@@ -67,7 +67,7 @@ Id=3.2-update-loop-on-goto-unread-settin
+ File=kmailrc
+ Group=Behaviour
+ Key=LoopOnGotoUnread
+-Script=kmail-3.2-update-loop-on-goto-unread-settings.sh,bash
++Script=kmail-3.2-update-loop-on-goto-unread-settings.sh,sh
+ # due to a bug the first identity always had UOID 0, assign another UOID
+ Id=3.1.4-dont-use-UOID-0-for-any-identity
+ File=kmailrc
+@@ -81,7 +81,7 @@ Id=3.2-misc
+ # against being run multiple times.
+ ######################################################################
+ File=kmailrc
+-Script=kmail-3.2-misc.sh,bash
++Script=kmail-3.2-misc.sh,sh
+ #
+ # reuse this section to add trivial stuff!
+ #
diff --git a/misc/kdepim4/patches/patch-ac b/misc/kdepim4/patches/patch-ac
new file mode 100644
index 00000000000..15f285fd506
--- /dev/null
+++ b/misc/kdepim4/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
+
+--- kresources/groupwise/soap/stdsoap2.h.orig	2008-10-18 00:01:10.000000000 +1300
++++ kresources/groupwise/soap/stdsoap2.h
+@@ -251,7 +251,7 @@ A commercial use license is available fr
+ #  define HAVE_LOCALTIME_R
+ #  define HAVE_WCTOMB
+ #  define HAVE_MBTOWC
+-# elif defined(FREEBSD) || defined(__FreeBSD__) || defined(__DragonFly__)
++# elif defined(FREEBSD) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+ #  define HAVE_STRRCHR
+ #  define HAVE_STRTOD
+ #  define HAVE_SSCANF
diff --git a/misc/kdepim4/patches/patch-ad b/misc/kdepim4/patches/patch-ad
new file mode 100644
index 00000000000..0db44cf3427
--- /dev/null
+++ b/misc/kdepim4/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $
+
+--- ktimetracker/test/deleteparenttask.sh.orig	2008-07-22 12:04:32.000000000 +1200
++++ ktimetracker/test/deleteparenttask.sh
+@@ -22,7 +22,7 @@ qdbus org.kde.ktimetracker /KTimeTracker
+ 
+ RVAL=`qdbus org.kde.ktimetracker /KTimeTracker version`
+ 
+-if [ "$RVAL" == "" ]; then 
++if [ "$RVAL" = "" ]; then 
+   echo "FAIL $0: got no version."
+   exit 1;
+ else 
diff --git a/misc/kdepim4/patches/patch-ae b/misc/kdepim4/patches/patch-ae
new file mode 100644
index 00000000000..410961e5cba
--- /dev/null
+++ b/misc/kdepim4/patches/patch-ae
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..ced979fadc0
--- /dev/null
+++ b/misc/kdepim4/patches/patch-af
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..ea61a75d000
--- /dev/null
+++ b/misc/kdepim4/patches/patch-ag
@@ -0,0 +1,32 @@
+$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
new file mode 100644
index 00000000000..725df138b4c
--- /dev/null
+++ b/misc/kdepim4/patches/patch-ah
@@ -0,0 +1,30 @@
+$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;
+   }
+ }