From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 18 Apr 2006 09:52:20 +0000 (+0000)
Subject: diet-x11 x11r7-1.0.0 tell the truth about thy utf8 support (fixes #778)
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~58
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be7b0f40fb3d205e9b1ee06c3d209d4de26e5534;p=openembedded.git

diet-x11 x11r7-1.0.0 tell the truth about thy utf8 support (fixes #778)
---

diff --git a/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch b/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch
new file mode 100644
index 0000000000..a098db1941
--- /dev/null
+++ b/packages/xlibs/diet-x11/fix-utf8-wrong-define.patch
@@ -0,0 +1,16 @@
+
+#
+# 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 @@
+ 
+ /* 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/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb b/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
index 9f3322c893..3e09f9a4b8 100644
--- a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
@@ -7,7 +7,8 @@ EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 
 SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
-	    file://fix-disable-xlocale.diff;patch=1"
+	    file://fix-disable-xlocale.diff;patch=1 \
+            file://fix-utf8-wrong-define.patch;patch=1"
 
 #do_stage_append () {
 #	rm -f ${STAGING_INCDIR}/X11/XKBlib.h