summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Davey <ade@beth2.org>2005-12-20 10:38:05 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-12-20 10:38:05 +0000
commit758161e02b400c7b007676d2513422de4c7aa7e9 (patch)
tree4b27142c3ed7354f72b5869ce1163677745ee69c
parent968fa5b91a65c55599ed4fa2f07bf5c81e407b3e (diff)
Diet-x11 6.2.1: add more xim stubs
-rw-r--r--packages/x11/diet-x11_6.2.1.bb3
-rw-r--r--packages/x11/files/xim.patch55
-rw-r--r--packages/x11/x11_6.2.1.bb2
3 files changed, 58 insertions, 2 deletions
diff --git a/packages/x11/diet-x11_6.2.1.bb b/packages/x11/diet-x11_6.2.1.bb
index 1313bd08d0..b63bfa041a 100644
--- a/packages/x11/diet-x11_6.2.1.bb
+++ b/packages/x11/diet-x11_6.2.1.bb
@@ -4,5 +4,6 @@ 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"
+SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \
+ file://xim.patch;patch=1"
diff --git a/packages/x11/files/xim.patch b/packages/x11/files/xim.patch
new file mode 100644
index 0000000000..0eab197a80
--- /dev/null
+++ b/packages/x11/files/xim.patch
@@ -0,0 +1,55 @@
+--- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
++++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
+@@ -90,6 +90,52 @@
+ return;
+ }
+
++XIM
++XOpenIM (
++ Display* display,
++ struct _XrmHashBucketRec* rdb,
++ char* res_name,
++ char* res_class)
++{
++ return (XIM) NULL;
++}
++
++Status
++XCloseIM ( XIM im )
++{
++ return NULL;
++}
++
++XIC
++XCreateIC ( XIM im, ...)
++{
++ return NULL;
++}
++
++void
++XDestroyIC ( XIC ic )
++{
++ return;
++}
++
++int
++XmbLookupString (
++ XIC ic,
++ XKeyPressedEvent* ev,
++ char* buffer,
++ int nbytes,
++ KeySym* keysym,
++ Status* status)
++{
++ return XLookupNone;
++}
++
++char *
++XGetICValues( XIC ic, ...)
++{
++ return (char *) NULL;
++}
++
+ XPointer
+ _XimGetLocaleCode ( _Xconst char* encoding_name )
+ {
diff --git a/packages/x11/x11_6.2.1.bb b/packages/x11/x11_6.2.1.bb
index 121c1ddd9e..b1de21c383 100644
--- a/packages/x11/x11_6.2.1.bb
+++ b/packages/x11/x11_6.2.1.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "Base X libs."
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB"
FILES_${PN}-locale += "${datadir}/X11/locale"
PROVIDES = "x11"
-PR = "r3"
+PR = "r4"
SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \
file://errordb-keysymdb-path-fix.patch;patch=1 \