]> git.pld-linux.org Git - packages/qdigidoc.git/blob - sandbox-compilation.patch
968ab502b65c54ecb544cc8bbf3937bdf60dcd12
[packages/qdigidoc.git] / sandbox-compilation.patch
1 diff -Naur qdigidoc-3.12.2_orig/client/CMakeLists.txt qdigidoc-3.12.2_patched/client/CMakeLists.txt
2 --- qdigidoc-3.12.2_orig/client/CMakeLists.txt  2016-07-10 10:42:40.000000000 +0300
3 +++ qdigidoc-3.12.2_patched/client/CMakeLists.txt       2016-07-10 13:00:07.208755715 +0300
4 @@ -1,14 +1,5 @@
5  set_app_name( PROGNAME qdigidocclient )
6  
7 -add_executable( TSLDownload TSLDownload.cpp )
8 -target_link_libraries( TSLDownload Qt5::Network )
9 -add_custom_command(
10 -       OUTPUT TSL.qrc tl-mp.xml EE.xml
11 -       DEPENDS TSLDownload
12 -       COMMAND $<TARGET_FILE:TSLDownload> "${CMAKE_CURRENT_BINARY_DIR}" EE
13 -       WORKING_DIRECTORY ${_qt5Core_install_prefix}/bin
14 -)
15 -
16  add_definitions( -DPKCS11_MODULE="${PKCS11_MODULE}" )
17  include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/common ${OPENSSL_INCLUDE_DIR} )
18  
19 @@ -58,6 +49,7 @@
20         Qt5::PrintSupport
21         ${LIBDIGIDOCPP_LIBRARY}
22         ${ADDITIONAL_LIBRARIES}
23 +       pthread
24  )
25  
26  if( APPLE )
27 diff -Naur qdigidoc-3.12.2_orig/common/CMakeLists.txt qdigidoc-3.12.2_patched/common/CMakeLists.txt
28 --- qdigidoc-3.12.2_orig/common/CMakeLists.txt  2016-07-10 10:42:42.000000000 +0300
29 +++ qdigidoc-3.12.2_patched/common/CMakeLists.txt       2016-07-10 13:02:48.969572573 +0300
30 @@ -19,13 +19,8 @@
31         endif()
32         add_definitions( -DCONFIG_URL="${CONFIG_URL}" )
33         list( APPEND SOURCES Configuration.cpp )
34 -       file( DOWNLOAD ${CONFIG_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.json )
35 -       string( REPLACE ".json" ".rsa" RSA_URL ${CONFIG_URL} )
36 -       file( DOWNLOAD ${RSA_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.rsa )
37 -       string( REPLACE ".json" ".pub" PUB_URL ${CONFIG_URL} )
38 -       file( DOWNLOAD ${PUB_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.pub )
39 -       configure_file( config.qrc config.qrc COPYONLY )
40         qt5_add_resources( SOURCES ${CMAKE_CURRENT_BINARY_DIR}/config.qrc )
41 +       list( APPEND RC_FILES config.qrc )
42  endif()
43  
44  if( WIN32 )
This page took 0.035763 seconds and 2 git commands to generate.