Integrate

http://git.erp5.org/gitweb/slapos.git/commitdiff/2edb5d390f3f8a8fb2ca2deeb355aa1eb6498796

component/xorg/700c7896b832d6e4fb0185f0d5382b01f94e7141.patch

+From 700c7896b832d6e4fb0185f0d5382b01f94e7141 Mon Sep 17 00:00:00 2001
+From: Alan Hourihane <alanh@vmware.com>
+Date: Fri, 25 Feb 2011 11:05:27 +0000
+Subject: Add _X_HIDDEN to xgeExtRegister to fix build problems on 64bit
+
+---
+diff --git a/src/Xge.c b/src/Xge.c
+index 0655e00..d28a4f0 100644
+--- a/src/Xge.c
++++ b/src/Xge.c
+@@ -292,7 +292,7 @@ _xgeEventToWire(Display* dpy, XEvent* re, xEvent* event)
+  * Extensions need to register callbacks for their events.
+  */
+ Bool
+-xgeExtRegister(Display* dpy, int offset, XExtensionHooks* callbacks)
++_X_HIDDEN xgeExtRegister(Display* dpy, int offset, XExtensionHooks* callbacks)
+ {
+     XGEExtNode* newExt;
+     XGEData* xge_data;
+--
+cgit v0.8.3-6-g21f6

component/xorg/buildout.cfg

@@ -114,7 +114,8 @@ patch-options = -p1
 [libXext-patch-link-error]
 # Fixes libXext.la link error
 recipe = hexagonit.recipe.download
-url = http://cgit.freedesktop.org/xorg/lib/libXext/patch/?id=700c7896b832d6e4fb0185f0d5382b01f94e7141
+#url = http://cgit.freedesktop.org/xorg/lib/libXext/patch/?id=700c7896b832d6e4fb0185f0d5382b01f94e7141
+url = ${:_profile_base_location_}/${:filename}
 download-only = true
 filename = 700c7896b832d6e4fb0185f0d5382b01f94e7141.patch
 md5sum = 52635ef694ee6f1acb642a77ee8eb010