Update to KDE 3.4.3

Changes:
backported bug fixes.

6 files changed, 7 insertions, 71 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 9a7b806cea7..b28f6c83d25 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2005/09/28 19:54:36 adam Exp $
+# $NetBSD: Makefile,v 1.52 2005/10/13 13:12:25 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
@@ -52,14 +51,6 @@ PLIST_SUBST+=	HAVE_SASL=""
 PLIST_SUBST+=	HAVE_SASL="@comment "
 .endif
 
-# a fix for qt-3.3.5, please remove if qt-3.3.6 (or newer) solves the problem
-SUBST_CLASSES+=		hints
-SUBST_STAGE.hints=	post-patch
-SUBST_MESSAGE.hints=	"Fix includehints."
-SUBST_FILES.hints=	korn/kornboxcfg.ui korn/korncfg.ui \
-			kmail/smimeconfiguration.ui
-SUBST_FILTER_CMD.hints=	${GREP} -v includehint
-
 .include "../../comms/libmal/buildlink3.mk"
 .include "../../comms/pilot-link-libs/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 1d6eed833eb..540d0dfe432 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2005/07/30 11:33:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.21 2005/10/13 13:12:25 markd Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -1097,6 +1097,7 @@ share/kde/apps/libkholidays/holiday_co
 share/kde/apps/libkholidays/holiday_cz
 share/kde/apps/libkholidays/holiday_de
 share/kde/apps/libkholidays/holiday_dk
+share/kde/apps/libkholidays/holiday_ee
 share/kde/apps/libkholidays/holiday_es
 share/kde/apps/libkholidays/holiday_fi
 share/kde/apps/libkholidays/holiday_fr
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 974c2f934de..24196d421fe 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.33 2005/08/02 10:29:20 markd Exp $
+$NetBSD: distinfo,v 1.34 2005/10/13 13:12:25 markd Exp $
 
-SHA1 (kdepim-3.4.2.tar.bz2) = 7e5eb8d3ab31a490839e33d048e78f583f8a7fe4
-RMD160 (kdepim-3.4.2.tar.bz2) = c149409d447c5108348d24bdb973979e4c31e80d
-Size (kdepim-3.4.2.tar.bz2) = 11368492 bytes
+SHA1 (kdepim-3.4.3.tar.bz2) = 06566beba4a3a7487e716b814796e32ec4206a1a
+RMD160 (kdepim-3.4.3.tar.bz2) = a1c15ae5759b9865297a28e0ee00f66b04fc2a96
+Size (kdepim-3.4.3.tar.bz2) = 11327132 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
-SHA1 (patch-ac) = b8c3bc23469cd0caa59ee181cbc83063ab676777
-SHA1 (patch-ad) = b22d413d80fd14ec09e1f00612cb57bf9a43e8cc
-SHA1 (patch-ae) = 69b744dbf13351c7a738cf8ce566e35261e56ed5
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
deleted file mode 100644
index 40b9ac0a4c5..00000000000
--- a/misc/kdepim3/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2005/06/19 11:02:41 markd Exp $
-
---- kmailcvt/filter_oe.cxx.orig	2005-06-16 21:37:13.000000000 +1200
-+++ kmailcvt/filter_oe.cxx
-@@ -397,7 +397,11 @@ QString FilterOE::getFolderName(QString 
-     while (!found)
-     {
-         for ( QValueList<QString[4]>::Iterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
-+#if defined(__GNUC__) && __GNUC__ <= 2
-+            QString tmp[4]; tmp = *it;
-+#else
-             QString tmp[4] = *it;
-+#endif
-             if(foundFilename == false) {
-                 QString _tmpFileName = tmp[1];
-                 _tmpFileName = _tmpFileName.lower();
diff --git a/misc/kdepim3/patches/patch-ad b/misc/kdepim3/patches/patch-ad
deleted file mode 100644
index 93806617748..00000000000
--- a/misc/kdepim3/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2005/06/19 11:02:41 markd Exp $
-
---- kmailcvt/filter_pmail.cxx.orig	2005-05-24 00:12:15.000000000 +1200
-+++ kmailcvt/filter_pmail.cxx
-@@ -326,7 +326,11 @@ QString FilterPMail::getFolderName(QStri
-     while (!found)
-     {
-         for ( QValueList<QString[5]>::Iterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
-+#if defined (__GNUC__) && __GNUC__ <= 2
-+            QString tmp[5]; tmp = *it;
-+#else
-             QString tmp[5] = *it;
-+#endif
-             
-             QString _ID = tmp[2];
-             if(_ID == search) {
diff --git a/misc/kdepim3/patches/patch-ae b/misc/kdepim3/patches/patch-ae
deleted file mode 100644
index d6dfdb41f96..00000000000
--- a/misc/kdepim3/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/08/02 10:29:20 markd Exp $
-
---- kmail/partNode.cpp.orig	2005-08-02 21:49:46.000000000 +1200
-+++ kmail/partNode.cpp
-@@ -36,6 +36,7 @@
- #include "kmmimeparttree.h"
- #include <mimelib/utility.h>
- #include <qregexp.h>
-+#include <kasciistricmp.h>
- 
- /*
-   ===========================================================================
-@@ -414,7 +415,7 @@ partNode* partNode::findType( int type, 
- partNode* partNode::findNodeForDwPart( DwBodyPart* part )
- {
-     partNode* found = 0;
--    if( dwPart()->partId() == part->partId() )
-+    if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 )
-         return this;
-     if( mChild )
-         found = mChild->findNodeForDwPart( part );