From 398909362687aba6140b9855703f744b872a4bdc Mon Sep 17 00:00:00 2001 From: Vitaly Date: Mon, 13 Dec 2021 23:22:14 +0300 Subject: [PATCH] [qtkeychain] Support to build with less dependencies (#21965) * [qtkeychain] Support to build with less dependencies * Update version database --- ports/qtkeychain/portfile.cmake | 7 +++++++ ports/qtkeychain/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 2 +- versions/q-/qtkeychain.json | 5 +++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ports/qtkeychain/portfile.cmake b/ports/qtkeychain/portfile.cmake index 794694648ef..f631232282a 100644 --- a/ports/qtkeychain/portfile.cmake +++ b/ports/qtkeychain/portfile.cmake @@ -8,12 +8,19 @@ vcpkg_from_github( HEAD_REF master ) +# Opportunity to build without dependency on qt5-tools/qt5-declarative +set(BUILD_TRANSLATIONS OFF) +if("translations" IN_LIST FEATURES) + set(BUILD_TRANSLATIONS ON) +endif() + vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_WITH_QT6=OFF -DBUILD_TEST_APPLICATION=OFF + -DBUILD_TRANSLATIONS=${BUILD_TRANSLATIONS} ) vcpkg_cmake_install() diff --git a/ports/qtkeychain/vcpkg.json b/ports/qtkeychain/vcpkg.json index ca581e822b6..af15c267924 100644 --- a/ports/qtkeychain/vcpkg.json +++ b/ports/qtkeychain/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtkeychain", "version": "0.13.2", + "port-version": 1, "description": "(Unaffiliated with Qt) Platform-independent Qt5 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", "license": "BSD-3-Clause", @@ -9,7 +10,6 @@ "name": "libsecret", "platform": "!(windows | uwp | osx)" }, - "qt5-tools", { "name": "vcpkg-cmake", "host": true @@ -18,5 +18,16 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "translations" + ], + "features": { + "translations": { + "description": "Build qtkeychain translations", + "dependencies": [ + "qt5-tools" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 67eb4f1e076..0afada6800b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5738,7 +5738,7 @@ }, "qtkeychain": { "baseline": "0.13.2", - "port-version": 0 + "port-version": 1 }, "qtkeychain-qt6": { "baseline": "0.13.2", diff --git a/versions/q-/qtkeychain.json b/versions/q-/qtkeychain.json index 2ca47f28734..3016ce87b99 100644 --- a/versions/q-/qtkeychain.json +++ b/versions/q-/qtkeychain.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef01f1d6401814e50c0438d3a8a7770568ac93ca", + "version": "0.13.2", + "port-version": 1 + }, { "git-tree": "2dda8930cc8e73b1741effda2750a980c0209e24", "version": "0.13.2",