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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Dec  1 23:21:27 2010
New Revision: 41005

URL: http://svn.erp5.org?rev=41005&view=rev
Log:
use our own freetype and fontconfig.

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

Modified: erp5/trunk/buildout/software-profiles/graphviz.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/graphviz.cfg?rev=41005&r1=41004&r2=41005&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/graphviz.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/graphviz.cfg [utf8] Wed Dec  1 23:21:27 2010
@@ -5,8 +5,11 @@
 parts =
   graphviz
 extends =
+  ../software-profiles/fontconfig.cfg
+  ../software-profiles/freetype.cfg
   ../software-profiles/libpng.cfg
   ../software-profiles/libtool.cfg
+  ../software-profiles/pkgconfig.cfg
   ../software-profiles/zlib.cfg
 
 [graphviz]
@@ -20,6 +23,8 @@ configure-options =
   --with-pnglibdir=${libpng:location}/lib
   --with-zincludedir=${zlib:location}/include
   --with-zlibdir=${zlib:location}/lib
+  --with-freetype2
+  --with-fontconfig
   --disable-swig
   --disable-sharp
   --disable-guile
@@ -42,10 +47,10 @@ configure-options =
   --without-pangocairo
   --without-lasi
   --without-glitz
-  --without-freetype2
-  --without-fontconfig
   --without-jpeg
   --without-glut
 environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig
   CFLAGS =-I${zlib:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=41005&r1=41004&r2=41005&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Wed Dec  1 23:21:27 2010
@@ -2217,6 +2217,29 @@ class AssertGraphviz(AssertSoftwareMixin
       'zlib',
       'graphviz',
       ])
+  def test_ld_libgvplugin_gd(self):
+    self.assertLibraryList('parts/graphviz/lib/graphviz/libgvplugin_gd.so', [
+      'libc',
+      'libcdt',
+      'libdl',
+      'libexpat',
+      'libfontconfig',
+      'libfreetype',
+      'libgvc',
+      'libgraph',
+      'libm',
+      'libpathplan',
+      'libpng14',
+      'libxdot',
+      'libz',
+      ], [
+      'fontconfig',
+      'freetype',
+      'graphviz',
+      'libexpat',
+      'libpng',
+      'zlib',
+      ])
 
 class AssertPkgconfig(AssertSoftwareMixin):
   def test_ld_dot(self):