diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2005-08-09 22:45:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-09 22:45:30 +0000 |
| commit | 815f26dd03f60c90370b2d769369164ac30605ba (patch) | |
| tree | 4a8c92e124d683249c2188f726ca93de2bb5c791 /packages/x11 | |
| parent | 90cfa8a719599bbc7634dd5c06970227e53471cf (diff) | |
| parent | 25dadfa89ec600d7e78598006215a7e7cac12655 (diff) | |
propagate from branch 'org.openembedded.dev' (head 377c18da9709037d215bdca9e480d15c4a387576)
to branch 'org.openembedded.nslu2-linux' (head 38df3664556be7e752739a1e7aa85b6172ef2022)
Diffstat (limited to 'packages/x11')
| -rw-r--r-- | packages/x11/diet-x11_20050226.bb | 3 | ||||
| -rw-r--r-- | packages/x11/diet-x11_6.2.1.bb | 2 | ||||
| -rw-r--r-- | packages/x11/diet-x11_cvs.bb | 3 | ||||
| -rw-r--r-- | packages/x11/files/fix-utf8-wrong-define.patch | 16 |
4 files changed, 24 insertions, 0 deletions
diff --git a/packages/x11/diet-x11_20050226.bb b/packages/x11/diet-x11_20050226.bb index 6f8c1d36ad..acb6fc330b 100644 --- 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 bc6e8224ed..1313bd08d0 100644 --- 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 b820fae8b2..404794ff5e 100644 --- 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 index 0000000000..dca88fba92 --- /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; + |