summaryrefslogtreecommitdiff
path: root/misc/kdepim4
diff options
context:
space:
mode:
authormarkd <markd>2011-10-02 04:35:03 +0000
committermarkd <markd>2011-10-02 04:35:03 +0000
commite4e81227151c0b25ceab52f0ee9c7b780d386bb5 (patch)
tree031e26a238c53f727d69a34ad7e6589d17b76620 /misc/kdepim4
parenta6ef5af2f2ddc6dc7d16e73866a9db5e3355e001 (diff)
downloadpkgsrc-e4e81227151c0b25ceab52f0ee9c7b780d386bb5.tar.gz
Fix build with gcc45 and current boost libs.
Diffstat (limited to 'misc/kdepim4')
-rw-r--r--misc/kdepim4/distinfo4
-rw-r--r--misc/kdepim4/patches/patch-af14
2 files changed, 12 insertions, 6 deletions
diff --git a/misc/kdepim4/distinfo b/misc/kdepim4/distinfo
index 060bf835ef8..cc5703b9448 100644
--- a/misc/kdepim4/distinfo
+++ b/misc/kdepim4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2011/01/23 07:55:14 markd Exp $
+$NetBSD: distinfo,v 1.15 2011/10/02 04:35:03 markd Exp $
SHA1 (kdepim-4.4.9.tar.bz2) = efe91c4309fb09f49c816a6557a157170c8f0360
RMD160 (kdepim-4.4.9.tar.bz2) = d11b5090bdf27c3ffd4558d9c3e6cd30aa6a7e88
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494
SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18
SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f
SHA1 (patch-ae) = d45948eb8a083cb2cf900bc946f0f346e1f56d73
-SHA1 (patch-af) = 2a4341c4ae9e1a7aab20fee9c9d27b4cfaa63e1c
+SHA1 (patch-af) = b13488ced72f4b6e617e9a4dee52c124602d680e
SHA1 (patch-ag) = 45a094af644835a0859f354db0c880fc891aa977
SHA1 (patch-ah) = 5b5235666c568de23fc79ef461df6b8f66a67ce6
SHA1 (patch-ai) = 304ddaf381ae4cb217d033268868366760c2d071
diff --git a/misc/kdepim4/patches/patch-af b/misc/kdepim4/patches/patch-af
index 382f4701703..c4e5a7fa37f 100644
--- a/misc/kdepim4/patches/patch-af
+++ b/misc/kdepim4/patches/patch-af
@@ -1,9 +1,11 @@
-$NetBSD: patch-af,v 1.3 2010/09/01 13:45:25 wiz Exp $
+$NetBSD: patch-af,v 1.4 2011/10/02 04:35:03 markd Exp $
libassuan2 support from
http://websvn.kde.org/?view=revision&revision=1078528
---- kleopatra/CMakeLists.txt.orig 2009-11-02 12:02:09.000000000 +0000
+-DBOOST_NO_0X_HDR_INITIALIZER_LIST for gcc45 and recent boost
+
+--- kleopatra/CMakeLists.txt.orig 2010-12-22 17:51:56.000000000 +0000
+++ kleopatra/CMakeLists.txt
@@ -2,7 +2,7 @@ project(kleopatra)
@@ -14,7 +16,7 @@ http://websvn.kde.org/?view=revision&revision=1078528
set( kleopatra_release FALSE )
if (NOT kleopatra_release)
-@@ -28,7 +28,7 @@ include_directories(
+@@ -28,10 +28,11 @@ include_directories(
${QGPGME_INCLUDES}
${GPGME_INCLUDES} )
if (USABLE_ASSUAN_FOUND)
@@ -23,7 +25,11 @@ http://websvn.kde.org/?view=revision&revision=1078528
endif(USABLE_ASSUAN_FOUND)
add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -DQT_STL )
remove_definitions ( -DQT_NO_STL )
-@@ -84,11 +84,7 @@ if ( USABLE_ASSUAN_FOUND )
++add_definitions( -DBOOST_NO_0X_HDR_INITIALIZER_LIST )
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+
+@@ -84,11 +85,7 @@ if ( USABLE_ASSUAN_FOUND )
selftest/uiservercheck.cpp
)