diet-x11_X11R7.0-1.0.0: fix build for --disable-xlocale

diff --git a/packages/xlibs/diet-x11/fix-disable-xlocale.diff b/packages/xlibs/diet-x11/fix-disable-xlocale.diff
new file mode 100644 (file)
index 0000000..9dbf6da
--- /dev/null
+++ b/packages/xlibs/diet-x11/fix-disable-xlocale.diff
@@ -0,0 +1,14 @@
+--- libX11-X11R7.0-1.0.0/src/Font.c.orig       2006-03-12 18:35:42.000000000 +0100
++++ libX11-X11R7.0-1.0.0/src/Font.c    2006-03-12 18:40:27.000000000 +0100
+@@ -701,7 +701,11 @@
+     }
+     if (l - 2 - (p - charset) < 0)
+       return 0;
++#ifdef XLOCALE
+     if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
++#else
++    if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
++#endif
+       return 0;
+     if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
+       return 0;

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 daca669..9f3322c 100644 (file)
--- a/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
+++ b/packages/xlibs/diet-x11_X11R7.0-1.0.0.bb
@@ -6,7 +6,8 @@ PROVIDES += "libx11"
 EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 
-SRC_URI += "file://X18NCMSstubs.diff;patch=1"
+SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
+           file://fix-disable-xlocale.diff;patch=1"
 
 #do_stage_append () {
 #      rm -f ${STAGING_INCDIR}/X11/XKBlib.h