Debian Codegraph @

project/bundles/3rdparty/ext_qt5/qt-appimage-support.patch

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