diff --git a/buildout/software-profiles/imagemagick.cfg b/buildout/software-profiles/imagemagick.cfg index ffcab27e46a90005befa7e56f405a714eecdd4ec..f130ca7a6e69766b426bbf66c343a8a16ee50f86 100644 --- a/buildout/software-profiles/imagemagick.cfg +++ b/buildout/software-profiles/imagemagick.cfg @@ -5,6 +5,7 @@ parts = imagemagick extends = bzip2.cfg + fontconfig.cfg freetype.cfg ghostscript.cfg libjpeg.cfg @@ -32,8 +33,21 @@ configure-options = --with-magick-plus-plus --disable-openmp --disable-opencl - --without-openexr + --without-dps + --without-djvu + --without-fftw + --without-fpx + --with-fontconfig --without-gslib + --without-gvc + --without-lcms + --without-lcms2 + --without-lqr + --without-lzma + --without-openexr + --without-rsvg + --without-wmf + --without-xml --with-bzlib=${bzip2:location} --with-zlib=${zlib:location} --with-ltdl-include=${libtool:location}/include @@ -43,6 +57,7 @@ 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:%(PATH)s + PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s + PKG_CONFIG_PATH=${fontconfig: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 -Wl,${bzip2:location}/lib -Wl,-rpath -L${zlib:location}/lib -Wl,${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath -Wl,${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath -Wl,${freetype:location}/lib diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index 3b981ea1602f2af6662f06759dc1ca027694c711..3495cab496a6d0f04d7fedc3fe5c7c103b72cda4 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -1633,6 +1633,8 @@ class AssertImagemagick(AssertSoftwareMixin): 'libbz2', 'libc', 'libdl', + 'libexpat', + 'libfontconfig', 'libfreetype', 'libjasper', 'libjbig', @@ -1647,9 +1649,11 @@ class AssertImagemagick(AssertSoftwareMixin): core_rpath_list = [ 'bzip2', + 'fontconfig', 'freetype', 'jasper', 'jbigkit', + 'libexpat', 'libjpeg', 'libpng', 'libtiff',