]> git.pld-linux.org Git - packages/elektra.git/blob - elektra-gpgme.patch
- updated to 0.11.0
[packages/elektra.git] / elektra-gpgme.patch
1 Avoid:
2 CMake Error in src/plugins/gpgme/CMakeLists.txt:
3   Found relative path while evaluating include directories of
4   "elektra-gpgme-objects":
5
6     "-D_FILE_OFFSET_BITS=64"
7
8 --- elektra-0.9.14/scripts/cmake/Modules/FindLibGpgme.cmake.orig        2023-08-25 20:22:55.946714270 +0200
9 +++ elektra-0.9.14/scripts/cmake/Modules/FindLibGpgme.cmake     2023-08-25 20:25:26.262566605 +0200
10 @@ -44,6 +44,31 @@ if (GPGME_EXECUTABLE)
11                 set (LIBGPGME_FOUND TRUE)
12         endif (LIBGPGME_LIBRARIES AND LIBGPGME_CFLAGS)
13  
14 +else (GPGME_EXECUTABLE)
15 +
16 +       execute_process (
17 +               COMMAND pkg-config gpgme --libs
18 +               RESULT_VARIABLE _return_VALUE
19 +               OUTPUT_VARIABLE LIBGPGME_LIBRARIES
20 +               OUTPUT_STRIP_TRAILING_WHITESPACE)
21 +       execute_process (
22 +               COMMAND pkg-config gpgme --cflags
23 +               RESULT_VARIABLE _return_VALUE
24 +               OUTPUT_VARIABLE LIBGPGME_CFLAGS
25 +               OUTPUT_STRIP_TRAILING_WHITESPACE)
26 +       execute_process (
27 +               COMMAND pkg-config gpgme --modversion
28 +               RESULT_VARIABLE _return_VALUE
29 +               OUTPUT_VARIABLE LIBGPGME_VERSION
30 +               OUTPUT_STRIP_TRAILING_WHITESPACE)
31 +
32 +       if (NOT LIBGPGME_CFLAGS AND NOT _return_VALUE)
33 +               set (LIBGPGME_CFLAGS " ")
34 +       endif (NOT LIBGPGME_CFLAGS AND NOT _return_VALUE)
35 +
36 +       if (LIBGPGME_LIBRARIES AND LIBGPGME_CFLAGS)
37 +               set (LIBGPGME_FOUND TRUE)
38 +       endif (LIBGPGME_LIBRARIES AND LIBGPGME_CFLAGS)
39  endif (GPGME_EXECUTABLE)
40  
41  if (LIBGPGME_FOUND)
42 @@ -55,7 +70,10 @@ if (LIBGPGME_FOUND)
43         # parse include directory from C-Flags
44         string (LENGTH "${LIBGPGME_CFLAGS}" LIBGPGME_CFLAGS_LEN)
45         if (${LIBGPGME_CFLAGS_LEN} GREATER 1)
46 -               string (REPLACE "-I" "" LIBGPGME_INCLUDE_DIRS "${LIBGPGME_CFLAGS}")
47 +               string (REGEX REPLACE "-D[A-Za-z0-9_=]* *" ""
48 +                       LIBGPGME_INCLUDE_DIRS
49 +                       "${LIBGPGME_CFLAGS}")
50 +               string (REPLACE "-I" "" LIBGPGME_INCLUDE_DIRS "${LIBGPGME_INCLUDE_DIRS}")
51                 string (REPLACE " " ";" LIBGPGME_INCLUDE_DIRS "${LIBGPGME_INCLUDE_DIRS}")
52  
53         endif ()
54 --- elektra-0.9.14/src/plugins/gpgme/CMakeLists.txt.orig        2023-08-25 20:22:55.950047585 +0200
55 +++ elektra-0.9.14/src/plugins/gpgme/CMakeLists.txt     2023-08-25 20:27:16.921967112 +0200
56 @@ -16,6 +16,7 @@ add_plugin (
57         SOURCES ${GPGME_SOURCE_FILES}
58         INCLUDE_DIRECTORIES ${LIBGPGME_INCLUDE_DIRS}
59         LINK_LIBRARIES ${LIBGPGME_LIBRARIES}
60 +       COMPILE_DEFINITIONS "_FILE_OFFSET_BITS=64"
61         ADD_TEST COMPONENT libelektra${SO_VERSION}-experimental)
62  
63  if (ADDTESTING_PHASE)
This page took 0.093748 seconds and 3 git commands to generate.