Skip to content

[qtkeychain(-qt6)] update to 0.13.2 #21529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 1 commit into from
Nov 20, 2021
Merged

[qtkeychain(-qt6)] update to 0.13.2 #21529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions ports/qtkeychain-qt6/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO frankosterfeld/qtkeychain
REF v0.13.1
SHA512 552c1632a81f64b91dacdb0f5eb4122b4ddef53ba6621561db6c4fce9f3692761dbc4b452e578023e2882e049874148be1de014397675ce443cfc93fe96f6f70
REF v0.13.2
SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb
HEAD_REF master
)

Expand All @@ -18,12 +18,6 @@ if(VCPKG_CROSSCOMPILING)
endif()

list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TEST_APPLICATION:BOOL=OFF)
# TODO: remove after next release since https://github.com/frankosterfeld/qtkeychain/pull/204 was merged
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=ON)
else()
list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=OFF)
endif()

# FIXME: Why does build translations fail on arm64-windows?
if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL arm64)
Expand Down
2 changes: 1 addition & 1 deletion ports/qtkeychain-qt6/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qtkeychain-qt6",
"version": "0.13.1",
"version": "0.13.2",
"description": "(Unaffiliated with Qt) Platform-independent Qt6 API for storing passwords securely",
"homepage": "https://github.com/frankosterfeld/qtkeychain",
"license": "BSD-3-Clause",
Expand Down
14 changes: 3 additions & 11 deletions ports/qtkeychain/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,17 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO frankosterfeld/qtkeychain
REF v0.13.1
SHA512 552c1632a81f64b91dacdb0f5eb4122b4ddef53ba6621561db6c4fce9f3692761dbc4b452e578023e2882e049874148be1de014397675ce443cfc93fe96f6f70
REF v0.13.2
SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb
HEAD_REF master
)

list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TEST_APPLICATION:BOOL=OFF)
# TODO: remove after next release since https://github.com/frankosterfeld/qtkeychain/pull/204 was merged
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=ON)
else()
list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=OFF)
endif()

vcpkg_cmake_configure(
DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DBUILD_WITH_QT6=OFF
${QTKEYCHAIN_OPTIONS}
-DBUILD_TEST_APPLICATION=OFF
)
vcpkg_cmake_install()

Expand Down
2 changes: 1 addition & 1 deletion ports/qtkeychain/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qtkeychain",
"version": "0.13.1",
"version": "0.13.2",
"description": "(Unaffiliated with Qt) Platform-independent Qt5 API for storing passwords securely",
"homepage": "https://github.com/frankosterfeld/qtkeychain",
"license": "BSD-3-Clause",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5685,11 +5685,11 @@
"port-version": 0
},
"qtkeychain": {
"baseline": "0.13.1",
"baseline": "0.13.2",
"port-version": 0
},
"qtkeychain-qt6": {
"baseline": "0.13.1",
"baseline": "0.13.2",
"port-version": 0
},
"qtlocation": {
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtkeychain-qt6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b3df36df3c274f528e53cd1f8366811231b15151",
"version": "0.13.2",
"port-version": 0
},
{
"git-tree": "29acc8309b4310f9b05f7c11cd81b0fd06dcbfff",
"version": "0.13.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtkeychain.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2dda8930cc8e73b1741effda2750a980c0209e24",
"version": "0.13.2",
"port-version": 0
},
{
"git-tree": "ff34038b321dbfe954208b0ec4844c1066dde839",
"version": "0.13.1",
Expand Down