mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 09:49:33 +02:00
recpies: add Upstream-Status for multiple recipes' patches
tcf-agent: update its patch's Upstream-Status screen: update its patch's Upstream-Status which (GPLv2): update its patch's Upstream-Status gnome-vfs: update its patch's Upstream-Status libart-lgpl: update its patch's Upstream-Status librsvg: update its patch's Upstream-Status fontconfig: update its patch's Upstream-Status freetype: update its patch's Upstream-Status libxsettings-client: update its patch's Upstream-Status libxcb: update its patch's Upstream-Status libx11: update its patch's Upstream-Status - remove 2 unused xim.patch. libx11-trim: update its patch's Upstream-Status libxcalibrate: update its patch's Upstream-Status libxcomposite: update its patch's Upstream-Status libxfont: update its patch's Upstream-Status xtrans: update its patch's Upstream-Status - remove abstract_socket_fix.patch as it's not used at all for long. calibrateproto: update its patch's Upstream-Status latencytop: update its patch's Upstream-Status powertop: update its patch's Upstream-Status settings-daemon: update its patch's Upstream-Status gnome-settings-daemon: update its patch's Upstream-Status libxklavier: update its patch's Upstream-Status liblbxutil: update its patch's Upstream-Status oprofile: update its patch's Upstream-Status and remove an unused patch - delete xml_callgraph_details.patch as it's not used at all. (From OE-Core rev: 94991fb73586887bfc740eacf190032dfb206a65) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
6a7b1fe1bb
commit
fc1859ea66
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
---
|
||||
fontconfig.pc.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
@@ -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 @@
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 @@
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
---
|
||||
configure.ac | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
@@ -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 @@
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
---
|
||||
src/util/Makefile.am | 21 -----------------
|
||||
1 file changed, 21 deletions(-)
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
---
|
||||
configure.ac | 9 -
|
||||
src/Makefile.am | 5
|
||||
|
||||
@@ -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 @@
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
#
|
||||
# Patch managed by http://www.holgerschurig.de/patcher.html
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
---
|
||||
configure.ac | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
---
|
||||
src/util/Makefile.am | 17 -----------------
|
||||
1 file changed, 17 deletions(-)
|
||||
|
||||
@@ -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 )
|
||||
{
|
||||
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
---
|
||||
configure.ac | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
---
|
||||
src/util/Makefile.am | 17 -----------------
|
||||
1 file changed, 17 deletions(-)
|
||||
|
||||
@@ -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 @@
|
||||
|
||||
@@ -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 @@
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
#
|
||||
# Patch managed by http://www.holgerschurig.de/patcher.html
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
---
|
||||
configure.ac | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
---
|
||||
src/util/Makefile.am | 17 -----------------
|
||||
1 file changed, 17 deletions(-)
|
||||
|
||||
@@ -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 )
|
||||
{
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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 @@
|
||||
|
||||
@@ -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
|
||||
@@ -1,3 +1,5 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
Add missing length fields to the replies. Without these, sanity checking in recent X
|
||||
breaks things.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user