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

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 a098db1..dca88fb 100644 (file)
--- 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 (file)
index f43d380..0000000
--- 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 (file)
index dca88fb..0000000
--- 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
similarity index 100%
rename from meta/packages/xorg-lib/files/x11_disable_makekeys.patch
rename to meta/packages/xorg-lib/libx11/x11_disable_makekeys.patch