[qtkeychain] fix emscripten build (#49039)

This commit is contained in:
Matthias Kuhn
2025-12-22 22:42:31 +01:00
committed by GitHub
parent b40e45313a
commit 35218efeaa
5 changed files with 61 additions and 1 deletions

View File

@@ -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()

View File

@@ -6,6 +6,8 @@ vcpkg_from_github(
REF "${VERSION}"
SHA512 d1d87553db94bf54da1373016a847476e6cd608db6d427ed72532658e2272501daf45d7c9976efdde2f26ab3810ba9dbfec2518d46dee5a76ecaa369bfee2e4a
HEAD_REF master
PATCHES
dbus-emscripten.patch
)
if(VCPKG_CROSSCOMPILING)

View File

@@ -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",

View File

@@ -8226,7 +8226,7 @@
},
"qtkeychain-qt6": {
"baseline": "0.14.3",
"port-version": 0
"port-version": 1
},
"qtlanguageserver": {
"baseline": "6.9.3",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9849ece3e81f4e095b5befb9160665052aef3c83",
"version": "0.14.3",
"port-version": 1
},
{
"git-tree": "0f1eccb793a59b60f7fea5541a3aea7461a85233",
"version": "0.14.3",