Remove the HA Dashboard tab and the Qt WebEngine dependency (D40)
DSH-1 ended with a negative result: the Frame's system WebEngine can't be loaded, and bundling our own failed (no sandbox, ICU resources, Vulkan abort, empty page). Reverts the tab (60deb43), the container packages (0676998) and the bundler's WebEngine support (b823ff3,e2cfa8e), and updates the docs. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -14,9 +14,6 @@ set(qt_plugins "@QT6_INSTALL_PREFIX@/@QT6_INSTALL_PLUGINS@")
|
||||
set(qt_qml "@QT6_INSTALL_PREFIX@/@QT6_INSTALL_QML@")
|
||||
set(patchelf "@VRDASH_PATCHELF@")
|
||||
set(exclude "@bundle_exclude@")
|
||||
set(webengine_process "@webengine_process@")
|
||||
set(webengine_resources "@webengine_resources@")
|
||||
set(webengine_locales "@webengine_locales@")
|
||||
|
||||
message(STATUS "Bundling Qt into ${prefix}")
|
||||
|
||||
@@ -81,35 +78,6 @@ file(GET_RUNTIME_DEPENDENCIES
|
||||
RESOLVED_DEPENDENCIES_VAR resolved
|
||||
UNRESOLVED_DEPENDENCIES_VAR unresolved)
|
||||
|
||||
# --- Qt WebEngine: helper process (and its libraries), resources, locales ----------------
|
||||
# Only if a dashboard uses it. Found through qt.conf (LibraryExecutables, Data,
|
||||
# Translations; written below).
|
||||
set(helper_executables "")
|
||||
if(resolved MATCHES "libQt6WebEngineCore")
|
||||
message(STATUS "Bundling Qt WebEngine (${webengine_process})")
|
||||
# TYPE PROGRAM: a plain file(INSTALL) would drop the executable bit.
|
||||
file(INSTALL "${webengine_process}" DESTINATION "${prefix}/libexec" TYPE PROGRAM
|
||||
FOLLOW_SYMLINK_CHAIN)
|
||||
list(APPEND helper_executables "${prefix}/libexec/QtWebEngineProcess")
|
||||
file(GET_RUNTIME_DEPENDENCIES
|
||||
EXECUTABLES ${helper_executables}
|
||||
DIRECTORIES "@qt_libdir@" "${libdir}"
|
||||
PRE_EXCLUDE_REGEXES ${exclude}
|
||||
POST_EXCLUDE_REGEXES "^${libdir}/"
|
||||
RESOLVED_DEPENDENCIES_VAR helper_resolved
|
||||
UNRESOLVED_DEPENDENCIES_VAR helper_unresolved)
|
||||
list(APPEND resolved ${helper_resolved})
|
||||
list(APPEND unresolved ${helper_unresolved})
|
||||
list(REMOVE_DUPLICATES resolved)
|
||||
list(REMOVE_DUPLICATES unresolved)
|
||||
file(GLOB files LIST_DIRECTORIES false "${webengine_resources}/*")
|
||||
file(INSTALL ${files} DESTINATION "${prefix}/resources")
|
||||
foreach(locale @VRDASH_WEBENGINE_LOCALES@)
|
||||
file(INSTALL "${webengine_locales}/${locale}.pak"
|
||||
DESTINATION "${prefix}/translations/qtwebengine_locales")
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
if(unresolved)
|
||||
message(WARNING "Unresolved (expected on target system): ${unresolved}")
|
||||
endif()
|
||||
@@ -131,7 +99,7 @@ foreach(lib IN LISTS bundled_libs)
|
||||
set_rpath("${lib}" "\$ORIGIN")
|
||||
endif()
|
||||
endforeach()
|
||||
foreach(file IN LISTS qt_plugin_files qml_plugins helper_executables)
|
||||
foreach(file IN LISTS qt_plugin_files qml_plugins)
|
||||
get_filename_component(dir "${file}" DIRECTORY)
|
||||
file(RELATIVE_PATH rel "${dir}" "${libdir}")
|
||||
set_rpath("${file}" "\$ORIGIN/${rel}")
|
||||
@@ -144,14 +112,11 @@ find_program(dpkg dpkg)
|
||||
if(dpkg)
|
||||
set(docdir "${prefix}/@CMAKE_INSTALL_DOCDIR@/third-party")
|
||||
set(packages "")
|
||||
foreach(file IN LISTS resolved qt_plugin_files qml_plugins helper_executables)
|
||||
foreach(file IN LISTS resolved qt_plugin_files qml_plugins)
|
||||
# Ask dpkg about the original file: map installed plugins back, resolve
|
||||
# symlinks and /lib -> /usr/lib (usrmerge: packages register /usr paths).
|
||||
string(REPLACE "${plugindir}" "${qt_plugins}" original "${file}")
|
||||
string(REPLACE "${qmldir}" "${qt_qml}" original "${original}")
|
||||
if(file STREQUAL "${prefix}/libexec/QtWebEngineProcess")
|
||||
set(original "${webengine_process}")
|
||||
endif()
|
||||
file(REAL_PATH "${original}" original)
|
||||
execute_process(COMMAND "${dpkg}" -S "${original}" OUTPUT_VARIABLE owner
|
||||
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
@@ -193,9 +158,6 @@ Prefix = ..
|
||||
Libraries = @CMAKE_INSTALL_LIBDIR@
|
||||
Plugins = plugins
|
||||
QmlImports = qml
|
||||
LibraryExecutables = libexec
|
||||
Data = .
|
||||
Translations = translations
|
||||
")
|
||||
|
||||
list(LENGTH resolved n_libs)
|
||||
|
||||
Reference in New Issue
Block a user