Fix build with gcc45 and current boost libs

5 files changed, 43 insertions, 8 deletions

diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 06468289d44..a53cc75f888 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/08/20 21:33:28 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2011/10/02 04:32:22 markd Exp $
 
 DISTNAME=	kdepimlibs-${_KDE_VERSION}
 PKGREVISION=	1
@@ -13,12 +13,6 @@ REPLACE_PERL+= mailtransport/kconf_update/migrate-transports.pl
 
 .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 "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../mail/akonadi/buildlink3.mk"
diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo
index 5e227c80d89..8f0018ac51b 100644
--- a/misc/kdepimlibs4/distinfo
+++ b/misc/kdepimlibs4/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.16 2011/03/05 11:57:08 adam Exp $
+$NetBSD: distinfo,v 1.17 2011/10/02 04:32:22 markd Exp $
 
 SHA1 (kdepimlibs-4.5.5.tar.bz2) = 436fd7897586294f327395981a714ae0695f4ee2
 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
diff --git a/misc/kdepimlibs4/patches/patch-akonadi_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-akonadi_CMakeLists.txt
new file mode 100644
index 00000000000..b589a3f2719
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-akonadi_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD: patch-akonadi_CMakeLists.txt,v 1.1 2011/10/02 04:32:22 markd Exp $
+
+--- 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)
diff --git a/misc/kdepimlibs4/patches/patch-kblog_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-kblog_CMakeLists.txt
new file mode 100644
index 00000000000..a33c20db385
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-kblog_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD: patch-kblog_CMakeLists.txt,v 1.1 2011/10/02 04:32:22 markd Exp $
+
+--- 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
diff --git a/misc/kdepimlibs4/patches/patch-qgpgme_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-qgpgme_CMakeLists.txt
new file mode 100644
index 00000000000..5e0b1b31e41
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-qgpgme_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD: patch-qgpgme_CMakeLists.txt,v 1.1 2011/10/02 04:32:22 markd Exp $
+
+--- 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,