-
Notifications
You must be signed in to change notification settings - Fork 164
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Switch to libassuan2, based on KDE SVN
http://websvn.kde.org/?view=revision&revision=1078528 Suitable SVN commit found by drochner@ ok markd@ Bump PKGREVISION.
- Loading branch information
Showing
14 changed files
with
1,135 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,21 @@ | ||
$NetBSD: distinfo,v 1.10 2010/08/31 12:17:44 markd Exp $ | ||
$NetBSD: distinfo,v 1.11 2010/09/01 13:45:25 wiz Exp $ | ||
|
||
SHA1 (kdepim-4.4.5.tar.bz2) = 84f6367e38948d3595a9f87ae384b41f9f295add | ||
RMD160 (kdepim-4.4.5.tar.bz2) = e033c32fa16d46bfcaea94f64a3a862629965b7e | ||
Size (kdepim-4.4.5.tar.bz2) = 9346777 bytes | ||
SHA1 (patch-aa) = 19bc087365f31f2ab5f62238530185646e3826fb | ||
SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494 | ||
SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18 | ||
SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f | ||
SHA1 (patch-ae) = d45948eb8a083cb2cf900bc946f0f346e1f56d73 | ||
SHA1 (patch-af) = 2a4341c4ae9e1a7aab20fee9c9d27b4cfaa63e1c | ||
SHA1 (patch-ag) = 45a094af644835a0859f354db0c880fc891aa977 | ||
SHA1 (patch-ah) = 5b5235666c568de23fc79ef461df6b8f66a67ce6 | ||
SHA1 (patch-ai) = 304ddaf381ae4cb217d033268868366760c2d071 | ||
SHA1 (patch-aj) = 26285317562f55e1bee4740286069d4c2213d2fa | ||
SHA1 (patch-ak) = ba5152d71810759b4bcbe526f7d05eeb8ed8944b | ||
SHA1 (patch-al) = 55c77b3ad49e97e304778f56379cabb62af95e07 | ||
SHA1 (patch-am) = 862ed0d6c699146945bb6c5aff8aaec8030ce101 | ||
SHA1 (patch-an) = 0644fda1025698dcb6833672ca88656931cd73dd | ||
SHA1 (patch-ao) = e8c93353d3d73662a55589dc71ceb8d7e03426bd | ||
SHA1 (patch-ap) = cf6854d683345d51c6d9f19286d73fea693a241a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,259 @@ | ||
$NetBSD: patch-aa,v 1.1 2010/09/01 13:45:25 wiz Exp $ | ||
|
||
libassuan2 support from | ||
http://websvn.kde.org/?view=revision&revision=1078528 | ||
|
||
--- cmake/modules/FindAssuan2.cmake.orig 2010-08-31 18:25:54.000000000 +0000 | ||
+++ cmake/modules/FindAssuan2.cmake | ||
@@ -0,0 +1,251 @@ | ||
+# - Try to find the assuan v2 library | ||
+ | ||
+# Variables set: | ||
+# ASSUAN2_{INCLUDES,FOUND,LIBRARIES} will be set for each of the above | ||
+ | ||
+# do away with crappy condition repetition on else/endfoo | ||
+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_assuan2_saved ${CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS} ) | ||
+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true ) | ||
+ | ||
+#if this is built-in, please replace, if it isn't, export into a MacroToBool.cmake of it's own | ||
+macro( macro_bool_to_bool FOUND_VAR ) | ||
+ foreach( _current_VAR ${ARGN} ) | ||
+ if ( ${FOUND_VAR} ) | ||
+ set( ${_current_VAR} TRUE ) | ||
+ else() | ||
+ set( ${_current_VAR} FALSE ) | ||
+ endif() | ||
+ endforeach() | ||
+endmacro() | ||
+ | ||
+include (MacroEnsureVersion) | ||
+ | ||
+message( STATUS "In FindAssuan2.cmake" ) | ||
+ | ||
+if ( WIN32 ) | ||
+ | ||
+ # On Windows, we don't have a libassuan-config script, so we need to | ||
+ # look for the stuff ourselves: | ||
+ | ||
+ # in cmake, AND and OR have the same precedence, there's no | ||
+ # subexpressions, and expressions are evaluated short-circuit'ed | ||
+ # IOW: CMake if() suxx. | ||
+ set( _seem_to_have_cached_assuan2 false ) | ||
+ if ( ASSUAN2_INCLUDES ) | ||
+ if ( ASSUAN2_VANILLA_LIBRARIES )#OR ASSUAN2_QT_LIBRARIES OR ASSUAN2_GLIB_LIBRARIES ) | ||
+ set( _seem_to_have_cached_assuan2 true ) | ||
+ endif() | ||
+ endif() | ||
+ | ||
+ if ( _seem_to_have_cached_assuan2 ) | ||
+ | ||
+ macro_bool_to_bool( ASSUAN2_VANILLA_LIBRARIES ASSUAN2_VANILLA_FOUND ) | ||
+ # this would have been preferred: | ||
+ #set( ASSUAN2_*_FOUND macro_bool_to_bool(ASSUAN2_*_LIBRARIES) ) | ||
+ | ||
+ if ( ASSUAN2_VANILLA_FOUND ) #OR ASSUAN2_GLIB_FOUND OR ASSUAN2_QT_FOUND ) | ||
+ set( ASSUAN2_FOUND true ) | ||
+ else() | ||
+ set( ASSUAN2_FOUND false ) | ||
+ endif() | ||
+ | ||
+ else() | ||
+ | ||
+ set( ASSUAN2_FOUND false ) | ||
+ set( ASSUAN2_VANILLA_FOUND false ) | ||
+ #set( ASSUAN2_GLIB_FOUND false ) | ||
+ #set( ASSUAN2_QT_FOUND false ) | ||
+ | ||
+ find_path( ASSUAN2_INCLUDES assuan.h | ||
+ ${CMAKE_INCLUDE_PATH} | ||
+ ${CMAKE_INSTALL_PREFIX}/include | ||
+ ) | ||
+ | ||
+ find_library( _assuan2_library NAMES assuan assuan0 assuan2 libassuan libassuan0 libassuan2 | ||
+ PATHS | ||
+ ${CMAKE_LIBRARY_PATH} | ||
+ ${CMAKE_INSTALL_PREFIX}/lib | ||
+ ) | ||
+ | ||
+ find_library( _gpg_error_library NAMES gpg-error libgpg-error gpg-error-0 libgpg-error-0 | ||
+ PATHS | ||
+ ${CMAKE_LIBRARY_PATH} | ||
+ ${CMAKE_INSTALL_PREFIX}/lib | ||
+ ) | ||
+ | ||
+ set( ASSUAN2_INCLUDES ${ASSUAN2_INCLUDES} ) | ||
+ | ||
+ if ( _assuan2_library AND _gpg_error_library ) | ||
+ set( ASSUAN2_LIBRARIES ${_assuan2_library} ${_gpg_error_library} ws2_32 ) | ||
+ set( ASSUAN2_FOUND true ) | ||
+ endif() | ||
+ | ||
+ endif() | ||
+ | ||
+ macro_bool_to_01( ASSUAN2_FOUND HAVE_ASSUAN2 ) | ||
+ | ||
+else() # not WIN32 | ||
+ | ||
+ # On *nix, we have the libassuan-config script which can tell us all we | ||
+ # need to know: | ||
+ | ||
+ # see WIN32 case for an explanation of what this does: | ||
+ set( _seem_to_have_cached_assuan2 false ) | ||
+ if ( ASSUAN2_INCLUDES AND ASSUAN2_LIBRARIES ) | ||
+ set( _seem_to_have_cached_assuan2 true ) | ||
+ endif() | ||
+ | ||
+ if ( _seem_to_have_cached_assuan2 ) | ||
+ | ||
+ set( ASSUAN2_FOUND true ) | ||
+ | ||
+ else() | ||
+ | ||
+ set( ASSUAN2_FOUND false ) | ||
+ | ||
+ find_program( _ASSUAN2CONFIG_EXECUTABLE NAMES libassuan-config ) | ||
+ | ||
+ # if libassuan-config has been found | ||
+ if ( _ASSUAN2CONFIG_EXECUTABLE ) | ||
+ | ||
+ message( STATUS "Found libassuan-config at ${_ASSUAN2CONFIG_EXECUTABLE}" ) | ||
+ | ||
+ exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE ASSUAN2_VERSION ) | ||
+ | ||
+ set( _ASSUAN2_MIN_VERSION "2.0.0" ) | ||
+ macro_ensure_version( ${_ASSUAN2_MIN_VERSION} ${ASSUAN2_VERSION} _ASSUAN2_INSTALLED_VERSION_OK ) | ||
+ | ||
+ if ( NOT _ASSUAN2_INSTALLED_VERSION_OK ) | ||
+ | ||
+ message( STATUS "The installed version of assuan is too old: ${ASSUAN2_VERSION} (required: >= ${_ASSUAN2_MIN_VERSION})" ) | ||
+ | ||
+ else() | ||
+ | ||
+ message( STATUS "Found assuan v${ASSUAN2_VERSION}" ) | ||
+ | ||
+ exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE _assuan2_config_libs RETURN_VALUE _ret ) | ||
+ if ( _ret ) | ||
+ set( _assuan2_config_libs ) | ||
+ endif() | ||
+ | ||
+ # append -lgpg-error to the list of libraries, if necessary | ||
+ if ( _assuan2_config_libs AND NOT _assuan2_config_libs MATCHES "lgpg-error" ) | ||
+ set( _assuan2_config_libs "${_assuan2_config_libs} -lgpg-error" ) | ||
+ endif() | ||
+ | ||
+ if ( _assuan2_config_libs ) | ||
+ | ||
+ exec_program( ${_ASSUAN2CONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _ASSUAN2_CFLAGS ) | ||
+ | ||
+ if ( _ASSUAN2_CFLAGS ) | ||
+ string( REGEX REPLACE "(\r?\n)+$" " " _ASSUAN2_CFLAGS "${_ASSUAN2_CFLAGS}" ) | ||
+ string( REGEX REPLACE " *-I" ";" ASSUAN2_INCLUDES "${_ASSUAN2_CFLAGS}" ) | ||
+ endif() | ||
+ | ||
+ if ( _assuan2_config_libs ) | ||
+ | ||
+ set( _assuan2_library_dirs ) | ||
+ set( _assuan2_library_names ) | ||
+ | ||
+ string( REGEX REPLACE " +" ";" _assuan2_config_libs "${_assuan2_config_libs}" ) | ||
+ | ||
+ foreach( _flag ${_assuan2_config_libs} ) | ||
+ if ( "${_flag}" MATCHES "^-L" ) | ||
+ string( REGEX REPLACE "^-L" "" _dir "${_flag}" ) | ||
+ file( TO_CMAKE_PATH "${_dir}" _dir ) | ||
+ set( _assuan2_library_dirs ${_assuan2_library_dirs} "${_dir}" ) | ||
+ elseif( "${_flag}" MATCHES "^-l" ) | ||
+ string( REGEX REPLACE "^-l" "" _name "${_flag}" ) | ||
+ set( _assuan2_library_names ${_assuan2_library_names} "${_name}" ) | ||
+ endif() | ||
+ endforeach() | ||
+ | ||
+ set( ASSUAN2_FOUND true ) | ||
+ | ||
+ foreach( _name ${_assuan2_library_names} ) | ||
+ set( _assuan2_${_name}_lib ) | ||
+ | ||
+ # if -L options were given, look only there | ||
+ if ( _assuan2_library_dirs ) | ||
+ find_library( _assuan2_${_name}_lib NAMES ${_name} PATHS ${_assuan2_library_dirs} NO_DEFAULT_PATH ) | ||
+ endif() | ||
+ | ||
+ # if not found there, look in system directories | ||
+ if ( NOT _assuan2_${_name}_lib ) | ||
+ find_library( _assuan2_${_name}_lib NAMES ${_name} ) | ||
+ endif() | ||
+ | ||
+ # if still not found, then the whole flavour isn't found | ||
+ if ( NOT _assuan2_${_name}_lib ) | ||
+ if ( ASSUAN2_FOUND ) | ||
+ set( ASSUAN2_FOUND false ) | ||
+ set( _not_found_reason "dependant library ${_name} wasn't found" ) | ||
+ endif() | ||
+ endif() | ||
+ | ||
+ set( ASSUAN2_LIBRARIES ${ASSUAN2_LIBRARIES} "${_assuan2_${_name}_lib}" ) | ||
+ endforeach() | ||
+ | ||
+ #check_c_library_exists_explicit( assuan assuan_check_version "${_ASSUAN2_CFLAGS}" "${ASSUAN2_LIBRARIES}" ASSUAN2_FOUND ) | ||
+ if ( ASSUAN2_FOUND ) | ||
+ message( STATUS " Checking whether assuan is usable...yes" ) | ||
+ else() | ||
+ message( STATUS " Checking whether assuan is usable...no" ) | ||
+ message( STATUS " (${_not_found_reason})" ) | ||
+ endif() | ||
+ endif() | ||
+ | ||
+ # ensure that they are cached | ||
+ set( ASSUAN2_INCLUDES ${ASSUAN2_INCLUDES} ) | ||
+ set( ASSUAN2_LIBRARIES ${ASSUAN2_LIBRARIES} ) | ||
+ | ||
+ endif() | ||
+ | ||
+ endif() | ||
+ | ||
+ endif() | ||
+ | ||
+ endif() | ||
+ | ||
+ macro_bool_to_01( ASSUAN2_FOUND HAVE_ASSUAN2 ) | ||
+ | ||
+endif() # WIN32 | Unix | ||
+ | ||
+ | ||
+if ( NOT Assuan2_FIND_QUIETLY ) | ||
+ | ||
+ if ( ASSUAN2_FOUND ) | ||
+ message( STATUS "Usable assuan found." ) | ||
+ message( STATUS " Includes: ${ASSUAN2_INCLUDES}" ) | ||
+ message( STATUS " Libraries: ${ASSUAN2_LIBRARIES}" ) | ||
+ else() | ||
+ message( STATUS "No usable assuan found." ) | ||
+ endif() | ||
+ | ||
+ macro_bool_to_bool( Assuan2_FIND_REQUIRED _req ) | ||
+ | ||
+ if ( WIN32 ) | ||
+ set( _assuan2_homepage "http://www.gpg4win.org" ) | ||
+ else() | ||
+ set( _assuan2_homepage "http://www.gnupg.org/related_software/libassuan" ) | ||
+ endif() | ||
+ | ||
+ macro_log_feature( | ||
+ ASSUAN2_FOUND | ||
+ "assuan2" | ||
+ "Assuan v2 IPC library" | ||
+ ${_assuan2_homepage} | ||
+ ${_req} | ||
+ "${_ASSUAN2_MIN_VERSION} or greater" | ||
+ "Needed for Kleopatra to act as the GnuPG UI Server" | ||
+ ) | ||
+ | ||
+else() | ||
+ | ||
+ if ( Assuan2_FIND_REQUIRED AND NOT ASSUAN2_FOUND ) | ||
+ message( FATAL_ERROR "" ) | ||
+ endif() | ||
+ | ||
+endif() | ||
+ | ||
+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS_assuan2_saved ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
$NetBSD: patch-af,v 1.3 2010/09/01 13:45:25 wiz Exp $ | ||
|
||
libassuan2 support from | ||
http://websvn.kde.org/?view=revision&revision=1078528 | ||
|
||
--- kleopatra/CMakeLists.txt.orig 2009-11-02 12:02:09.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,7 +28,7 @@ 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 ) | ||
@@ -84,11 +84,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 ) |
Oops, something went wrong.