diff --git a/component/imagemagick/buildout.cfg b/component/imagemagick/buildout.cfg index 441bb0590f41b7b674b1eb76dc91cfc667f93906..6fb4aa75ddb324b019eeb71c58aba5f00cc339d4 100644 --- a/component/imagemagick/buildout.cfg +++ b/component/imagemagick/buildout.cfg @@ -8,6 +8,7 @@ extends = ../fontconfig/buildout.cfg ../freetype/buildout.cfg ../ghostscript/buildout.cfg + ../librsvg/buildout.cfg ../libjpeg/buildout.cfg ../libpng/buildout.cfg ../libtiff/buildout.cfg @@ -31,6 +32,7 @@ url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.6-4.tar.bz2 md5sum = 7551edb219459fcbc71abb8ce65b8952 depends = ${libtiff:version} + ${librsvg:version} configure-options = --disable-static --without-x @@ -50,19 +52,19 @@ configure-options = --without-lzma --without-openexr --without-pango - --without-rsvg --without-wmf --without-xml --with-bzlib=${bzip2:location} --with-zlib=${zlib:location} --with-ltdl-include=${libtool:location}/include --with-ltdl-lib=${libtool:location}/lib + --with-rsvg=${librsvg:location} --with-frozenpaths patch-options = -p1 patches = ${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:location}/${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:filename} environment = PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s - PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig + PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${librsvg:location}/lib/pkgconfig CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib diff --git a/component/librsvg/buildout.cfg b/component/librsvg/buildout.cfg new file mode 100644 index 0000000000000000000000000000000000000000..db54a6376e494b1f7f8a7945f96f4a4b21a29cc0 --- /dev/null +++ b/component/librsvg/buildout.cfg @@ -0,0 +1,45 @@ +[buildout] +parts = librsvg +extends = + ../pkgconfig/buildout.cfg + ../libxml2/buildout.cfg + ../bzip2/buildout.cfg + ../zlib/buildout.cfg + ../gtk-2/buildout.cfg + +[libcroco] +recipe = hexagonit.recipe.cmmi +url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.3.tar.bz2 +md5sum = e1e93eeff4367c896f3959af34ba20eb +environment = + PATH=${pkgconfig:location}/bin:%(PATH)s + PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig + +[librsvg] +recipe = hexagonit.recipe.cmmi +version = 2.36.1 +url = http://www.nexedi.org/static/tarballs/librsvg/librsvg-${:version}.tar.gz +md5sum = 699cb7124d319035346e69782baa7c36 +# The original source provided by gnome is tar.xz and it is not a supported compression +# on hexagonit.recipe.cmmi neither by slapos.recipe.build, so keep alternative source +# with tar.gz format as a temporary alternative for this. +# url = http://ftp.acc.umu.se/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.1.tar.xz +configure-options = + --disable-static + --disable-gtk-theme + --disable-pixbuf-loader + --disable-gtk-doc + --disable-tools + --disable-gtk-doc-html + --enable-introspection=no + --with-bzlib=${bzip2:location} + --with-zlib=${zlib:location} + --with-ltdl-include=${libtool:location}/include + --with-ltdl-lib=${libtool:location}/lib + +environment = + PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:%(PATH)s + PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${bzip2:location}/lib/pkgconfig + CPPFLAGS = -I${pango:location}/include/pango-1.0 -I${gdk-pixbuf:location}/include/gdk-pixbuf-2.0 -I${libxml2:location}/include/libxml2 -I${libcroco:location}/include/libcroco-0.6 -I${cairo:location}/include/cairo -I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${bzip2:location}/include -I${zlib:location}/include + LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${pango:location}/lib -Wl,-rpath=${pango:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libcroco:location}/lib -Wl,-rpath=${libcroco:location}/lib + LIBS=-lrt -lgdk_pixbuf-2.0 -lgio-2.0 -lpangocairo-1.0 -lpango-1.0 -lgobject-2.0 -lcairo -lglib-2.0 -lxml2 -lcroco-0.6 -pthread -lgthread-2.0 -lrt -lglib-2.0 -lm -Wl,--as-needed diff --git a/software/erp5/instance-zope.cfg.in b/software/erp5/instance-zope.cfg.in index 8a2e79a16d42f996caa376bb9452fe0e46ea31e7..d4064bbded97436d70e784e4dddcc5f38013cc23 100644 --- a/software/erp5/instance-zope.cfg.in +++ b/software/erp5/instance-zope.cfg.in @@ -164,6 +164,7 @@ link-binary = {{ grep_location }}/bin/grep {{ imagemagick_location }}/bin/convert {{ imagemagick_location }}/bin/identify + {{ librsvg_location }}/bin/rsvg-convert {{ mariadb_location }}/bin/mysql {{ mariadb_location }}/bin/mysqldump {{ pdftk_location }}/bin/pdftk diff --git a/software/erp5/instance.cfg.in b/software/erp5/instance.cfg.in index 6e6535455aba63b239880e2709d8fd7816ee2bd9..32e9c9e38f0748e3740644f77cb64f79cc3e3b08 100644 --- a/software/erp5/instance.cfg.in +++ b/software/erp5/instance.cfg.in @@ -37,6 +37,7 @@ git = {{ git_location }} graphviz = {{ graphviz_location }} grep = {{ grep_location }} imagemagick = {{ imagemagick_location }} +librsvg = {{ librsvg_location }} mariadb = {{ mariadb_location }} pdftk = {{ pdftk_location }} sed = {{ sed_location }} diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index a8f244c1bcfacc94cc575723447f17644a8c1701..a74e06fff910e8d197ae8105043ddc06c474fe40 100644 --- a/software/erp5/software.cfg +++ b/software/erp5/software.cfg @@ -91,7 +91,7 @@ extra-context = [template-zope] < = template-jinja2-base filename = instance-zope.cfg -md5sum = 91f7deb94c1edf58fbdf5935a0810c38 +md5sum = 9d88c87a926fc4c59494be508ad78581 extra-context = key apache_location apache:location key coreutils_location coreutils:location @@ -103,6 +103,7 @@ extra-context = key grep_location grep:location key gzip_location gzip:location key imagemagick_location imagemagick:location + key librsvg_location librsvg:location key logrotate_location logrotate:location key mariadb_location mariadb:location key openssl_location openssl:location @@ -142,7 +143,7 @@ mode = 640 # XXX: "template.cfg" is hardcoded in instanciation recipe filename = template.cfg template = ${:_profile_base_location_}/instance.cfg.in -md5sum = 953e7914642582da30f13d8c70ed15c9 +md5sum = 2d523a62404563ca0470c1e838ddcbfc extra-context = key apache_location apache:location key buildout_bin_directory buildout:bin-directory @@ -159,6 +160,7 @@ extra-context = key gzip_location gzip:location key haproxy_location haproxy:location key imagemagick_location imagemagick:location + key librsvg_location librsvg:location key libICE_location libICE:location key libSM_location libSM:location key libX11_location libX11:location diff --git a/stack/erp5.cfg b/stack/erp5.cfg index 5eeae52287c7d9d4b4320629f4e4f2a0d9ec5a28..482d038daa61b417ede54c8c1df5dd2f45373846 100644 --- a/stack/erp5.cfg +++ b/stack/erp5.cfg @@ -45,6 +45,7 @@ extends = ../component/gzip/buildout.cfg ../component/haproxy/buildout.cfg ../component/hookbox/buildout.cfg + ../component/librsvg/buildout.cfg ../component/imagemagick/buildout.cfg ../component/kumo/buildout.cfg ../component/libdmtx/buildout.cfg