From 8b6d80d71bcf5ef389268c6d98055016e217001a Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Nov 11 2017 11:36:34 +0000 Subject: Update GTK for linux builds of synfigstudio --- diff --git a/docker-builder-data/build/script/packet/synfigcore-master.sh b/docker-builder-data/build/script/packet/synfigcore-master.sh index dab5764..dea975d 100644 --- a/docker-builder-data/build/script/packet/synfigcore-master.sh +++ b/docker-builder-data/build/script/packet/synfigcore-master.sh @@ -62,15 +62,10 @@ 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 " + boost-1.61.0 cairo-1.15.4 pango-1.40.3 \ + glibmm-2.50.0 xmlpp-2.40.1 " DEPS_NATIVE="libtool-2.4.6" -if [ "$PLATFORM" = "win" ] || [ "$PLATFORM" = "fedora" ]; then - DEPS="$DEPS glibmm-2.50.0 xmlpp-2.40.1" -else - DEPS="$DEPS glibmm-2.41.4 xmlpp-2.22.0" -fi - PK_DIRNAME="synfig" PK_URL="https://github.com/synfig/$PK_DIRNAME.git" PK_GIT_CHECKOUT="origin/testing" diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh index 64f2dc5..adb6f71 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-master.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh @@ -17,15 +17,9 @@ # adwaitaicons | gtk, rsvg # gnomethemes | gtk, rsvg -DEPS="synfigcore-master" +DEPS="synfigcore-master gtkmm-3.22.0" DEPS_NATIVE="libtool-2.4.6 synfigcore-master" -if [ "$PLATFORM" = "win" ] || [ "$PLATFORM" = "fedora" ]; then - DEPS="$DEPS gtkmm-3.22.0" -else - DEPS="$DEPS gtkmm-3.14.0" -fi - if [ "$PLATFORM" = "linux" ]; then DEPS="$DEPS jack-0.125.0" fi