From af43100e29859adbf5dcb6ee90cd8f981439b859 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Fri, 1 May 2026 10:09:39 -0500 Subject: Remove AppImage build target and runtime references We ship via portable tarball directory + .bin self-extracting installer only; the AppImage path was unmaintained and pulling in linuxdeploy tooling for a format we no longer publish. Build: - build.sh: drop appimage/all-includes-appimage modes (now: tarball, installer, all=both, shell). Output listing tracks the directory. - docker/Dockerfile: drop BUILD_APPIMAGE arg and the linuxdeploy download/extract block. - docker/build-inner.sh: drop build_appimage() (~120 lines), AppImage arm of the BUILD_MODE switch, *.AppImage summary listing. - docker/AppRun.sh: deleted. - .gitignore: drop *.AppImage / squashfs-root / *.flatpak entries. Runtime: no longer key off APPIMAGE/APPDIR env vars or AppRun-set state. The fluorine-manager launcher script already exports FLUORINE_ORIG_*, MO2_BASE_DIR, MO2_PLUGINS_DIR, MO2_LIBS_DIR, MO2_PYTHON_DIR for the same purpose, so simplify: - envshortcut: appImageOrBinary -> launcherOrBinary; bundledFluorineIcon no longer probes APPDIR. - nxmhandler: drop APPIMAGE-based wrapper path; use applicationFilePath. - protonlauncher: rename cleanAppImageEnv -> cleanFluorineEnv, drop APPIMAGE/APPDIR/OWD/ARGV0/APPIMAGE_ORIGINAL_EXEC/DESKTOPINTEGRATION removals and .mount_Fluori pattern strip. - prefixsetuprunner: same env-cleaning trim. - utility, library.h, proxypython, mainwindow, moapplication, appconfig: comment cleanup pointing at the launcher instead of AppRun. Co-Authored-By: Claude Opus 4.7 (1M context) --- libs/uibase/src/utility.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libs/uibase/src/utility.cpp') diff --git a/libs/uibase/src/utility.cpp b/libs/uibase/src/utility.cpp index 40774ae..4304561 100644 --- a/libs/uibase/src/utility.cpp +++ b/libs/uibase/src/utility.cpp @@ -396,16 +396,16 @@ namespace shell } } - // Launch an external host process with AppImage environment variables - // cleaned up, so tools like xdg-open/kde-open use the host's own - // libraries and Qt plugins instead of the bundled ones. + // Launch an external host process with bundled-runtime environment + // variables cleaned up, so tools like xdg-open/kde-open use the host's + // own libraries and Qt plugins instead of the ones we ship. static bool startDetachedHostProcess(const QString& program, const QStringList& args) { QProcess proc; auto env = QProcessEnvironment::systemEnvironment(); - // Restore original LD_LIBRARY_PATH (saved by AppRun.sh) + // Restore original LD_LIBRARY_PATH (saved by the fluorine-manager launcher). if (env.contains(QStringLiteral("FLUORINE_ORIG_LD_LIBRARY_PATH"))) { const auto orig = env.value(QStringLiteral("FLUORINE_ORIG_LD_LIBRARY_PATH")); if (orig.isEmpty()) @@ -414,7 +414,8 @@ namespace shell env.insert(QStringLiteral("LD_LIBRARY_PATH"), orig); } - // Remove AppImage-specific Qt/path variables that would confuse host apps + // Remove Qt/path variables pointing at our bundled runtime that would + // confuse host apps. env.remove(QStringLiteral("QT_PLUGIN_PATH")); env.remove(QStringLiteral("QT_QPA_PLATFORM_PLUGIN_PATH")); env.remove(QStringLiteral("QTWEBENGINEPROCESS_PATH")); -- cgit v1.3.1