diff options
| author | Ross Burton <ross@openedhand.com> | 2008-02-11 22:11:12 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2008-02-11 22:11:12 +0000 |
| commit | 162f879a0c74aa46fe890022af300381e6ed3cc6 (patch) | |
| tree | 35f750e6e939506c469623d20e43a215aa45d48f /meta/packages/xorg-lib | |
| parent | c490cc596a503a4e3935e13a407406636a3df15d (diff) | |
| download | openembedded-core-162f879a0c74aa46fe890022af300381e6ed3cc6.tar.gz openembedded-core-162f879a0c74aa46fe890022af300381e6ed3cc6.tar.bz2 openembedded-core-162f879a0c74aa46fe890022af300381e6ed3cc6.tar.xz openembedded-core-162f879a0c74aa46fe890022af300381e6ed3cc6.zip | |
Patch re-jiggle to remove unused and duplicates
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3767 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-lib')
| -rw-r--r-- | meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch | 8 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch | 22 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch | 16 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch (renamed from meta/packages/xorg-lib/files/x11_disable_makekeys.patch) | 0 |
4 files changed, 4 insertions, 42 deletions
diff --git a/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch b/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch index a098db194..dca88fba9 100644 --- a/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch +++ b/meta/packages/xorg-lib/diet-x11/fix-utf8-wrong-define.patch @@ -3,14 +3,14 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define -+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h -@@ -103,7 +103,7 @@ +--- 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 ++#undef X_HAVE_UTF8_STRING typedef char *XPointer; diff --git a/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch b/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch deleted file mode 100644 index f43d38065..000000000 --- a/meta/packages/xorg-lib/files/errordb-keysymdb-path-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch b/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch deleted file mode 100644 index dca88fba9..000000000 --- a/meta/packages/xorg-lib/files/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# 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; - diff --git a/meta/packages/xorg-lib/files/x11_disable_makekeys.patch b/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch index 2a8a55cdf..2a8a55cdf 100644 --- a/meta/packages/xorg-lib/files/x11_disable_makekeys.patch +++ b/meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch |