diff --git a/ports/qtkeychain-qt6/dbus-emscripten.patch b/ports/qtkeychain-qt6/dbus-emscripten.patch new file mode 100644 index 0000000000..f7e3e354e5 --- /dev/null +++ b/ports/qtkeychain-qt6/dbus-emscripten.patch @@ -0,0 +1,52 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -65,7 +65,7 @@ + set(QTANDROIDEXTRAS_LIBRARIES ${Qt5AndroidExtras_LIBRARIES}) + endif() + +- if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU) ++ if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU AND NOT EMSCRIPTEN) + find_package(Qt5 COMPONENTS DBus REQUIRED) + include_directories(${Qt5DBus_INCLUDE_DIRS}) + set(QTDBUS_LIBRARIES ${Qt5DBus_LIBRARIES}) +@@ -95,7 +95,7 @@ + set(QTKEYCHAIN_VERSION_INFIX 6) + + +- if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU) ++ if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU AND NOT EMSCRIPTEN) + find_package(Qt6 COMPONENTS DBus REQUIRED) + include_directories(${Qt6DBus_INCLUDE_DIRS}) + set(QTDBUS_LIBRARIES ${Qt6DBus_LIBRARIES}) +@@ -168,7 +168,7 @@ + list(APPEND qtkeychain_LIBRARIES ${BE_LIBRARY}) + endif() + +-if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU) ++if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU AND NOT EMSCRIPTEN) + option(LIBSECRET_SUPPORT "Build with libsecret support" ON) + + if(LIBSECRET_SUPPORT) +@@ -305,7 +305,7 @@ + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt${QTKEYCHAIN_VERSION_INFIX}KeychainConfigVersion.cmake" + SOVERSION ${QTKEYCHAIN_VERSION}) + +-if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU) ++if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU AND NOT EMSCRIPTEN) + set(PRI_EXTRA_DEPS "dbus") + endif() + ecm_generate_pri_file(BASE_NAME Qt${QTKEYCHAIN_VERSION_INFIX}Keychain +diff --git a/QtKeychainConfig.cmake.in b/QtKeychainConfig.cmake.in +--- QtKeychainConfig.cmake.in ++++ QtKeychainConfig.cmake.in +@@ -14,7 +14,7 @@ + + find_dependency(Qt@QTKEYCHAIN_VERSION_INFIX@Core) + +-if(UNIX AND NOT APPLE AND NOT ANDROID) ++if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN) + find_dependency(Qt@QTKEYCHAIN_VERSION_INFIX@DBus) + endif() + + \ No newline at end of file diff --git a/ports/qtkeychain-qt6/portfile.cmake b/ports/qtkeychain-qt6/portfile.cmake index 8f380c042c..c412de0a5b 100644 --- a/ports/qtkeychain-qt6/portfile.cmake +++ b/ports/qtkeychain-qt6/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF "${VERSION}" SHA512 d1d87553db94bf54da1373016a847476e6cd608db6d427ed72532658e2272501daf45d7c9976efdde2f26ab3810ba9dbfec2518d46dee5a76ecaa369bfee2e4a HEAD_REF master + PATCHES + dbus-emscripten.patch ) if(VCPKG_CROSSCOMPILING) diff --git a/ports/qtkeychain-qt6/vcpkg.json b/ports/qtkeychain-qt6/vcpkg.json index 8a5e296bcc..caf4ef3216 100644 --- a/ports/qtkeychain-qt6/vcpkg.json +++ b/ports/qtkeychain-qt6/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtkeychain-qt6", "version": "0.14.3", + "port-version": 1, "description": "(Unaffiliated with Qt) Platform-independent Qt6 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 37aa36b324..2b6631cd68 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8226,7 +8226,7 @@ }, "qtkeychain-qt6": { "baseline": "0.14.3", - "port-version": 0 + "port-version": 1 }, "qtlanguageserver": { "baseline": "6.9.3", diff --git a/versions/q-/qtkeychain-qt6.json b/versions/q-/qtkeychain-qt6.json index 3390f49322..1549e126d5 100644 --- a/versions/q-/qtkeychain-qt6.json +++ b/versions/q-/qtkeychain-qt6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9849ece3e81f4e095b5befb9160665052aef3c83", + "version": "0.14.3", + "port-version": 1 + }, { "git-tree": "0f1eccb793a59b60f7fea5541a3aea7461a85233", "version": "0.14.3",