diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 9d8a91c269d..599801eaeae 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -19,6 +19,8 @@ vcpkg_from_github( 0003-Define-NOMINMAX-for-botan-plugin-with-MSVC.patch ) +vcpkg_find_acquire_program(PKGCONFIG) + 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) @@ -62,6 +64,7 @@ vcpkg_cmake_configure( -DQCA_SUFFIX=OFF -DQCA_FEATURE_INSTALL_DIR=share/qca/mkspecs/features -DOSX_FRAMEWORK=OFF + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" OPTIONS_DEBUG -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_DEBUG} OPTIONS_RELEASE diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json index ed3534d2e51..dde4c6dcd4a 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qca", "version": "2.3.5", - "port-version": 1, + "port-version": 2, "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://userbase.kde.org/QCA", "dependencies": [ @@ -29,11 +29,7 @@ "botan": { "description": "Build with botan", "dependencies": [ - "botan", - { - "name": "pkgconf", - "host": true - } + "botan" ] } } diff --git a/versions/baseline.json b/versions/baseline.json index f549580dba7..df74fe7402c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6366,7 +6366,7 @@ }, "qca": { "baseline": "2.3.5", - "port-version": 1 + "port-version": 2 }, "qcustomplot": { "baseline": "2.1.1", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index 9cb5b84be99..d032255dc1d 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32321bfdc0e4563ed40687585b48038d551f6149", + "version": "2.3.5", + "port-version": 2 + }, { "git-tree": "a5af940aef31f91feea8cb12daddb268a7cf4608", "version": "2.3.5",