misc/kdepim4/patches/patch-af

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