diff --git a/ports/qca/0001-fix-path-for-vcpkg.patch b/ports/qca/0001-fix-path-for-vcpkg.patch index 9db22af1d4f3ae..d30c65de2277ce 100644 --- a/ports/qca/0001-fix-path-for-vcpkg.patch +++ b/ports/qca/0001-fix-path-for-vcpkg.patch @@ -1,17 +1,8 @@ -From a3a8d50f3bdcb4df630f7126718c21f23efd7832 Mon Sep 17 00:00:00 2001 -From: Alexander Kaspar -Date: Wed, 30 Nov 2016 15:45:12 +0100 -Subject: [PATCH] fix path for vcpkg - ---- - CMakeLists.txt | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 605621b..3b5a9be 100644 +index 1f84c2c..e9ea235 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -277,7 +277,7 @@ if(DEVELOPER_MODE) +@@ -268,7 +268,7 @@ if(DEVELOPER_MODE) # To prefer plugins from build tree when run qca from build tree file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf "[Paths] @@ -20,16 +11,16 @@ index 605621b..3b5a9be 100644 ") endif() -@@ -320,7 +320,7 @@ else (qca_CERTSTORE) +@@ -309,7 +309,7 @@ else() set( qca_CERTSTORE "${CMAKE_CURRENT_SOURCE_DIR}/certs/rootcerts.pem") # note that INSTALL_FILES targets are relative to the current installation prefix... if(NOT DEVELOPER_MODE) - install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/certs") + install(FILES "${qca_CERTSTORE}" DESTINATION "${QCA_PREFIX_INSTALL_DIR}/share/qca/certs") endif() - endif (qca_CERTSTORE) + endif() message(STATUS "certstore path: " ${qca_CERTSTORE}) -@@ -401,10 +401,10 @@ endif(DOXYGEN_FOUND) +@@ -390,10 +390,10 @@ endif() include(CMakePackageConfigHelpers) configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/QcaConfig.cmake.in" @@ -43,7 +34,7 @@ index 605621b..3b5a9be 100644 if(NOT DEVELOPER_MODE) -@@ -472,10 +472,10 @@ if(NOT DEVELOPER_MODE) +@@ -461,10 +461,10 @@ if(NOT DEVELOPER_MODE) endif() endif() @@ -58,6 +49,3 @@ index 605621b..3b5a9be 100644 + DESTINATION ${QCA_PREFIX_INSTALL_DIR}/share/qca/cmake ) endif() --- -2.8.1.windows.1 - diff --git a/ports/qca/0002-fix-build-error.patch b/ports/qca/0002-fix-build-error.patch index f4ddee3a0a482e..e11515d0cb8774 100644 --- a/ports/qca/0002-fix-build-error.patch +++ b/ports/qca/0002-fix-build-error.patch @@ -1,8 +1,8 @@ diff --git a/plugins/qca-gnupg/CMakeLists.txt b/plugins/qca-gnupg/CMakeLists.txt -index 1ed8e21..20890dd 100644 +index cbe33b6..09d1123 100644 --- a/plugins/qca-gnupg/CMakeLists.txt +++ b/plugins/qca-gnupg/CMakeLists.txt -@@ -68,6 +68,4 @@ if(NOT DEVELOPER_MODE) +@@ -53,6 +53,4 @@ if(NOT DEVELOPER_MODE) LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") @@ -10,10 +10,10 @@ index 1ed8e21..20890dd 100644 - install_pdb(qca-gnupg ${QCA_CRYPTO_INSTALL_DIR}) endif() diff --git a/plugins/qca-logger/CMakeLists.txt b/plugins/qca-logger/CMakeLists.txt -index ba6926e..45e1986 100644 +index 9f8b434..9a62b55 100644 --- a/plugins/qca-logger/CMakeLists.txt +++ b/plugins/qca-logger/CMakeLists.txt -@@ -20,6 +20,4 @@ if(NOT DEVELOPER_MODE) +@@ -19,6 +19,4 @@ if(NOT DEVELOPER_MODE) LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") @@ -21,10 +21,10 @@ index ba6926e..45e1986 100644 - install_pdb(qca-logger ${QCA_CRYPTO_INSTALL_DIR}) endif() diff --git a/plugins/qca-ossl/CMakeLists.txt b/plugins/qca-ossl/CMakeLists.txt -index af3d756..c8480a3 100644 +index efffbb5..bd6522e 100644 --- a/plugins/qca-ossl/CMakeLists.txt +++ b/plugins/qca-ossl/CMakeLists.txt -@@ -65,8 +65,6 @@ if(OPENSSL_FOUND) +@@ -64,8 +64,6 @@ if(OPENSSL_FOUND) LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") @@ -32,12 +32,12 @@ index af3d756..c8480a3 100644 - install_pdb(qca-ossl ${QCA_CRYPTO_INSTALL_DIR}) endif() - else(OPENSSL_FOUND) + else() diff --git a/plugins/qca-softstore/CMakeLists.txt b/plugins/qca-softstore/CMakeLists.txt -index d7af072..3c64870 100644 +index 0896801..069bfb0 100644 --- a/plugins/qca-softstore/CMakeLists.txt +++ b/plugins/qca-softstore/CMakeLists.txt -@@ -20,6 +20,4 @@ if(NOT DEVELOPER_MODE) +@@ -19,6 +19,4 @@ if(NOT DEVELOPER_MODE) LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") @@ -45,10 +45,10 @@ index d7af072..3c64870 100644 - install_pdb(qca-softstore ${QCA_CRYPTO_INSTALL_DIR}) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2e81974..907049c 100644 +index 7066839..41877d0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -184,6 +184,5 @@ if(NOT DEVELOPER_MODE) +@@ -167,6 +167,5 @@ if(NOT DEVELOPER_MODE) FRAMEWORK DESTINATION "${QCA_LIBRARY_INSTALL_DIR}" PUBLIC_HEADER DESTINATION "${QCA_FULL_INCLUDE_INSTALL_DIR}" INCLUDES DESTINATION "${QCA_FULL_INCLUDE_INSTALL_DIR}" ) diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL index 0eadcc148d7324..7eacba3928df69 100644 --- a/ports/qca/CONTROL +++ b/ports/qca/CONTROL @@ -1,5 +1,5 @@ Source: qca -Version: 2.2.1-1 +Version: 2.3.1 Description: Qt Cryptographic Architecture (QCA). Homepage: https://cgit.kde.org/qca.git/ Build-Depends: qt5-base[core] diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 9b2b1539736fed..2ee952ab7eeb93 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -5,8 +5,6 @@ # Updated certstore. See certstore.pem in the output dirs # -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_find_acquire_program(PERL) @@ -20,11 +18,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/qca - REF v2.2.1 - SHA512 6b10f9bbf9ebf136655d1c6464f3849c8581b3cd5ef07b0697ddd5f32611dce301af5148e8e6fe91e763301e68994957a62a278334ee7a78559101f411f27d49 + REF 6c5486c227413adb26258ddaa733dd5ed3ce5430 # v2.3.1 + SHA512 aaa94862d796c207a2f71096bc93e93a0ca8753a63de15e7569ea4f3bc8d4e0bb5d6d140a40283ef9be42d3825639ccc4c63181ed793239e70ec18aac83a687f PATCHES - 0001-fix-path-for-vcpkg.patch - 0002-fix-build-error.patch + 0001-fix-path-for-vcpkg.patch + 0002-fix-build-error.patch ) # According to: @@ -94,5 +92,4 @@ file(REMOVE_RECURSE message(STATUS "Patching files done") # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/qca) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/qca/COPYING ${CURRENT_PACKAGES_DIR}/share/qca/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)