[Erp5-report] r43128 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Feb  7 13:34:00 2011
New Revision: 43128

URL: http://svn.erp5.org?rev=43128&view=rev
Log:
disable more libraries explicitly. enable fontconfig support.

Modified:
    erp5/trunk/buildout/software-profiles/imagemagick.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/imagemagick.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/imagemagick.cfg?rev=43128&r1=43127&r2=43128&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/imagemagick.cfg [utf8] Mon Feb  7 13:34:00 2011
@@ -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

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=43128&r1=43127&r2=43128&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Mon Feb  7 13:34:00 2011
@@ -1633,6 +1633,8 @@ class AssertImagemagick(AssertSoftwareMi
       'libbz2',
       'libc',
       'libdl',
+      'libexpat',
+      'libfontconfig',
       'libfreetype',
       'libjasper',
       'libjbig',
@@ -1647,9 +1649,11 @@ class AssertImagemagick(AssertSoftwareMi
 
   core_rpath_list = [
       'bzip2',
+      'fontconfig',
       'freetype',
       'jasper',
       'jbigkit',
+      'libexpat',
       'libjpeg',
       'libpng',
       'libtiff',