diff --git a/docker-builder-data/build/script/packet/cairo-1.14.6.sh b/docker-builder-data/build/script/packet/cairo-1.14.6.sh deleted file mode 100644 index 0f03c32..0000000 --- a/docker-builder-data/build/script/packet/cairo-1.14.6.sh +++ /dev/null @@ -1,12 +0,0 @@ -DEPS="png-1.6.26 pixman-0.34.0" - -PK_DIRNAME="cairo-1.14.6" -PK_ARCHIVE="$PK_DIRNAME.tar.xz" -PK_URL="https://www.cairographics.org/releases/$PK_ARCHIVE" -PK_LICENSE_FILES="AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1" - -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh - -if [ "$PLATFORM" = "linux" ] || [ ! -z "$IS_NATIVE" ]; then - DEPS="$DEPS xcbfull-1.12" -fi diff --git a/docker-builder-data/build/script/packet/ffmpeg-2.4.13.sh b/docker-builder-data/build/script/packet/ffmpeg-2.4.13.sh deleted file mode 100644 index e1ac1dd..0000000 --- a/docker-builder-data/build/script/packet/ffmpeg-2.4.13.sh +++ /dev/null @@ -1,18 +0,0 @@ -DEPS="lame-3.99.5 ogg-1.3.2 theora-1.1.1 vorbis-1.3.5 x264-master sdl-1.2.15" -DEPS_NATIVE="yasm-1.3.0" - -PK_DIRNAME="ffmpeg-2.4.13" -PK_ARCHIVE="$PK_DIRNAME.tar.bz2" -PK_URL="http://ffmpeg.org/releases/$PK_ARCHIVE" - -PK_CONFIGURE_OPTIONS=" \ - --enable-rpath \ - --enable-gpl \ - --enable-libx264 \ - --enable-libmp3lame \ - --enable-libtheora \ - --enable-libvorbis" - -PK_LICENSE_FILES="CREDITS LICENSE.md COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3" - -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/fontconfig-2.12.1.sh b/docker-builder-data/build/script/packet/fontconfig-2.12.1.sh deleted file mode 100644 index 8cc3a06..0000000 --- a/docker-builder-data/build/script/packet/fontconfig-2.12.1.sh +++ /dev/null @@ -1,11 +0,0 @@ -DEPS="" - -PK_DIRNAME="fontconfig-2.12.1" -PK_ARCHIVE="$PK_DIRNAME.tar.gz" -PK_URL="https://www.freedesktop.org/software/fontconfig/release/$PK_ARCHIVE" - -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh - -pkinstall_release() { - return 0 -} \ No newline at end of file diff --git a/docker-builder-data/build/script/packet/gtk-3.14.14.sh b/docker-builder-data/build/script/packet/gtk-3.14.14.sh index 5ac0eaf..1772f35 100644 --- a/docker-builder-data/build/script/packet/gtk-3.14.14.sh +++ b/docker-builder-data/build/script/packet/gtk-3.14.14.sh @@ -1,4 +1,5 @@ DEPS="epoxy-master rsvg-2.40.16 atk-2.22.0 gdkpixbuf-2.36.0 cairo-1.15.4 pango-1.40.3" +DEPS_NATIVE="gtk-3.14.14" PK_DIRNAME="gtk+-3.14.14" PK_ARCHIVE="$PK_DIRNAME.tar.xz" diff --git a/docker-builder-data/build/script/packet/gtk-3.22.2.sh b/docker-builder-data/build/script/packet/gtk-3.22.2.sh index 589d16e..38bcda5 100644 --- a/docker-builder-data/build/script/packet/gtk-3.22.2.sh +++ b/docker-builder-data/build/script/packet/gtk-3.22.2.sh @@ -7,12 +7,14 @@ PK_URL="https://download.gnome.org/sources/gtk+/3.22/$PK_ARCHIVE" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh -PK_CONFIGURE_OPTIONS="--enable-introspection=no" - if [ "$PLATFORM" = "linux" ] || [ ! -z "$IS_NATIVE" ]; then DEPS="$DEPS atspi2atk-2.22.0" fi +if [ "$PLATFORM" = "win" ]; then + PK_CONFIGURE_OPTIONS="--enable-introspection=no" +fi + pkinstall() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME" local LOCAL_BIN="$BUILD_PACKET_DIR/$PK_DIRNAME/gtk" diff --git a/docker-builder-data/build/script/packet/gtkmm-3.14.0.sh b/docker-builder-data/build/script/packet/gtkmm-3.14.0.sh index f145f5e..a993a1c 100644 --- a/docker-builder-data/build/script/packet/gtkmm-3.14.0.sh +++ b/docker-builder-data/build/script/packet/gtkmm-3.14.0.sh @@ -1,4 +1,4 @@ -DEPS="gtk-3.14.14 atkmm-2.22.7 cairomm-1.10.0 pangomm-2.34.0" +DEPS="gtk-3.14.14 atkmm-2.22.7 cairomm-1.10.0 pangomm-2.34.0 adwaitaicontheme-3.15.1 gnomethemesstandard-3.15.2" PK_DIRNAME="gtkmm-3.14.0" PK_ARCHIVE="$PK_DIRNAME.tar.xz" diff --git a/docker-builder-data/build/script/packet/gtkmm-3.22.0.sh b/docker-builder-data/build/script/packet/gtkmm-3.22.0.sh index cdf9104..606ce31 100644 --- a/docker-builder-data/build/script/packet/gtkmm-3.22.0.sh +++ b/docker-builder-data/build/script/packet/gtkmm-3.22.0.sh @@ -1,4 +1,4 @@ -DEPS="gtk-3.22.2 atkmm-2.24.2 cairomm-1.12.0 pangomm-2.40.1" +DEPS="gtk-3.22.2 atkmm-2.24.2 cairomm-1.12.0 pangomm-2.40.1 adwaitaicontheme-3.22.0 gnomethemesstandard-3.22.2" PK_DIRNAME="gtkmm-3.22.0" PK_ARCHIVE="$PK_DIRNAME.tar.xz" diff --git a/docker-builder-data/build/script/packet/synfigcore-master.sh b/docker-builder-data/build/script/packet/synfigcore-master.sh index 02219fe..7b592a9 100644 --- a/docker-builder-data/build/script/packet/synfigcore-master.sh +++ b/docker-builder-data/build/script/packet/synfigcore-master.sh @@ -62,9 +62,15 @@ DEPS=" \ synfigetl-master \ jpeg-9b tiff-4.0.6 fftw-3.3.5 imagemagick-6.8.7 \ ffmpeg-3.1.5 mlt-6.2.0 \ - boost-1.61.0 cairo-1.15.4 pango-1.40.3 glibmm-2.50.0 xmlpp-2.40.1" + boost-1.61.0 cairo-1.15.4 pango-1.40.3 " DEPS_NATIVE="libtool-2.4.6" +if [ "$PLATFORM" = "win" ]; then + DEPS="$DEPS glibmm-2.50.0 xmlpp-2.40.1" +else + DEPS="$DEPS glibmm-2.41.4 xmlpp-2.22.0" +fi + if [ "$PLATFORM" = "linux" ]; then DEPS="$DEPS jack-0.125.0" fi diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh index 93e3d4b..4e27557 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-master.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh @@ -17,9 +17,15 @@ # adwaitaicons | gtk, rsvg # gnomethemes | gtk, rsvg -DEPS="synfigcore-master gtkmm-3.22.0 adwaitaicontheme-3.22.0 gnomethemesstandard-3.22.2" +DEPS="synfigcore-master" DEPS_NATIVE="libtool-2.4.6 synfigcore-master" +if [ "$PLATFORM" = "win" ]; then + DEPS="$DEPS gtkmm-3.22.0" +else + DEPS="$DEPS gtkmm-3.14.0" +fi + PK_DIRNAME="synfig" PK_URL="https://github.com/synfig/$PK_DIRNAME.git" PK_GIT_OPTIONS="--branch testing" @@ -99,7 +105,6 @@ pkhook_postlicense() { copy_system_license libdb "$TARGET" || return 1 copy_system_license libpcre "$TARGET" || return 1 copy_system_license libdirectfb "$TARGET" || return 1 - copy_system_license libfusion "$TARGET" || return 1 copy_system_license libbz2 "$TARGET" || return 1 fi } diff --git a/docker-builder-data/build/script/packet/xmlpp-3.0.0.sh b/docker-builder-data/build/script/packet/xmlpp-3.0.0.sh deleted file mode 100644 index 3a0b6ba..0000000 --- a/docker-builder-data/build/script/packet/xmlpp-3.0.0.sh +++ /dev/null @@ -1,7 +0,0 @@ -DEPS="xml-2.9.4 glibmm-2.50.0" - -PK_DIRNAME="libxml++-3.0.0" -PK_ARCHIVE="$PK_DIRNAME.tar.xz" -PK_URL="https://download.gnome.org/sources/libxml++/3.0/$PK_ARCHIVE" - -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh