diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2006-03-12 18:05:44 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-12 18:05:44 +0000 |
| commit | 2b04a7deb756d1f2f938a7121c3bd48e2ff2ae76 (patch) | |
| tree | 862308580589d554ea058d5afea7b3efff9ca100 /packages | |
| parent | b5daee486e0390421eec65d8331f7617b5b6edea (diff) | |
diet-x11_X11R7.0-1.0.0: fix build for --disable-xlocale
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/xlibs/diet-x11/fix-disable-xlocale.diff | 14 | ||||
| -rw-r--r-- | packages/xlibs/diet-x11_X11R7.0-1.0.0.bb | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/packages/xlibs/diet-x11/fix-disable-xlocale.diff b/packages/xlibs/diet-x11/fix-disable-xlocale.diff new file mode 100644 index 0000000000..9dbf6dac68 --- /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 daca669f0a..9f3322c893 100644 --- 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 |