diff options
Diffstat (limited to 'meta/recipes-graphics')
30 files changed, 52 insertions, 168 deletions
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch index 7fec1e910..c8a3bf5d1 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch +++ b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- fontconfig.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch index 44ae450a1..0f21d1ff2 100644 --- a/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch +++ b/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100 +++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100 @@ -16,7 +16,7 @@ diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch index 716f562f6..64b7efac2 100644 --- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Do not set Os optimization in target APP CFLAGS, since it may have potential error if "--enable-target-optspace" is not set when configuring GCC. diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch index ee12f0a5b..d08d0d5b9 100644 --- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: Xsettings-client-0.10/Makefile.am =================================================================== --- Xsettings-client-0.10.orig/Makefile.am 2008-02-07 14:49:54.000000000 +0000 diff --git a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch index cef635096..d858a63b7 100644 --- a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch +++ b/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- libxcb-1.0.orig/configure.ac 2006-11-23 15:33:01.000000000 +0000 +++ libxcb-1.0/configure.ac 2008-09-10 20:29:12.000000000 +0100 @@ -50,7 +50,7 @@ diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch index c8aa08595..eeb4175b4 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/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-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch index 011c23e8d..bf6c7d59c 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- libX11-1.3.4.orig/configure.ac +++ libX11-1.3.4/configure.ac @@ -32,7 +32,6 @@ diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch index 4036757e5..561b57762 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + --- src/util/Makefile.am | 21 ----------------- 1 file changed, 21 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff index 2dd27fc94..b49fc2271 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 9dbf6dac6..7dcdd6af2 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 a098db194..26d3349be 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 99ed57194..b3bcbabfe 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 ecf9625ca..cc05fdca7 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 9cc2bbbbd..5dc6f0668 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 0eab197a8..000000000 --- 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 ) - { diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch index 99ed57194..b3bcbabfe 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-trim/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-trim/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch index ecf9625ca..cc05fdca7 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-trim/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-trim/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch index 670578257..04458359e 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-trim/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/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff index 54b1727a9..2e86a48c2 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff +++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100 +++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100 @@ -83,6 +83,7 @@ diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff index 9dbf6dac6..7dcdd6af2 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff +++ b/meta/recipes-graphics/xorg-lib/libx11/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/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch index a098db194..26d3349be 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/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/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch index 99ed57194..b3bcbabfe 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/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/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch index ecf9625ca..cc05fdca7 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/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/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch index 670578257..04458359e 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/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/xim.patch b/meta/recipes-graphics/xorg-lib/libx11/xim.patch deleted file mode 100644 index 0eab197a8..000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/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 ) - { diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch index 0d7efc70f..d6148834a 100644 --- a/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch +++ b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + There is no extra reply data and if we say not to disgard it, xcb throws fatal asserts. diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch index 848beff08..60331f6e7 100644 --- a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch +++ b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + This patch makes the build use its own Xcomposite.h over rather than an older Xcomposite.h that might already be installed in the staging dir. diff --git a/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch b/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch index 90bded6fb..b3c58aff4 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch +++ b/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200 +++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200 @@ -695,6 +695,11 @@ diff --git a/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch b/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch deleted file mode 100644 index 197da0735..000000000 --- a/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 556a351de83fc6f401b02213dae95731553c216d Mon Sep 17 00:00:00 2001 -From: Loïc Minier <lool@dooz.org> -Date: Mon, 24 Mar 2008 19:38:27 +0000 -Subject: Bug #10489: Don't retry unix socket connect()s on ENOENT. - -If the socket isn't there, it's not gonna magically appear. Either it's -a server socket and you should have just waited for the SIGUSR1 from the -server, or it's a stale reference to an ICE socket. - -However, do retry once, so fallback from abstract to filesystem namespace -works. - -Originally Debian bug #385976. ---- -diff --git a/Xtranssock.c b/Xtranssock.c -index 8a7d2ec..da4afe9 100644 ---- a/Xtranssock.c -+++ b/Xtranssock.c -@@ -2146,8 +2146,13 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port) - errno = olderrno; - - /* -- * If the error was ENOENT, the server may be starting up -- * and we should try again. -+ * If the error was ENOENT, the server may be starting up; we used -+ * to suggest to try again in this case with -+ * TRANS_TRY_CONNECT_AGAIN, but this introduced problems for -+ * processes still referencing stale sockets in their environment. -+ * Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it -+ * is suggested that higher level stacks handle retries on their -+ * level when they face a slow starting server. - * - * If the error was EWOULDBLOCK or EINPROGRESS then the socket - * was non-blocking and we should poll using select -@@ -2161,14 +2166,14 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port) - else if (olderrno == EINTR) - return TRANS_TRY_CONNECT_AGAIN; - else if (olderrno == ENOENT) { -- /* -- * If opening as abstract socket failed, try again "normally" -- */ -- if (abstract) -+ /* If opening as abstract socket failed, try again normally */ -+ if (abstract) { - ciptr->transptr->flags &= ~(TRANS_ABSTRACT); -- return TRANS_TRY_CONNECT_AGAIN; -- } -- else { -+ return TRANS_TRY_CONNECT_AGAIN; -+ } else { -+ return TRANS_CONNECT_FAILED; -+ } -+ } else { - PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n", - EGET(),0, 0); - --- -cgit v0.7.2-37-g538c diff --git a/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch b/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch index 0c85cb0cc..ff8cb25cd 100644 --- a/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch +++ b/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Add missing length fields to the replies. Without these, sanity checking in recent X breaks things. |