Control: tags -1 patch On 2022-11-20 Andreas Metzler <ametz...@bebt.de> wrote: [...] > the package relies on gpgme-config to detect gpgme. gpgme-config has been > dropped and replaced by pkg-config pc files. Fix looks straightforward, > just move over to cmake pkg_check_modules() in util/CMakeLists.txt.
Straightforward patch attached. cu Andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
Description: Use pkg-config to locate gpgme Author: Andreas Metzler <ametz...@debian.org> Origin: vendor Bug-Debian: https://bugs.debian.org/1024489 Forwarded: no Last-Update: 2022-12-08 --- gvm-libs-21.4.4.orig/util/CMakeLists.txt +++ gvm-libs-21.4.4/util/CMakeLists.txt @@ -53,28 +53,12 @@ pkg_check_modules (LIBXML2 REQUIRED libx #for gpgmeutils we need libgpgme set (GPGME_MIN_VERSION "1.7.0") message (STATUS "Looking for gpgme...") -find_library (GPGME gpgme) -if (NOT GPGME) - message (SEND_ERROR "The gpgme library is required.") -else (NOT GPGME) - execute_process (COMMAND gpgme-config --version - OUTPUT_VARIABLE GPGME_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - message (STATUS "Found gpgme: ${GPGME}, version ${GPGME_VERSION}") - if (GPGME_VERSION VERSION_LESS GPGME_MIN_VERSION) - message (SEND_ERROR "The gpgme library >= ${GPGME_MIN_VERSION} is required.") - else (GPGME_VERSION VERSION_LESS GPGME_MIN_VERSION) - execute_process (COMMAND gpgme-config --libs - OUTPUT_VARIABLE GPGME_LDFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process (COMMAND gpgme-config --cflags - OUTPUT_VARIABLE GPGME_CFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1") - string(REPLACE "-I" "" GPGME_INCLUDE_DIRS "${GPGME_CFLAGS}") - endif (GPGME_VERSION VERSION_LESS GPGME_MIN_VERSION) -endif (NOT GPGME) +pkg_search_module(GPGME REQUIRED gpgme>=${GPGME_MIN_VERSION}) +if (${GPGME_FOUND}) + message (STATUS "found gpgme ${GPGME_VERSION}") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1") +endif (${GPGME_FOUND}) message (STATUS "Looking for libcrypt...") find_library (CRYPT crypt) @@ -179,7 +163,7 @@ if (BUILD_SHARED) set_target_properties (gvm_util_shared PROPERTIES PUBLIC_HEADER "${HEADERS}") target_link_libraries (gvm_util_shared LINK_PRIVATE ${GLIB_LDFLAGS} - ${GIO_LDFLAGS} ${GPGME_LDFLAGS} ${ZLIB_LDFLAGS} + ${GIO_LDFLAGS} ${GPGME_LIBRARIES} ${ZLIB_LDFLAGS} ${RADIUS_LDFLAGS} ${LIBSSH_LDFLAGS} ${GNUTLS_LDFLAGS} ${GCRYPT_LDFLAGS} ${LDAP_LDFLAGS} ${REDIS_LDFLAGS} ${LIBXML2_LDFLAGS} ${UUID_LDFLAGS}
