From 2faa88d6a5153dbdccbc026213ec7fdaa299ffe2 Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Sun, 19 Jun 2005 11:02:41 +0000
Subject: [PATCH] Make compile with old g++'s.

---
 misc/kdepim3/distinfo         |  4 +++-
 misc/kdepim3/patches/patch-ac | 16 ++++++++++++++++
 misc/kdepim3/patches/patch-ad | 16 ++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 misc/kdepim3/patches/patch-ac
 create mode 100644 misc/kdepim3/patches/patch-ad

diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index e03e429e76af..aa8c57d630c3 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.30 2005/05/31 14:48:24 markd Exp $
+$NetBSD: distinfo,v 1.31 2005/06/19 11:02:41 markd Exp $
 
 SHA1 (kdepim-3.4.1.tar.bz2) = 42c8fb59809cd77ce9f843bf0ef661c45da0a251
 RMD160 (kdepim-3.4.1.tar.bz2) = f3dd526ca3094f42eb825ece30d0b84c047a6050
 Size (kdepim-3.4.1.tar.bz2) = 11345538 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
 SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
+SHA1 (patch-ac) = b8c3bc23469cd0caa59ee181cbc83063ab676777
+SHA1 (patch-ad) = b22d413d80fd14ec09e1f00612cb57bf9a43e8cc
 SHA1 (patch-ba) = f524c671e3089a73c78cb0e5a8b6e19c0ddf360c
 SHA1 (patch-bb) = 9667cce7382544a40f91b7f62f594cfc52953661
 SHA1 (patch-bc) = fc1d54789656b670345fcfaa67d0f9b8e90ffbf4
diff --git a/misc/kdepim3/patches/patch-ac b/misc/kdepim3/patches/patch-ac
new file mode 100644
index 000000000000..40b9ac0a4c5c
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ac
@@ -0,0 +1,16 @@
+$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
new file mode 100644
index 000000000000..938066177486
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ad
@@ -0,0 +1,16 @@
+$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) {