diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-06-11 01:03:13 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-06-10 10:03:13 -0700 |
| commit | 5ee04646c5f6c2a8ae77a566b2eea3e9b89de28a (patch) | |
| tree | 16a297fe5a40cc8b8b63900202212a7268bc3a2a | |
| parent | 88a3c99f07615fc254f85524b0690ae890e340ab (diff) | |
| download | vcpkg-5ee04646c5f6c2a8ae77a566b2eea3e9b89de28a.tar.gz vcpkg-5ee04646c5f6c2a8ae77a566b2eea3e9b89de28a.zip | |
[qca]Upgrade version to 2.2.1 and fix build error. (#6839)
| -rw-r--r-- | ports/qca/0002-fix-build-error.patch | 57 | ||||
| -rw-r--r-- | ports/qca/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qca/portfile.cmake | 8 |
3 files changed, 63 insertions, 4 deletions
diff --git a/ports/qca/0002-fix-build-error.patch b/ports/qca/0002-fix-build-error.patch new file mode 100644 index 000000000..f4ddee3a0 --- /dev/null +++ b/ports/qca/0002-fix-build-error.patch @@ -0,0 +1,57 @@ +diff --git a/plugins/qca-gnupg/CMakeLists.txt b/plugins/qca-gnupg/CMakeLists.txt +index 1ed8e21..20890dd 100644 +--- a/plugins/qca-gnupg/CMakeLists.txt ++++ b/plugins/qca-gnupg/CMakeLists.txt +@@ -68,6 +68,4 @@ if(NOT DEVELOPER_MODE) + LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") +- +- 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 +--- a/plugins/qca-logger/CMakeLists.txt ++++ b/plugins/qca-logger/CMakeLists.txt +@@ -20,6 +20,4 @@ if(NOT DEVELOPER_MODE) + LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") +- +- 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 +--- a/plugins/qca-ossl/CMakeLists.txt ++++ b/plugins/qca-ossl/CMakeLists.txt +@@ -65,8 +65,6 @@ if(OPENSSL_FOUND) + LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") +- +- install_pdb(qca-ossl ${QCA_CRYPTO_INSTALL_DIR}) + endif() + + else(OPENSSL_FOUND) +diff --git a/plugins/qca-softstore/CMakeLists.txt b/plugins/qca-softstore/CMakeLists.txt +index d7af072..3c64870 100644 +--- a/plugins/qca-softstore/CMakeLists.txt ++++ b/plugins/qca-softstore/CMakeLists.txt +@@ -20,6 +20,4 @@ if(NOT DEVELOPER_MODE) + LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") +- +- install_pdb(qca-softstore ${QCA_CRYPTO_INSTALL_DIR}) + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2e81974..907049c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -184,6 +184,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}" + ) +- install_pdb(${QCA_LIB_NAME} ${QCA_BINARY_INSTALL_DIR}) + endif() + diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL index 4c09bf3b1..f55a37e78 100644 --- a/ports/qca/CONTROL +++ b/ports/qca/CONTROL @@ -1,4 +1,4 @@ Source: qca -Version: 2.2.0-4 +Version: 2.2.1 Description: Qt Cryptographic Architecture (QCA). Sources: https://cgit.kde.org/qca.git/ Build-Depends: qt5-base diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 55acdc0b6..9b2b15397 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -20,9 +20,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/qca - REF 19ec49f89a0a560590ec733c549b92e199792837 - SHA512 6a83ee6715a9a922f4fde5af571e2aad043ac5cbd522f57365038dd31879b44eb57a099ff797793d7ee19e320e0a151e5beacdff3bed525d39ea0b8e46efca9a - PATCHES 0001-fix-path-for-vcpkg.patch + REF v2.2.1 + SHA512 6b10f9bbf9ebf136655d1c6464f3849c8581b3cd5ef07b0697ddd5f32611dce301af5148e8e6fe91e763301e68994957a62a278334ee7a78559101f411f27d49 + PATCHES + 0001-fix-path-for-vcpkg.patch + 0002-fix-build-error.patch ) # According to: |