synfigstudio: upgrade 0.64.3 -> 1.0.1

+18 -35
+18 -23
pkgs/applications/graphics/synfigstudio/default.nix
··· 1 - { stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk, gtkmm 2 - , libsigcxx, libtool, libxmlxx, pango, pkgconfig, imagemagick 3 - , intltool 4 }: 5 6 let 7 - version = "0.64.3"; 8 9 ETL = stdenv.mkDerivation rec { 10 - name = "ETL-0.04.17"; 11 12 src = fetchurl { 13 - url = "mirror://sourceforge/synfig/${name}.tar.gz"; 14 - sha256 = "0rb9czkgan41q6xlck97kh77g176vjm1wnq620sqky7k2hiahr3s"; 15 }; 16 }; 17 ··· 19 name = "synfig-${version}"; 20 21 src = fetchurl { 22 - url = "mirror://sourceforge/synfig/synfig-${version}.tar.gz"; 23 - sha256 = "0p4wqjidb4k3viahck4wzbh777f5ifpivn4vxhxs5fbq8nsvqksh"; 24 }; 25 26 configureFlags = [ ··· 28 "--with-boost-libdir=${boost.lib}/lib" 29 ]; 30 31 - patches = [ ./synfig-cstring.patch ]; 32 - 33 buildInputs = [ 34 - ETL boost cairo gettext glibmm libsigcxx libtool libxmlxx pango 35 pkgconfig 36 ]; 37 }; ··· 40 name = "synfigstudio-${version}"; 41 42 src = fetchurl { 43 - url = "mirror://sourceforge/synfig/${name}.tar.gz"; 44 - sha256 = "1li3ac8qvg25h9fgym0zywnq5bg3sgbv162xs4c6pwksn75i6gsv"; 45 }; 46 47 buildInputs = [ 48 - ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool 49 - intltool libsigcxx libtool libxmlxx pkgconfig synfig 50 - ]; 51 - 52 - configureFlags = [ 53 - "--with-boost=${boost.dev}" 54 - "--with-boost-libdir=${boost.lib}/lib" 55 ]; 56 57 - preBuild = '' 58 - export FONTCONFIG_FILE=${fontsConf} 59 ''; 60 61 enableParallelBuilding = true;
··· 1 + { stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 2 + , libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig 3 + , imagemagick, intltool 4 }: 5 6 let 7 + version = "1.0.1"; 8 9 ETL = stdenv.mkDerivation rec { 10 + name = "ETL-0.04.19"; 11 12 src = fetchurl { 13 + url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz"; 14 + sha256 = "1zmqv2fa5zxprza3wbhk5mxjk7491jqshxxai92s7fdiza0nhs91"; 15 }; 16 }; 17 ··· 19 name = "synfig-${version}"; 20 21 src = fetchurl { 22 + url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz"; 23 + sha256 = "0l1f2xwmzds32g46fqwsq7j5qlnfps6944chbv14d3ynzgyyp1i3"; 24 }; 25 26 configureFlags = [ ··· 28 "--with-boost-libdir=${boost.lib}/lib" 29 ]; 30 31 buildInputs = [ 32 + ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libtool libxmlxx pango 33 pkgconfig 34 ]; 35 }; ··· 38 name = "synfigstudio-${version}"; 39 40 src = fetchurl { 41 + url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz"; 42 + sha256 = "0jfa946rfh0dbagp18zknlj9ffrd4h45xcy2dh2vlhn6jdm08yfi"; 43 }; 44 45 buildInputs = [ 46 + ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool 47 + libjack2 libsigcxx libtool libxmlxx makeWrapper mlt-qt5 pkgconfig 48 + synfig 49 ]; 50 51 + postInstall = '' 52 + wrapProgram "$out/bin/synfigstudio" \ 53 + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 54 ''; 55 56 enableParallelBuilding = true;
-12
pkgs/applications/graphics/synfigstudio/synfig-cstring.patch
··· 1 - http://www.synfig.org/issues/thebuggenie/synfig/issues/438 2 - --- a/src/modules/mod_png/trgt_png.cpp 3 - +++ b/src/modules/mod_png/trgt_png.cpp 4 - @@ -39,6 +39,7 @@ 5 - #include <algorithm> 6 - #include <functional> 7 - #include <ETL/misc> 8 - +#include <cstring> 9 - 10 - #endif 11 - 12 -
···