diff --git a/env-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh b/env-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh index ad5cd4b..c54c653 100755 --- a/env-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh +++ b/env-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh @@ -19,7 +19,7 @@ export XDG_CONFIG_DIRS="$HOME/.config/synfig:$XDG_CONFIG_DIRS" export XCURSOR_PATH="${BASE_DIR}/share/icons:$XCURSOR_PATH:/usr/local/share/icons:/usr/share/icons" export GSETTINGS_SCHEMA_DIR="${BASE_DIR}/share/glib-2.0/schemas/" export QT_XKB_CONFIG_ROOT=$QT_XKB_CONFIG_ROOT:/usr/local/share/X11/xkb:/usr/share/X11/xkb -export FONTCONFIG_PATH=/etc/fonts +export FONTCONFIG_PATH="${BASE_DIR}/etc/fonts" export SYNFIG_ROOT="${BASE_DIR}" export SYNFIG_GTK_THEME="Adwaita" diff --git a/env-builder-data/build/script/packet/synfigstudio-appimage.sh b/env-builder-data/build/script/packet/synfigstudio-appimage.sh index 9558077..9b8877f 100644 --- a/env-builder-data/build/script/packet/synfigstudio-appimage.sh +++ b/env-builder-data/build/script/packet/synfigstudio-appimage.sh @@ -51,6 +51,18 @@ pkinstall_release() { cp "$ENVDEPS_RELEASE_PACKET_DIR/lib/libboost_program_options."* "$APPDIR/usr/lib/" || return 1 cp "$ENVDEPS_RELEASE_PACKET_DIR/lib/libboost_system."* "$APPDIR/usr/lib/" || return 1 + # fix FONTCONFIG errors + TARGET_DIR=../../../share/fontconfig/conf.avail + pushd . >/dev/null 2>&1 + cd $APPDIR/usr/etc/fonts/conf.d + rm -f ./*.conf + + for f in $TARGET_DIR/*.conf + do + ln -s -f $TARGET_DIR/${f##*/} ./${f##*/} + done + popd >/dev/null 2>&1 + # clean examples rm -rf "$APPDIR/share/synfig/examples" || return 1