Merge remote-tracking branch 'upstream/erp5' into upstream-erp5-generic

component/imagemagick/buildout.cfg

@@ -25,18 +25,10 @@ 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 = ${:_profile_base_location_}/${:filename}
-path = ${:filename}
-md5sum = 04e1b934a58f4b3a83e4df148795b338
-download-only = true
-filename = imagemagick-6.6.7-4-without-lzma.patch
-
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.3-1.tar.bz2
-md5sum = 89d378733d89bc61c04bc0fdc140a3a7
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.3-10.tar.bz2
+md5sum = 3c1d1a04b1ed2998217e16001b58069f
 configure-options =
   --disable-static
   --without-x
@@ -55,6 +47,7 @@ configure-options =
   --without-lqr
   --without-lzma
   --without-openexr
+  --without-pango
   --without-rsvg
   --without-wmf
   --without-xml
@@ -66,7 +59,6 @@ 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

component/imagemagick/imagemagick-6.6.7-4-without-lzma.patch

---- 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()