blob: c4e5a7fa37f07220957633699837e9b38831c79d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
$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
-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)
include(MacroOptionalAddSubdirectory)
-set( kleopatra_version 2.0.12 )
+set( kleopatra_version 2.1.0 )
set( kleopatra_release FALSE )
if (NOT kleopatra_release)
@@ -28,10 +28,11 @@ include_directories(
${QGPGME_INCLUDES}
${GPGME_INCLUDES} )
if (USABLE_ASSUAN_FOUND)
- include_directories(${ASSUAN_INCLUDES})
+ include_directories(${ASSUAN2_INCLUDES})
endif(USABLE_ASSUAN_FOUND)
add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -DQT_STL )
remove_definitions ( -DQT_NO_STL )
+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
)
- if ( WIN32 )
- set( _kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES} )
- else ( WIN32 )
- set( _kleopatra_uiserver_extra_libs ${ASSUAN_PTHREAD_LIBRARIES} )
- endif( WIN32 )
+ set( _kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES} )
if ( HAVE_GPG_ERR_SOURCE_KLEO )
add_definitions( -DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO )
|
