fix wrong #define in diet-x11 Xlib.h:

don't say you X_HAVE_UTF8_STRING if you don't...

diff --git a/packages/x11/diet-x11_20050226.bb b/packages/x11/diet-x11_20050226.bb
index 6f8c1d3..acb6fc3 100644 (file)
--- a/packages/x11/diet-x11_20050226.bb
+++ b/packages/x11/diet-x11_20050226.bb
@@ -1,3 +1,6 @@
 SECTION = "x11/base"
 include x11_${PV}.bb
+
 EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"

diff --git a/packages/x11/diet-x11_6.2.1.bb b/packages/x11/diet-x11_6.2.1.bb
index bc6e822..1313bd0 100644 (file)
--- a/packages/x11/diet-x11_6.2.1.bb
+++ b/packages/x11/diet-x11_6.2.1.bb
@@ -4,3 +4,5 @@ include x11_${PV}.bb
 EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
+

diff --git a/packages/x11/diet-x11_cvs.bb b/packages/x11/diet-x11_cvs.bb
index b820fae..404794f 100644 (file)
--- a/packages/x11/diet-x11_cvs.bb
+++ b/packages/x11/diet-x11_cvs.bb
@@ -2,3 +2,6 @@ SECTION = "x11/base"
 include x11_cvs.bb
 
 EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb"
+
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1"
+

diff --git a/packages/x11/files/fix-utf8-wrong-define.patch b/packages/x11/files/fix-utf8-wrong-define.patch
new file mode 100644 (file)
index 0000000..dca88fb
--- /dev/null
+++ b/packages/x11/files/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;
+