Debian Codegraph @

project/bundles/3rdparty/ext_qt6/qt6-appimage-support.patch

raw
1 diff --git a/src/gui/platform/unix/qdesktopunixservices.cpp b/src/gui/platform/unix/qdesktopunixservices.cpp
2 index a4fff9b11ca..88e8cfe90f2 100644
3 --- a/qtbase/src/gui/platform/unix/qdesktopunixservices.cpp
4 +++ b/qtbase/src/gui/platform/unix/qdesktopunixservices.cpp
5 @@ -153,11 +153,78 @@ static inline bool launch(const QString &launcher, const QUrl &url,
6 process.setProgram(program);
7 process.setArguments(args);
8
9 + QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
10 + qDebug() << env.toStringList();
11 +
12 if (!xdgActivationToken.isEmpty()) {
13 - auto env = QProcessEnvironment::systemEnvironment();
14 env.insert(u"XDG_ACTIVATION_TOKEN"_s, xdgActivationToken);
15 - process.setEnvironment(env.toStringList());
16 }
17 +
18 + // If we are running into AppImage bundle, switch env var to the right values.
19 + if (env.contains(QLatin1String("APPIMAGE_ORIGINAL_LD_LIBRARY_PATH")) &&
20 + env.contains(QLatin1String("APPIMAGE_ORIGINAL_QT_PLUGIN_PATH")) &&
21 + env.contains(QLatin1String("APPIMAGE_ORIGINAL_XDG_DATA_DIRS")) &&
22 + env.contains(QLatin1String("APPIMAGE_ORIGINAL_LD_PRELOAD")) &&
23 + env.contains(QLatin1String("APPIMAGE_ORIGINAL_PATH")))
24 + {
25 + qDebug() << "Adjusting environment variables for AppImage bundle";
26 +
27 + if (!env.value(QLatin1String("APPIMAGE_ORIGINAL_LD_LIBRARY_PATH")).isEmpty())
28 + {
29 + env.insert(QLatin1String("LD_LIBRARY_PATH"),
30 + env.value(QLatin1String("APPIMAGE_ORIGINAL_LD_LIBRARY_PATH")));
31 + }
32 + else
33 + {
34 + env.remove(QLatin1String("LD_LIBRARY_PATH"));
35 + }
36 +
37 + if (!env.value(QLatin1String("APPIMAGE_ORIGINAL_QT_PLUGIN_PATH")).isEmpty())
38 + {
39 + env.insert(QLatin1String("QT_PLUGIN_PATH"),
40 + env.value(QLatin1String("APPIMAGE_ORIGINAL_QT_PLUGIN_PATH")));
41 + }
42 + else
43 + {
44 + env.remove(QLatin1String("QT_PLUGIN_PATH"));
45 + }
46 +
47 + if (!env.value(QLatin1String("APPIMAGE_ORIGINAL_XDG_DATA_DIRS")).isEmpty())
48 + {
49 + env.insert(QLatin1String("XDG_DATA_DIRS"),
50 + env.value(QLatin1String("APPIMAGE_ORIGINAL_XDG_DATA_DIRS")));
51 + }
52 + else
53 + {
54 + env.remove(QLatin1String("XDG_DATA_DIRS"));
55 + }
56 +
57 + if (!env.value(QLatin1String("APPIMAGE_ORIGINAL_LD_PRELOAD")).isEmpty())
58 + {
59 + env.insert(QLatin1String("LD_PRELOAD"),
60 + env.value(QLatin1String("APPIMAGE_ORIGINAL_LD_PRELOAD")));
61 + }
62 + else
63 + {
64 + env.remove(QLatin1String("LD_PRELOAD"));
65 + }
66 +
67 + if (!env.value(QLatin1String("APPIMAGE_ORIGINAL_PATH")).isEmpty())
68 + {
69 + env.insert(QLatin1String("PATH"),
70 + env.value(QLatin1String("APPIMAGE_ORIGINAL_PATH")));
71 + }
72 + else
73 + {
74 + env.remove(QLatin1String("PATH"));
75 + }
76 +
77 + qDebug() << env.toStringList();
78 + }
79 +
80 + process.setProcessEnvironment(env);
81 + process.setProgram(program);
82 + process.setArguments(args);
83 ok = process.startDetached(nullptr);
84 }
85 # endif