xgiovio/dvdisaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: appimage: adjust docdir for help menu

Browse Source
This commit is contained in:
Stéphane Lesimple
2021-01-12 22:20:20 +01:00
parent b03bd5d076
commit c0de13c027
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -4,7 +4,7 @@
fix: don't error on blank media in medium-info (#19), bug present upstream since 0.79.5 fix: don't error on blank media in medium-info (#19), bug present upstream since 0.79.5
fix: gui: fix the 'SetLabelText() failed' error caption on the medium-info window (#19), bug present upstream since 0.72.3 fix: gui: fix the 'SetLabelText() failed' error caption on the medium-info window (#19), bug present upstream since 0.72.3
fix: add CHANGELOG, TODO, CREDITS to dist for the Help menu fix: add CHANGELOG, TODO, CREDITS to dist for the Help menu
chore: appimage: add missing gtk engines chore: appimage: add missing gtk engines and adjust docdir for help menu
chore: enhance packaging, update locales, changelog et al. chore: enhance packaging, update locales, changelog et al.
0.79.6.patchlevel-4 04-09-2020 *UNOFFICIAL* 0.79.6.patchlevel-4 04-09-2020 *UNOFFICIAL*

1
contrib/AppRun.sh
View File

@@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
DIR="$(readlink -f "$(dirname "$0")")" DIR="$(readlink -f "$(dirname "$0")")"
export GTK_PATH="$DIR/usr/lib/gtk-2.0" export GTK_PATH="$DIR/usr/lib/gtk-2.0"
export DVDISASTER_DOCDIR="$DIR/usr/share/doc/dvdisaster"
exec "$DIR/usr/bin/dvdisaster" "$@" exec "$DIR/usr/bin/dvdisaster" "$@"

6
src/closure.c
View File

@@ -91,6 +91,12 @@ static void get_base_dirs()
Verbose("Using path from get_exe_path() = %s\n", Closure->binDir); Verbose("Using path from get_exe_path() = %s\n", Closure->binDir);
#endif #endif
/* for AppImage, get docdir from env if there */
if (g_getenv("DVDISASTER_DOCDIR"))
{ if (Closure->docDir)
g_free(Closure->docDir);
Closure->docDir = g_strdup(g_getenv("DVDISASTER_DOCDIR"));
}
/*** The location of the dotfile depends on the operating system. /*** The location of the dotfile depends on the operating system.
Under Unix the users home directory is used. */ Under Unix the users home directory is used. */