diff options
author | Richard Purdie <richard@openedhand.com> | 2008-02-12 08:37:01 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-02-12 08:37:01 +0000 |
commit | deb4b8b47aff72bd281db6583cade0a72d8b34ae (patch) | |
tree | feab86cec5a570d29a9675b5c84fbc1a7e24f02a /meta/packages/xorg-lib/diet-x11/include_fix.patch | |
parent | 387121d9254d743182d40580f9bea99dea690cc8 (diff) | |
download | openembedded-core-deb4b8b47aff72bd281db6583cade0a72d8b34ae.tar.gz openembedded-core-deb4b8b47aff72bd281db6583cade0a72d8b34ae.tar.bz2 openembedded-core-deb4b8b47aff72bd281db6583cade0a72d8b34ae.tar.xz openembedded-core-deb4b8b47aff72bd281db6583cade0a72d8b34ae.zip |
diet-x11: Use the libx11 patches and fix build failures
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3778 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-lib/diet-x11/include_fix.patch')
-rw-r--r-- | meta/packages/xorg-lib/diet-x11/include_fix.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/meta/packages/xorg-lib/diet-x11/include_fix.patch b/meta/packages/xorg-lib/diet-x11/include_fix.patch deleted file mode 100644 index 565308834..000000000 --- a/meta/packages/xorg-lib/diet-x11/include_fix.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- - configure.ac | 44 ++++++++++++++++++++++++-------------------- - 1 file changed, 24 insertions(+), 20 deletions(-) - -Index: libX11-1.1.2/configure.ac -=================================================================== ---- libX11-1.1.2.orig/configure.ac 2008-01-02 15:30:47.000000000 +0000 -+++ libX11-1.1.2/configure.ac 2008-01-02 15:47:25.000000000 +0000 -@@ -207,29 +207,33 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, - # - KEYSYMDEF="" - AC_MSG_CHECKING([keysymdef.h]) --for flag in $XPROTO_CFLAGS -I/usr/include; do -- case "$KEYSYMDEF" in -- "") -- case "$flag" in -- *-I*) -- dir=`echo "$flag" | sed 's/ *-I//'` -- file="$dir/X11/keysymdef.h" -- if test -f "$file"; then -- KEYSYMDEF="$file" -- fi -+AC_ARG_WITH(keysymdef, -+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), -+ KEYSYMDEF=$withval, KEYSYMDEF="") -+ -+if test x$KEYSYMDEF = x; then -+ for flag in $XPROTO_CFLAGS -I/usr/include; do -+ case "$KEYSYMDEF" in -+ "") -+ case "$flag" in -+ *-I*) -+ dir=`echo "$flag" | sed 's/ *-I//'` -+ file="$dir/X11/keysymdef.h" -+ if test -f "$file"; then -+ KEYSYMDEF="$file" -+ fi -+ ;; -+ esac - ;; - esac -- ;; -- esac --done --case "$KEYSYMDEF" in --"") -- AC_MSG_ERROR([Cannot find keysymdef.h]) -- ;; --*) -+ done -+fi -+ -+if test -f "$KEYSYMDEF"; then - AC_MSG_RESULT([$KEYSYMDEF]) -- ;; --esac -+else -+ AC_MSG_ERROR([Cannot find keysymdef.h]) -+fi - AC_SUBST(KEYSYMDEF) - - AC_ARG_ENABLE(udc, |