Sun Oct 2 04:35:03 2011 UTC ()
Fix build with gcc45 and current boost libs.


(markd)
diff -r1.14 -r1.15 pkgsrc/misc/kdepim4/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/kdepim4/patches/patch-af
cvs diff -r1.14 -r1.15 pkgsrc/misc/kdepim4/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/kdepim4/distinfo 2011/01/23 07:55:14 1.14
+++ pkgsrc/misc/kdepim4/distinfo 2011/10/02 04:35:03 1.15
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.14 2011/01/23 07:55:14 markd Exp $ 1$NetBSD: distinfo,v 1.15 2011/10/02 04:35:03 markd Exp $
2 2
3SHA1 (kdepim-4.4.9.tar.bz2) = efe91c4309fb09f49c816a6557a157170c8f0360 3SHA1 (kdepim-4.4.9.tar.bz2) = efe91c4309fb09f49c816a6557a157170c8f0360
4RMD160 (kdepim-4.4.9.tar.bz2) = d11b5090bdf27c3ffd4558d9c3e6cd30aa6a7e88 4RMD160 (kdepim-4.4.9.tar.bz2) = d11b5090bdf27c3ffd4558d9c3e6cd30aa6a7e88
5Size (kdepim-4.4.9.tar.bz2) = 9084259 bytes 5Size (kdepim-4.4.9.tar.bz2) = 9084259 bytes
6SHA1 (patch-aa) = 19bc087365f31f2ab5f62238530185646e3826fb 6SHA1 (patch-aa) = 19bc087365f31f2ab5f62238530185646e3826fb
7SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494 7SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494
8SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18 8SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18
9SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f 9SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f
10SHA1 (patch-ae) = d45948eb8a083cb2cf900bc946f0f346e1f56d73 10SHA1 (patch-ae) = d45948eb8a083cb2cf900bc946f0f346e1f56d73
11SHA1 (patch-af) = 2a4341c4ae9e1a7aab20fee9c9d27b4cfaa63e1c 11SHA1 (patch-af) = b13488ced72f4b6e617e9a4dee52c124602d680e
12SHA1 (patch-ag) = 45a094af644835a0859f354db0c880fc891aa977 12SHA1 (patch-ag) = 45a094af644835a0859f354db0c880fc891aa977
13SHA1 (patch-ah) = 5b5235666c568de23fc79ef461df6b8f66a67ce6 13SHA1 (patch-ah) = 5b5235666c568de23fc79ef461df6b8f66a67ce6
14SHA1 (patch-ai) = 304ddaf381ae4cb217d033268868366760c2d071 14SHA1 (patch-ai) = 304ddaf381ae4cb217d033268868366760c2d071
15SHA1 (patch-aj) = 26285317562f55e1bee4740286069d4c2213d2fa 15SHA1 (patch-aj) = 26285317562f55e1bee4740286069d4c2213d2fa
16SHA1 (patch-ak) = ba5152d71810759b4bcbe526f7d05eeb8ed8944b 16SHA1 (patch-ak) = ba5152d71810759b4bcbe526f7d05eeb8ed8944b
17SHA1 (patch-al) = 55c77b3ad49e97e304778f56379cabb62af95e07 17SHA1 (patch-al) = 55c77b3ad49e97e304778f56379cabb62af95e07
18SHA1 (patch-am) = 862ed0d6c699146945bb6c5aff8aaec8030ce101 18SHA1 (patch-am) = 862ed0d6c699146945bb6c5aff8aaec8030ce101
19SHA1 (patch-an) = 0644fda1025698dcb6833672ca88656931cd73dd 19SHA1 (patch-an) = 0644fda1025698dcb6833672ca88656931cd73dd
20SHA1 (patch-ao) = e8c93353d3d73662a55589dc71ceb8d7e03426bd 20SHA1 (patch-ao) = e8c93353d3d73662a55589dc71ceb8d7e03426bd
21SHA1 (patch-ap) = cf6854d683345d51c6d9f19286d73fea693a241a 21SHA1 (patch-ap) = cf6854d683345d51c6d9f19286d73fea693a241a
cvs diff -r1.3 -r1.4 pkgsrc/misc/kdepim4/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/misc/kdepim4/patches/Attic/patch-af 2010/09/01 13:45:25 1.3
+++ pkgsrc/misc/kdepim4/patches/Attic/patch-af 2011/10/02 04:35:03 1.4
@@ -1,38 +1,44 @@ @@ -1,38 +1,44 @@
1$NetBSD: patch-af,v 1.3 2010/09/01 13:45:25 wiz Exp $ 1$NetBSD: patch-af,v 1.4 2011/10/02 04:35:03 markd Exp $
2 2
3libassuan2 support from 3libassuan2 support from
4http://websvn.kde.org/?view=revision&revision=1078528 4http://websvn.kde.org/?view=revision&revision=1078528
5 5
6--- kleopatra/CMakeLists.txt.orig 2009-11-02 12:02:09.000000000 +0000 6-DBOOST_NO_0X_HDR_INITIALIZER_LIST for gcc45 and recent boost
 7
 8--- kleopatra/CMakeLists.txt.orig 2010-12-22 17:51:56.000000000 +0000
