[Erp5-report] r45462 kazuhiko - in /erp5/trunk: buildout/software-profiles/ software_releas...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Apr 14 17:50:05 2011
New Revision: 45462

URL: http://svn.erp5.org?rev=45462&view=rev
Log:
more libraries are required for libreoffice.

Modified:
    erp5/trunk/buildout/software-profiles/xorg.cfg
    erp5/trunk/software_release/erp5/instance.cfg

Modified: erp5/trunk/buildout/software-profiles/xorg.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/xorg.cfg?rev=45462&r1=45461&r2=45462&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/xorg.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/xorg.cfg [utf8] Thu Apr 14 17:50:05 2011
@@ -8,6 +8,7 @@ extends =
   zlib.cfg
 
 parts =
+  libXdmcp
   libXext
   libXau
   libX11
@@ -124,3 +125,16 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   CFLAGS=-I${xproto:location}/include
   CPPFLAGS=-I${xproto:location}/include
+
+[libXdmcp]
+recipe = hexagonit.recipe.cmmi
+url = http://www.x.org/releases/X11R7.6/src/lib/libXdmcp-1.1.0.tar.bz2
+md5sum = 762b6bbaff7b7d0831ddb4f072f939a5
+environment =
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${xproto:location}/lib
+  LD_RUN_PATH=${xproto:location}/lib
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+configure-options =
+  --without-xmlto
+  --without-fop

Modified: erp5/trunk/software_release/erp5/instance.cfg
URL: http://svn.erp5.org/erp5/trunk/software_release/erp5/instance.cfg?rev=45462&r1=45461&r2=45462&view=diff
==============================================================================
--- erp5/trunk/software_release/erp5/instance.cfg [utf8] (original)
+++ erp5/trunk/software_release/erp5/instance.cfg [utf8] Thu Apr 14 17:50:05 2011
@@ -50,4 +50,4 @@ link_binary_list =
 # availability in software's eggs
 products = ${products:list}
 environment =
-  LD_LIBRARY_PATH = ${file:location}/lib:${zlib:location}/lib:${freetype:location}/lib:${libXext:location}/lib:${libXau:location}/lib:${libX11:location}/lib
+  LD_LIBRARY_PATH = ${file:location}/lib:${zlib:location}/lib:${freetype:location}/lib:${libXext:location}/lib:${libXau:location}/lib:${libX11:location}/lib:${libXdmcp:location}/lib:${libxcb:location}/lib