[pkgsrc/trunk]: pkgsrc/misc/kdepim3 update to kdepim-3.5.6nb2. fix build agai...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ffd20a451f74
branches:  trunk
changeset: 527039:ffd20a451f74
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Mar 23 23:03:01 2007 +0000

description:
update to kdepim-3.5.6nb2. fix build against updated pilot-link-libs - "http://websvn.kde.org/?view=rev&revision=633614";

diffstat:

 misc/kdepim3/Makefile         |   4 ++--
 misc/kdepim3/distinfo         |   4 +++-
 misc/kdepim3/patches/patch-af |  22 ++++++++++++++++++++++
 misc/kdepim3/patches/patch-ag |  13 +++++++++++++
 4 files changed, 40 insertions(+), 3 deletions(-)

diffs (74 lines):

diff -r 71f6a3cac6f8 -r ffd20a451f74 misc/kdepim3/Makefile
--- a/misc/kdepim3/Makefile     Fri Mar 23 22:59:16 2007 +0000
+++ b/misc/kdepim3/Makefile     Fri Mar 23 23:03:01 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2007/02/22 13:53:43 joerg Exp $
+# $NetBSD: Makefile,v 1.74 2007/03/23 23:03:01 abs Exp $
 
 DISTNAME=      kdepim-${_KDE_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc
 COMMENT=       Personal Information Management tools for the KDE desktop
 
diff -r 71f6a3cac6f8 -r ffd20a451f74 misc/kdepim3/distinfo
--- a/misc/kdepim3/distinfo     Fri Mar 23 22:59:16 2007 +0000
+++ b/misc/kdepim3/distinfo     Fri Mar 23 23:03:01 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2007/02/03 01:52:55 markd Exp $
+$NetBSD: distinfo,v 1.53 2007/03/23 23:03:02 abs Exp $
 
 SHA1 (kdepim-3.5.6.tar.bz2) = a84ad8dd9f84eb3f33070e07ed56f6d694db2cb4
 RMD160 (kdepim-3.5.6.tar.bz2) = 85f64349d8eedb531895a3591f6fee07c68bf1eb
@@ -8,6 +8,8 @@
 SHA1 (patch-ac) = 3f29a28a022e7e691f3cd1f5d2cee37c6407323c
 SHA1 (patch-ad) = cca7ee6fc88170e0277883532a6a607ec4e5efa0
 SHA1 (patch-ae) = 74a9321776c2b8dc9c76571e1d22b83355ec3d25
+SHA1 (patch-af) = c5affd94a24f6e1498ec865792cdfe19442f73e9
+SHA1 (patch-ag) = a42e45e3fb237963e06b1d2b2a29cadcebef7fc3
 SHA1 (patch-ai) = 401c9b7dcb49fd7ee3c03e400e52edc421649692
 SHA1 (patch-ak) = cac11150a708f2f4258b9371f9aaa72b133a821d
 SHA1 (patch-al) = 723424b7c39c5e0e0899b340a30e5a3f32c90a6a
diff -r 71f6a3cac6f8 -r ffd20a451f74 misc/kdepim3/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdepim3/patches/patch-af     Fri Mar 23 23:03:01 2007 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.7 2007/03/23 23:03:02 abs Exp $
+# From http://websvn.kde.org/?view=rev&revision=633614
+
+--- kpilot/lib/pilotAppInfo.h.orig     2007-01-15 11:29:07.000000000 +0000
++++ kpilot/lib/pilotAppInfo.h
+@@ -136,8 +136,15 @@ protected:
+ * (again, from pilot-link).
+ */
+ template <typename appinfo,
++#if PILOT_LINK_IS(0,12,2)
++      /* There are additional consts introduced in 0.12.2 */
++      int(*unpack)(appinfo *, const unsigned char *, PI_SIZE_T),
++      int(*pack)(const appinfo *, unsigned char *, PI_SIZE_T)
++#else
+       int(*unpack)(appinfo *, unsigned char *, PI_SIZE_T),
+-      int(*pack)(appinfo *, unsigned char *, PI_SIZE_T)>
++      int(*pack)(appinfo *, unsigned char *, PI_SIZE_T)
++#endif
++      >
+ class PilotAppInfo : public PilotAppInfoBase
+ {
+ public:
diff -r 71f6a3cac6f8 -r ffd20a451f74 misc/kdepim3/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/kdepim3/patches/patch-ag     Fri Mar 23 23:03:01 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.5 2007/03/23 23:03:02 abs Exp $
+# From http://websvn.kde.org/?view=rev&revision=633614
+
+--- kpilot/lib/pilotMemo.h.orig        2007-01-15 11:29:07.000000000 +0000
++++ kpilot/lib/pilotMemo.h
+@@ -98,6 +98,6 @@ private:
+       QString fText;
+ };
+ 
+-typedef PilotAppInfo<MemoAppInfo,unpack_MemoAppInfo, pack_MemoAppInfo> PilotMemoInfo;
++typedef PilotAppInfo<struct MemoAppInfo,unpack_MemoAppInfo, pack_MemoAppInfo> PilotMemoInfo;
+ 
+ #endif