mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 20:59:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[qca]Upgrade version to 2.2.1 and fix build error. (#6839)

Browse Source
This commit is contained in:
JackBoosY 2019-06-11 01:03:13 +08:00 committed by Phil Christensen
parent 88a3c99f07
commit 5ee04646c5
3 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ports/qca/0002-fix-build-error.patch Normal file
View File

@ -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()

2
ports/qca/CONTROL
View File

@ -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

8
ports/qca/portfile.cmake
View File

@ -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: