diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-22 14:05:41 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-22 14:05:41 +0200 |
| commit | b55285a77da0e0b829e4ce8d7e09debaabc68e15 (patch) | |
| tree | f622559ef65bbdd3e1c5bdb06098a8f89eec0563 /distribution/osx/gtk-bundle | |
| parent | d3897ce090dbeb220ed2c782f095597e417cf3cc (diff) | |
| parent | d1ae75703e1ed81d65ea16946dcdb77e7a13adc9 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'distribution/osx/gtk-bundle')
| -rwxr-xr-x | distribution/osx/gtk-bundle/xtrkcad-launcher.sh | 4 | ||||
| -rw-r--r-- | distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip | bin | 3990654 -> 2641265 bytes |
2 files changed, 2 insertions, 2 deletions
diff --git a/distribution/osx/gtk-bundle/xtrkcad-launcher.sh b/distribution/osx/gtk-bundle/xtrkcad-launcher.sh index 30988e5..69aac1e 100755 --- a/distribution/osx/gtk-bundle/xtrkcad-launcher.sh +++ b/distribution/osx/gtk-bundle/xtrkcad-launcher.sh @@ -36,7 +36,7 @@ if type -p "X" & > /dev/null; then fi #XTRKCAD_BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/XTrackCAD//'`" -XTRKCAD_BUNDLE="$bundle" +XTRKCAD_BUNDLE="`echo "$bundle" | sed -e 's_/Contents/MacOS/XTrackCAD_/_'`" XTRKCAD_RESOURCES="$XTRKCAD_BUNDLE/Contents/Resources" XTRKCAD_TEMP="/tmp/xtrkcad/$UID" XTRKCAD_ETC="$XTRKCAD_TEMP/etc" @@ -52,7 +52,7 @@ export GTK_DATA_PREFIX="$bundle_res" export GTK_EXE_PREFIX="$bundle_res" export GTK_PATH="$bundle_res" -export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc" +# export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc" XTRKCAD_PANGO_RC_FILE="$XTRKCAD_RESOURCES/etc/pango/pangorc" I18NDIR="$bundle_data/locale" diff --git a/distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip b/distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip Binary files differindex bb6972a..2e7663b 100644 --- a/distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip +++ b/distribution/osx/gtk-bundle/xtrkcad-template.dmg.zip |