kdepimlibs4 build

[Mark Davies <mark%ecs.vuw.ac.nz@localhost>]

Currently kdepimlibs4 fails to build on NetBSD-current (gcc45) with

.../kdepimlibs-4.5.5/gpgme++/gpgsignkeyeditinteractor.cpp:247:138: 
error: no matching function for call to 
'std::map<boost::tuples::tuple<GpgSignKeyEditInteractor_Private::SignKeyState, 
unsigned int, std::basic_string<char> >, 
GpgSignKeyEditInteractor_Private::SignKeyState>::find(std::tuple<GpgSignKeyEditInteractor_Private::SignKeyState,
 
unsigned int, std::basic_string<char> >) const'
   [...]

The below patches fix it so that it builds.  Also known to build 
and work on ArchLinux with gcc46.   Could somebody please confirm 
that it doesn't break things with older gcc.

cheers
mark

Index: Makefile
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/misc/kdepimlibs4/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile    20 Aug 2011 21:33:28 -0000      1.20
+++ Makefile    27 Sep 2011 07:38:12 -0000
@@ -13,11 +13,11 @@
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
-.include "../../mk/compiler.mk"
-# GCC 4.4 and above needs this
-.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.
[4-9]*)
-_WRAP_EXTRA_ARGS.CXX+= -std=c++0x
-.endif
+#.include "../../mk/compiler.mk"
+## GCC 4.4 and above needs this
+#.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.
[4-9]*)
+#_WRAP_EXTRA_ARGS.CXX+=        -std=c++0x
+#.endif
 
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/misc/kdepimlibs4/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo    5 Mar 2011 11:57:08 -0000       1.16
+++ distinfo    27 Sep 2011 09:10:28 -0000
@@ -4,4 +4,7 @@
 RMD160 (kdepimlibs-4.5.5.tar.bz2) = 
6e9e54fcf8fa2f1da1c76004a3998f9426a30f4c
 Size (kdepimlibs-4.5.5.tar.bz2) = 2674251 bytes
 SHA1 (patch-aa) = 4a90823acf9832232ea51cc1202dd88edebe5ee9
+SHA1 (patch-akonadi_CMakeLists.txt) = 
01b0e467d7474312fb001af081648efa44d8278f
 SHA1 (patch-gpgmexx_config-gpgmexx.h.cmake) = 
bd8fd1e9a619d6bd52185f37adb5dc7f7b97423c
+SHA1 (patch-kblog_CMakeLists.txt) = 
183d17f2de6f5f4f2f6bd29666b2a35d22c055aa
+SHA1 (patch-qgpgme_CMakeLists.txt) = 
0860963f371a008f1d006dad58ea40329c358cfd
--- /dev/null   2011-09-27 23:25:18.000000000 +1300
+++ patches/patch-akonadi_CMakeLists.txt        2011-09-27 
22:09:42.000000000 +1300
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- akonadi/CMakeLists.txt.orig        2011-09-27 
09:07:39.000000000 +0000
++++ akonadi/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ project(akonadi-kde)
+ 
+ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5250 )
++add_definitions( -DBOOST_NO_0X_HDR_INITIALIZER_LIST )
+ 
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
${KDE4_ENABLE_EXCEPTIONS}" )
+ if(CMAKE_COMPILE_GCOV)
--- /dev/null   2011-09-27 23:25:18.000000000 +1300
+++ patches/patch-kblog_CMakeLists.txt  2011-09-27 
22:10:05.000000000 +1300
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- kblog/CMakeLists.txt.orig  2011-09-27 09:07:09.000000000 +0000
++++ kblog/CMakeLists.txt
+@@ -4,6 +4,8 @@ include_directories(${Boost_INCLUDE_DIR}
+ 
+ add_subdirectory( tests )
+ 
++add_definitions(${KDE4_ENABLE_EXCEPTIONS})
++
+ ########### next target ###############
+ 
+ set(kblog_LIB_SRCS
--- /dev/null   2011-09-27 23:25:18.000000000 +1300
+++ patches/patch-qgpgme_CMakeLists.txt 2011-09-27 
22:10:21.000000000 +1300
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- qgpgme/CMakeLists.txt.orig 2011-09-27 09:07:25.000000000 +0000
++++ qgpgme/CMakeLists.txt
+@@ -4,6 +4,8 @@ set( _any_gpgme_found false )
+ set( _qgpgme_version 1.0.1 )
+ set( _qgpgme_soversion 1 )
+ 
++add_definitions(${KDE4_ENABLE_EXCEPTIONS})
++
+ if ( WIN32 AND GPGME_VANILLA_FOUND )
+ 
+    # on Windows, we require gpgme(-vanilla), which is thread-
safe,