diff --git a/env-builder-data/build/script/packet/cairo-1.15.4.sh b/env-builder-data/build/script/packet/cairo-1.15.4.sh index 7d69d85..dfc41ef 100644 --- a/env-builder-data/build/script/packet/cairo-1.15.4.sh +++ b/env-builder-data/build/script/packet/cairo-1.15.4.sh @@ -1,9 +1,4 @@ -DEPS="png-1.6.26 pixman-0.34.0 glib-2.50.0" -if [ "$PLATFORM" = "linux" ]; then - DEPS_NATIVE="$DEPS_NATIVE fontconfig-2.12.6" -else - DEPS="$DEPS fontconfig-2.12.6" -fi +DEPS="png-1.6.26 pixman-0.34.0 glib-2.50.0 fontconfig-2.12.6" PK_DIRNAME="cairo-1.15.4" diff --git a/env-builder-data/build/script/packet/harfbuzz-1.3.2.sh b/env-builder-data/build/script/packet/harfbuzz-1.3.2.sh index cea2c04..f481958 100644 --- a/env-builder-data/build/script/packet/harfbuzz-1.3.2.sh +++ b/env-builder-data/build/script/packet/harfbuzz-1.3.2.sh @@ -1,9 +1,4 @@ -DEPS="glib-2.50.0" -if [ "$PLATFORM" = "linux" ]; then - DEPS_NATIVE="$DEPS_NATIVE fontconfig-2.12.6" -else - DEPS="$DEPS fontconfig-2.12.6" -fi +DEPS="glib-2.50.0 fontconfig-2.12.6" PK_DIRNAME="harfbuzz-1.3.2" PK_ARCHIVE="$PK_DIRNAME.tar.bz2" diff --git a/env-builder-data/build/script/packet/pango-1.40.3.sh b/env-builder-data/build/script/packet/pango-1.40.3.sh index 216d662..3932957 100644 --- a/env-builder-data/build/script/packet/pango-1.40.3.sh +++ b/env-builder-data/build/script/packet/pango-1.40.3.sh @@ -1,10 +1,5 @@ -DEPS="harfbuzz-1.3.2 glib-2.50.0 cairo-1.15.4" +DEPS="harfbuzz-1.3.2 glib-2.50.0 cairo-1.15.4 fontconfig-2.12.6" #DEPS_NATIVE="gobjectintrospection-1.50.0" -if [ "$PLATFORM" = "linux" ]; then - DEPS_NATIVE="$DEPS_NATIVE fontconfig-2.12.6" -else - DEPS="$DEPS fontconfig-2.12.6" -fi PK_DIRNAME="pango-1.40.3" PK_ARCHIVE="$PK_DIRNAME.tar.xz" diff --git a/env-builder-data/build/script/packet/synfigstudio-appimage.sh b/env-builder-data/build/script/packet/synfigstudio-appimage.sh index 3cbf292..74dd658 100644 --- a/env-builder-data/build/script/packet/synfigstudio-appimage.sh +++ b/env-builder-data/build/script/packet/synfigstudio-appimage.sh @@ -57,16 +57,15 @@ pkinstall_release() { 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 + 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