diff --git a/docker-builder-data/build/script/packet/opentoonz-appimage.sh b/docker-builder-data/build/script/packet/opentoonz-appimage.sh index f12e5eb..33a91e2 100644 --- a/docker-builder-data/build/script/packet/opentoonz-appimage.sh +++ b/docker-builder-data/build/script/packet/opentoonz-appimage.sh @@ -7,7 +7,7 @@ pkinstall() { # copy files from envdeps (install requires envdeps explicit) local APPDIR="$INSTALL_PACKET_DIR/$PK_APPDIR_NAME.AppDir" - mkdir -p "$APPDIR/usr" + mkdir -p "$APPDIR/usr/lib" if ! cp "$ENVDEPS_PACKET_DIR/bin/AppRun" "$APPDIR/"; then return 1 fi @@ -15,6 +15,15 @@ pkinstall() { && cp "$FILES_PACKET_DIR/opentoonz.png" "$APPDIR/"); then return 1 fi + if ! (cp -f /lib/x86_64-linux-gnu/libudev.so* "$APPDIR/usr/lib/" \ + || cp -f /lib/i386-linux-gnu/libudev.so* "$APPDIR/usr/lib/"); then + return 1 + fi + if ! (cp -f /usr/lib/x86_64-linux-gnu/libgfortran.so* "$APPDIR/usr/lib/" \ + || cp -f /usr/lib/i386-linux-gnu/libgfortran.so* "$APPDIR/usr/lib/"); then + return 1 + fi + } pkinstall_release() { diff --git a/docker-builder-data/build/script/packet/qt-5.7.sh b/docker-builder-data/build/script/packet/qt-5.7.sh index 318c8c2..8f33356 100644 --- a/docker-builder-data/build/script/packet/qt-5.7.sh +++ b/docker-builder-data/build/script/packet/qt-5.7.sh @@ -29,11 +29,6 @@ pkinstall() { return 1 fi - if ! (cp -f "/lib/x86_64-linux-gnu/libudev.so.0" "$INSTALL_PACKET_DIR/lib/libudev.so.0" \ - || cp -f "/lib/i386-linux-gnu/libudev.so.0" "$INSTALL_PACKET_DIR/lib/libudev.so.0"); then - return 1 - fi - cat << EOF > "$INSTALL_PACKET_DIR/bin/qt.conf" [Paths] Prefix=..