diff --git a/buildout/software-profiles/imagemagick.cfg b/buildout/software-profiles/imagemagick.cfg index f130ca7a6e69766b426bbf66c343a8a16ee50f86..62b572becc25df185b6c68cd0c969f4c413171a8 100644 --- a/buildout/software-profiles/imagemagick.cfg +++ b/buildout/software-profiles/imagemagick.cfg @@ -24,6 +24,14 @@ md5sum = 3f28ecd9f6722cf2c3238ce6ec3d7a68 download-only = true filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch +[imagemagick-6.6.7-4-without-lzma.patch] +recipe = hexagonit.recipe.download +url = http://www.nexedi.org/static/patches/${:filename} +path = ${:filename} +md5sum = 04e1b934a58f4b3a83e4df148795b338 +download-only = true +filename = imagemagick-6.6.7-4-without-lzma.patch + [imagemagick] recipe = hexagonit.recipe.cmmi url = http://ftp.nluug.nl/ImageMagick/ImageMagick-6.6.7-4.tar.bz2 @@ -56,6 +64,7 @@ configure-options = 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} + ${imagemagick-6.6.7-4-without-lzma.patch:location}/${imagemagick-6.6.7-4-without-lzma.patch:filename} environment = PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig diff --git a/patches/imagemagick-6.6.7-4-without-lzma.patch b/patches/imagemagick-6.6.7-4-without-lzma.patch new file mode 100644 index 0000000000000000000000000000000000000000..c7771036809448f6a814ccd59804f6d2d1a0d571 --- /dev/null +++ b/patches/imagemagick-6.6.7-4-without-lzma.patch @@ -0,0 +1,22 @@ +--- ImageMagick-6.6.7-4/configure~ 2011-02-10 11:50:21.704561096 +0100 ++++ ImageMagick-6.6.7-4/configure 2011-02-10 12:23:45.612561097 +0100 +@@ -28251,7 +28251,7 @@ + # + have_lzma='no' + LZMA_LIBS='' +-if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then ++if test "$with_lzma" != 'no'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 + $as_echo "-------------------------------------------------------------" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZMA" >&5 +--- ImageMagick-6.6.7-4/configure.ac~ 2011-02-10 11:50:21.693561096 +0100 ++++ ImageMagick-6.6.7-4/configure.ac 2011-02-10 12:23:40.013561098 +0100 +@@ -2290,7 +2290,7 @@ + # + have_lzma='no' + LZMA_LIBS='' +-if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then ++if test "$with_lzma" != 'no'; then + AC_MSG_RESULT([-------------------------------------------------------------]) + AC_MSG_CHECKING(for LZMA) + AC_MSG_RESULT()