diff --git a/docker-builder-data/build/script/packet/synfigstudio-appimage.sh b/docker-builder-data/build/script/packet/synfigstudio-appimage.sh index e2a6576..1f102da 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-appimage.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-appimage.sh @@ -17,16 +17,6 @@ pkinstall() { cp --remove-destination "$FILES_PACKET_DIR/synfigstudio.desktop" "$APPDIR/" || return 1 cp --remove-destination "$FILES_PACKET_DIR/synfigstudio.png" "$APPDIR/" || return 1 cp --remove-destination "$FILES_PACKET_DIR/launch.sh" "$APPDIR/usr/bin/" || return 1 - - copy_system_lib libudev "$APPDIR/usr/lib/" || return 1 - copy_system_lib libgfortran "$APPDIR/usr/lib/" || return 1 - copy_system_lib libpng12 "$APPDIR/usr/lib/" || return 1 - copy_system_lib libffi "$APPDIR/usr/lib/" || return 1 - copy_system_lib libdb "$APPDIR/usr/lib/" || return 1 - copy_system_lib libpcre "$APPDIR/usr/lib/" || return 1 - copy_system_lib libdirect "$APPDIR/usr/lib/" || return 1 - copy_system_lib libfusion "$APPDIR/usr/lib/" || return 1 - copy_system_lib libbz2 "$APPDIR/usr/lib/" || return 1 } pkinstall_release() { diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh index 0416629..e2afc6c 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-master.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh @@ -47,6 +47,49 @@ pkinstall() { if ! make install; then return 1 fi + cd "$INSTALL_PACKET_DIR" mv "share/pixmaps/synfigstudio/"* "share/pixmaps/" + + # copy system libraries + if [ "$PLATFORM" = "win" ]; then + local TARGET="$INSTALL_PACKET_DIR/bin/" + local LOCAL_DIR="/usr/$HOST/sys-root/mingw/bin/" + cp $LOCAL_DIR/libgcc*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/libstdc*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/libwinpthread*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/libquadmath*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/libgfortran*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/iconv*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/libintl*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/libdl*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/libltdl*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/libexpat*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/zlib*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/libbz2*.dll "$TARGET" || return 1 + cp $LOCAL_DIR/libfreetype*.dll "$TARGET" || return 1 + else + local TARGET="$INSTALL_PACKET_DIR/lib/" + copy_system_lib libudev "$TARGET" || return 1 + copy_system_lib libgfortran "$TARGET" || return 1 + copy_system_lib libdb "$TARGET" || return 1 + copy_system_lib libpcre "$TARGET" || return 1 + copy_system_lib libdirect "$TARGET" || return 1 + copy_system_lib libfusion "$TARGET" || return 1 + copy_system_lib libbz2 "$TARGET" || return 1 + fi +} + +pkhook_postlicense() { + local TARGET="$LICENSE_PACKET_DIR" + if [ "$PLATFORM" = "win" ]; then + local LOCAL_DIR="/usr/$HOST/sys-root/mingw/bin/" + copy_system_license "mingw$ARCH-gcc gcc" "$TARGET" || return 1 + copy_system_license mingw$ARCH-winpthreads "$TARGET" || return 1 + copy_system_license mingw$ARCH-gettext "$TARGET" || return 1 + copy_system_license mingw$ARCH-win-iconv "$TARGET" || return 1 + else + copy_system_license "libudev libudev0 libudev1" "$TARGET" || return 1 + copy_system_license gfortran "$TARGET" || return 1 + fi }