From 43364ef8c21e3063bc43110eafff3ccba9a9c462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Fri, 16 Sep 2011 09:15:35 +0200
Subject: [PATCH] Update xorg components

---
 component/xorg/buildout.cfg | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/component/xorg/buildout.cfg b/component/xorg/buildout.cfg
index 0c06ebe82..250125ea4 100644
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
@@ -299,25 +299,30 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
 
 
-[libIce]
+[libICE]
 recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2
-#md5sum = 8a414f8f2327aaa616ca2dcac1f5d8c3
-configure-options = 
+md5sum = bb72a732b15e9dc25c3036559387eed5
+configure-options =
   --disable-static
+  --without-xmlto
+  --without-fop
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
+  PATH=${pkgconfig:location}/bin:%(PATH)s
 
 [libSM]
 recipe = hexagonit.recipe.cmmi
-url = http://www.x.org/releases/X11R7.6/src/lib/libSM-1.2.0.tar.gz
-#md5sum = 
-configure-options = 
+url = http://www.x.org/releases/X11R7.6/src/lib/libSM-1.2.0.tar.bz2
+md5sum = e78c447bf1790552b644eca81b542742
+configure-options =
   --disable-static
+  --without-xmlto
+  --without-fop
 environment =
+  PKG_CONFIG_PATH=${libICE:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${libIce:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
+  LIBUUID_CFLAGS=-I${libuuid:location}/include
 
 [libXt]
 recipe = hexagonit.recipe.cmmi
@@ -327,8 +332,8 @@ configure-options =
   --disable-static
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-    PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libSM:location}/lib/pkgconfig:${libIce:location}/lib/pkgconfig
-    CPPFLAGS=-I${xproto:location}/include -I${libX11:location}/include -I${libSM:location}/include -I${libIce:location}/include -I${kbproto:location}/include
+    PKG_CONFIG_PATH=${render:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libSM:location}/lib/pkgconfig:${libICE:location}/lib/pkgconfig
+    CPPFLAGS=-I${xproto:location}/include -I${libX11:location}/include -I${libSM:location}/include -I${libICE:location}/include -I${kbproto:location}/include
 
 
 [dri2proto]
-- 
2.30.9