- added patches for current gpgme, gtk-doc, appstream 1.0.x; release 3

[packages/Limba.git] / Limba-gpgme.patch

--- Limba-0.5.6/data/cmake/FindGPGMe.cmake.orig	2016-02-28 17:45:24.000000000 +0100
+++ Limba-0.5.6/data/cmake/FindGPGMe.cmake	2024-04-18 21:57:49.314573181 +0200
@@ -186,14 +186,14 @@ else() # not WIN32
     set( GPGME_PTHREAD_FOUND false )
     set( GPGME_PTH_FOUND     false )
 
-    find_program( _GPGMECONFIG_EXECUTABLE NAMES gpgme-config )
+    find_program( _GPGMECONFIG_EXECUTABLE NAMES pkg-config )
 
     # if gpgme-config has been found
     if ( _GPGMECONFIG_EXECUTABLE )
 
       message( STATUS "Found gpgme-config at ${_GPGMECONFIG_EXECUTABLE}" )
 
-      exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION )
+      exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS gpgme --modversion OUTPUT_VARIABLE GPGME_VERSION )
 
       set( _GPGME_MIN_VERSION "1.4.0" )
 
@@ -205,21 +205,11 @@ else() # not WIN32
 
         message( STATUS "Found gpgme v${GPGME_VERSION}, checking for flavours..." )
 
-        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS                  --libs OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret )
+        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS gpgme                  --libs OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret )
 	if ( _ret )
 	  set( _gpgme_config_vanilla_libs )
 	endif()
 
-        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
-	if ( _ret )
-	  set( _gpgme_config_pthread_libs )
-	endif()
-
-        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth     --libs OUTPUT_VARIABLE _gpgme_config_pth_libs     RETURN_VALUE _ret )
-	if ( _ret )
-	  set( _gpgme_config_pth_libs )
-	endif()
-
         # append -lgpg-error to the list of libraries, if necessary
         foreach ( _flavour vanilla pthread pth )
           if ( _gpgme_config_${_flavour}_libs AND NOT _gpgme_config_${_flavour}_libs MATCHES "lgpg-error" )
@@ -229,7 +219,7 @@ else() # not WIN32
 
         if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs OR _gpgme_config_pth_libs )
 
-          exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _GPGME_CFLAGS )
+          exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS gpgme --cflags OUTPUT_VARIABLE _GPGME_CFLAGS )
 
           if ( _GPGME_CFLAGS )
             string( REGEX REPLACE "(\r?\n)+$" " " _GPGME_CFLAGS  "${_GPGME_CFLAGS}" )