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
This commit is contained in:
Ross Burton
2008-02-11 22:11:12 +00:00
parent c490cc596a
commit 162f879a0c
4 changed files with 4 additions and 42 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;