diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-git')
7 files changed, 11 insertions, 55 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff index 2dd27fc94f..b49fc2271b 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff +++ b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- configure.ac | 9 - src/Makefile.am | 5 diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff index 9dbf6dac68..7dcdd6af22 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff +++ b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- 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 @@ diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch index a098db1941..26d3349bed 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch @@ -1,3 +1,4 @@ +Upstream-Status: Pending # # Patch managed by http://www.holgerschurig.de/patcher.html diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch index 99ed57194e..b3bcbabfeb 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch index ecf9625cad..cc05fdca7e 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: libX11-1.2.1/configure.ac =================================================================== --- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch index 9cc2bbbbdd..5dc6f06689 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- src/util/Makefile.am | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch b/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch deleted file mode 100644 index 0eab197a80..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 ) - { |