Hi

Here you are a new set of patches. I needed them to cross build libxcb
and libx11.

Regards,
Thomas
--- libX11-1.2.2/configure.vanilla	2009-08-27 23:24:36.000000000 +0200
+++ libX11-1.2.2/configure	2009-08-27 23:25:00.000000000 +0200
@@ -15675,17 +15675,27 @@
 #
 # Find keysymdef.h
 #
-{ $as_echo "$as_me:$LINENO: checking keysymdef.h" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking keysymdef.h" >&5
 $as_echo_n "checking keysymdef.h... " >&6; }
-dir=`pkg-config --variable=includedir xproto`
-KEYSYMDEF="$dir/X11/keysymdef.h"
+
+# Check whether --with-keysymdef was given.
+if test "${with_keysymdef+set}" = set; then :
+  withval=$with_keysymdef; KEYSYMDEF=$withval
+else
+  KEYSYMDEF=""
+fi
+
+
+if test x$KEYSYMDEF = x; then
+	dir=`pkg-config --variable=includedir xproto`
+	KEYSYMDEF="$dir/X11/keysymdef.h"
+fi
+
 if test -f "$KEYSYMDEF"; then
-        { $as_echo "$as_me:$LINENO: result: $KEYSYMDEF" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEF" >&5
 $as_echo "$KEYSYMDEF" >&6; }
 else
-	{ { $as_echo "$as_me:$LINENO: error: Cannot find keysymdef.h" >&5
-$as_echo "$as_me: error: Cannot find keysymdef.h" >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Cannot find keysymdef.h" "$LINENO" 5
 fi
 
 
Index: package/xorg/libx11/libx11.conf
===================================================================
--- package/xorg/libx11/libx11.conf	(révision 34073)
+++ package/xorg/libx11/libx11.conf	(copie de travail)
@@ -14,3 +14,5 @@
 
 atstage native || hook_add premake 5 '$MAKE -C src/util CC=cc makekeys'
 pkginstalled libxcb || var_append extraconfopt ' ' '--without-xcb'
+
+var_append extraconfopt " " "--with-keysymdef=$root`pkg-config --variable=includedir xproto`/X11/keysymdef.h"
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# 
# T2 SDE: package/.../xorg/libxcb.conf
# Copyright (C) 2004 - 2006 The T2 SDE Project
# 
# More information can be found in the files COPYING and README.
# 
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END ---

var_append makeopt " " "XCBPROTO_XCBINCLUDEDIR=$root/`pkg-config 
--variable=xcbincludedir xcb-proto`"
----------------------------------------------------------- 
If you wish to unsubscribe from this mailing, send mail to
[email protected] with a subject of: unsubscribe t2

Reply via email to