File tree Expand file tree Collapse file tree 4 files changed +15
-0
lines changed
docs/source/release/v6.11.0/Workbench/Bugfixes Expand file tree Collapse file tree 4 files changed +15
-0
lines changed Original file line number Diff line number Diff line change @@ -92,6 +92,15 @@ if [ -n \"\$1\" ] && [ \"\$1\" = \"--debug\" ]; then
92
92
fi"
93
93
)
94
94
95
+ # Without specifying these schema files, the standalone can fail to launch on Linux. Inside a conda environment this
96
+ # environment variable is set by something else.
97
+ set (GSETTINGS_SCHEMA_DEFINITIONS
98
+ "# Specify path to schema files
99
+ if [ -z \"\$ {GSETTINGS_SCHEMA_DIR}\" ]; then
100
+ GSETTINGS_MANTID_PATH=\$ {INSTALLDIR}/share/glib-2.0/schemas
101
+ fi"
102
+ )
103
+
95
104
set (ERROR_CMD "-m mantidqt.dialogs.errorreports.main --exitcode=\$ ?" )
96
105
97
106
# Local dev version
Original file line number Diff line number Diff line change 17
17
18
18
@GDB_DEFINITIONS@
19
19
20
+ @GSETTINGS_SCHEMA_DEFINITIONS@
21
+
20
22
# Launch the workbench
21
23
LD_PRELOAD=${LOCAL_PRELOAD} \
22
24
PYTHONPATH=${LOCAL_PYTHONPATH} @QT_QPA@ \
25
+ GSETTINGS_SCHEMA_DIR=${GSETTINGS_SCHEMA_DIR} :${GSETTINGS_MANTID_PATH} \
23
26
@WRAPPER_PREFIX@$VGLRUN $GDB \
24
27
@PYTHON_EXEC_LOCAL@@PYTHON_ARGS@ @MANTIDWORKBENCH_EXEC@ $SINGLEPROCESS " $@ " @WRAPPER_POSTFIX@
Original file line number Diff line number Diff line change
1
+ - Fixed the standalone not launching on Linux, especially IDAaaS.
Original file line number Diff line number Diff line change @@ -29,6 +29,8 @@ function trim_conda() {
29
29
mv " $bundle_conda_prefix " /share " $bundle_conda_prefix " /share_tmp
30
30
mkdir " $bundle_conda_prefix " /share
31
31
mv " $bundle_conda_prefix " /share_tmp/doc " $bundle_conda_prefix " /share/
32
+ mkdir -p " $bundle_conda_prefix " /share/glib-2.0/schemas
33
+ mv " $bundle_conda_prefix " /share_tmp/glib-2.0/schemas " $bundle_conda_prefix " /share/glib-2.0/
32
34
# Heavily cut down translations
33
35
mv " $bundle_conda_prefix " /translations " $bundle_conda_prefix " /translations_tmp
34
36
mkdir -p " $bundle_conda_prefix " /translations/qtwebengine_locales
You can’t perform that action at this time.
0 commit comments