diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-09-25 12:38:05 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-09-25 12:38:05 +0000 |
| commit | 8e4e856e3ce058841adf6692c83efca0c2fc85c2 (patch) | |
| tree | daf5c742f60756a62196e48cf1474fe22400487a /packages/xorg-lib/libx11-trim | |
| parent | ebefc8130b47867e376a6c6cf4291ffe52f35b7d (diff) | |
xorg-lib: attempt to merge with poky
* fixed DEPENDS from poky
* -sdk package from poky
Diffstat (limited to 'packages/xorg-lib/libx11-trim')
| -rw-r--r-- | packages/xorg-lib/libx11-trim/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/xorg-lib/libx11-trim/include_fix.patch | 23 |
2 files changed, 23 insertions, 0 deletions
diff --git a/packages/xorg-lib/libx11-trim/.mtn2git_empty b/packages/xorg-lib/libx11-trim/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-lib/libx11-trim/.mtn2git_empty diff --git a/packages/xorg-lib/libx11-trim/include_fix.patch b/packages/xorg-lib/libx11-trim/include_fix.patch new file mode 100644 index 0000000000..99ed57194e --- /dev/null +++ b/packages/xorg-lib/libx11-trim/include_fix.patch @@ -0,0 +1,23 @@ +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- libX11-1.1.5.orig/configure.ac ++++ libX11-1.1.5/configure.ac +@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS) + AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) + + # + # Find keysymdef.h + # +-AC_MSG_CHECKING([keysymdef.h]) +-dir=`pkg-config --variable=includedir xproto` +-KEYSYMDEF="$dir/X11/keysymdef.h" ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") + if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) + else + AC_MSG_ERROR([Cannot find keysymdef.h]) + fi |