diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-10-19 13:23:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-19 13:23:12 -0700 |
| commit | bb7d4f29f073398d591619eb57c8a2065ee7a418 (patch) | |
| tree | 73f0168e46ceac3a24be02f8036a74ca26aec1f6 | |
| parent | 27a2418e91179d8607862348d7b498558e98a0ab (diff) | |
| download | vcpkg-bb7d4f29f073398d591619eb57c8a2065ee7a418.tar.gz vcpkg-bb7d4f29f073398d591619eb57c8a2065ee7a418.zip | |
[qca] Re-fix find pkgconfig using FindPkgConfig.cmake (#14110)
| -rw-r--r-- | ports/qca/0003-disable-plugin-botan.patch | 13 | ||||
| -rw-r--r-- | ports/qca/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qca/portfile.cmake | 19 |
3 files changed, 19 insertions, 15 deletions
diff --git a/ports/qca/0003-disable-plugin-botan.patch b/ports/qca/0003-disable-plugin-botan.patch deleted file mode 100644 index 4819984f9..000000000 --- a/ports/qca/0003-disable-plugin-botan.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt -index 6d354dc..dd344a6 100644 ---- a/plugins/CMakeLists.txt -+++ b/plugins/CMakeLists.txt -@@ -2,7 +2,7 @@ - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME}/crypto") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME}/crypto") - --set(PLUGINS "botan;cyrus-sasl;gcrypt;gnupg;logger;nss;ossl;pkcs11;softstore" CACHE INTERNAL "") -+set(PLUGINS "cyrus-sasl;gcrypt;gnupg;logger;nss;ossl;pkcs11;softstore" CACHE INTERNAL "") - - # Initialize WITH_${PLUGIN}_PLUGIN cache variables - foreach(PLUGIN IN LISTS PLUGINS) diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL index baab3cde6..5cc9bb1d6 100644 --- a/ports/qca/CONTROL +++ b/ports/qca/CONTROL @@ -1,6 +1,6 @@ Source: qca Version: 2.3.1 -Port-Version: 1 +Port-Version: 2 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 494227cae..34a806169 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -20,9 +20,26 @@ vcpkg_from_github( PATCHES 0001-fix-path-for-vcpkg.patch 0002-fix-build-error.patch - 0003-disable-plugin-botan.patch ) +# Remove these files on the cmake next update +vcpkg_download_distfile(ARCHIVE_PKGCONFIG + URLS "https://gitlab.kitware.com/cmake/cmake/-/raw/ab8bd48352df060c4ead210fe30dc4736646206b/Modules/FindPkgConfig.cmake?inline=false" + FILENAME "FindPkgConfig.cmake" + SHA512 d9aada8107eac9ada197d0b1e9040cd3707de7f5838c90bca80321e8eb35931f520635800bea0e2aafeca7fafb08b8e4752d5c6c2d6b1a5d5b4e3225d7818aa6 +) +vcpkg_download_distfile(ARCHIVE_PKGHSA + URLS "https://gitlab.kitware.com/cmake/cmake/-/raw/ab8bd48352df060c4ead210fe30dc4736646206b/Modules/FindPackageHandleStandardArgs.cmake?inline=false" + FILENAME "FindPackageHandleStandardArgs.cmake" + SHA512 61a459a9e0797f976fae36ce4fd5a18a30bd13e8bc9d65d165ca760e13ddc27a8c8ad371ad4b41cc36fe227425424fe9bc6e4dfa5cfdc68bd59a3c10005cf3b4 +) +vcpkg_download_distfile(ARCHIVE_PKGMSG + URLS "https://gitlab.kitware.com/cmake/cmake/-/raw/ab8bd48352df060c4ead210fe30dc4736646206b/Modules/FindPackageMessage.cmake?inline=false" + FILENAME "FindPackageMessage.cmake" + SHA512 44af652038ecd98c1e54f440e67994759345290530b36f687b7e6d5c310caa55597f3718901fe7a3f8816b560f03b8f238d90aab6ce9b1b24391ab0bb2aa44a8 +) +file(COPY ${ARCHIVE_PKGCONFIG} ${ARCHIVE_PKGHSA} ${ARCHIVE_PKGMSG} DESTINATION ${SOURCE_PATH}/cmake/modules) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(QCA_FEATURE_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/Qca) set(QCA_FEATURE_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/bin/Qca) |