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