7+++ kleopatra/CMakeLists.txt 9+++ kleopatra/CMakeLists.txt
8@@ -2,7 +2,7 @@ project(kleopatra) 10@@ -2,7 +2,7 @@ project(kleopatra)
9  11
10 include(MacroOptionalAddSubdirectory) 12 include(MacroOptionalAddSubdirectory)
11  13
12-set( kleopatra_version 2.0.12 ) 14-set( kleopatra_version 2.0.12 )
13+set( kleopatra_version 2.1.0 ) 15+set( kleopatra_version 2.1.0 )
14 set( kleopatra_release FALSE ) 16 set( kleopatra_release FALSE )
15  17
16 if (NOT kleopatra_release) 18 if (NOT kleopatra_release)
17@@ -28,7 +28,7 @@ include_directories( 19@@ -28,10 +28,11 @@ include_directories(
18 ${QGPGME_INCLUDES} 20 ${QGPGME_INCLUDES}
19 ${GPGME_INCLUDES} ) 21 ${GPGME_INCLUDES} )
20 if (USABLE_ASSUAN_FOUND) 22 if (USABLE_ASSUAN_FOUND)
21- include_directories(${ASSUAN_INCLUDES}) 23- include_directories(${ASSUAN_INCLUDES})
22+ include_directories(${ASSUAN2_INCLUDES}) 24+ include_directories(${ASSUAN2_INCLUDES})
23 endif(USABLE_ASSUAN_FOUND) 25 endif(USABLE_ASSUAN_FOUND)
24 add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -DQT_STL ) 26 add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -DQT_STL )
25 remove_definitions ( -DQT_NO_STL ) 27 remove_definitions ( -DQT_NO_STL )
26@@ -84,11 +84,7 @@ if ( USABLE_ASSUAN_FOUND ) 28+add_definitions( -DBOOST_NO_0X_HDR_INITIALIZER_LIST )
 29
 30 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 31
 32@@ -84,11 +85,7 @@ if ( USABLE_ASSUAN_FOUND )
27 selftest/uiservercheck.cpp 33 selftest/uiservercheck.cpp
28 ) 34 )
29  35
30- if ( WIN32 ) 36- if ( WIN32 )
31- set( _kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES} ) 37- set( _kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES} )
32- else ( WIN32 ) 38- else ( WIN32 )
33- set( _kleopatra_uiserver_extra_libs ${ASSUAN_PTHREAD_LIBRARIES} ) 39- set( _kleopatra_uiserver_extra_libs ${ASSUAN_PTHREAD_LIBRARIES} )
34- endif( WIN32 ) 40- endif( WIN32 )
35+ set( _kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES} ) 41+ set( _kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES} )
36  42
37 if ( HAVE_GPG_ERR_SOURCE_KLEO ) 43 if ( HAVE_GPG_ERR_SOURCE_KLEO )
38 add_definitions( -DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO ) 44 add_definitions( -DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO )