diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-03-25 23:31:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-03-25 23:31:04 +0000 |
| commit | c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d (patch) | |
| tree | 9173fb365bf861e2337693179c270f81193f41b5 /openembedded/packages/xlibs/libx11 | |
| parent | 05ff3147c40087edece71449e375cdf588d7a29b (diff) | |
| download | openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.gz openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.bz2 openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.zip | |
Update xlibs to follow restructuring in OE (in preparation for X11R7)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@341 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/xlibs/libx11')
3 files changed, 60 insertions, 0 deletions
diff --git a/openembedded/packages/xlibs/libx11/autofoo.patch b/openembedded/packages/xlibs/libx11/autofoo.patch new file mode 100644 index 0000000000..8bdba09768 --- /dev/null +++ b/openembedded/packages/xlibs/libx11/autofoo.patch @@ -0,0 +1,22 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-6.2.1/configure.ac~autofoo ++++ libX11-6.2.1/configure.ac +@@ -7,12 +7,12 @@ + [jg@freedesktop.org], + libX11) + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_INIT_AUTOMAKE([dist-bzip2]) ++AC_CONFIG_AUX_DIR(.) + ++AM_INIT_AUTOMAKE([dist-bzip2]) + AM_MAINTAINER_MODE + + AM_CONFIG_HEADER([src/config.h]) +-AC_CONFIG_AUX_DIR(.) + + # Checks for programs. + AC_PROG_LIBTOOL diff --git a/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch b/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch new file mode 100644 index 0000000000..f43d38065e --- /dev/null +++ b/openembedded/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch @@ -0,0 +1,22 @@ +--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 ++++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 +@@ -56,7 +56,7 @@ + #include <stdio.h> + + #ifndef ERRORDB +-#define ERRORDB "/usr/lib/X11/XErrorDB" ++#define ERRORDB "/usr/share/X11/XErrorDB" + #endif + + /* +--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 ++++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 +@@ -36,7 +36,7 @@ + #include "Key.h" + + #ifndef KEYSYMDB +-#define KEYSYMDB "/usr/lib/X11/XKeysymDB" ++#define KEYSYMDB "/usr/share/X11/XKeysymDB" + #endif + + static Bool initialized; diff --git a/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch b/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch new file mode 100644 index 0000000000..dca88fba92 --- /dev/null +++ b/openembedded/packages/xlibs/libx11/fix-utf8-wrong-define.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define ++++ libX11-6.2.1/include/X11/Xlib.h +@@ -100,7 +100,7 @@ + + /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +-#define X_HAVE_UTF8_STRING 1 ++#undef X_HAVE_UTF8_STRING + + typedef char *XPointer; + |