summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-05-11 03:01:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-13 09:28:59 (GMT)
commitfc1859ea661d77067774c7fa3c1cbd49cebf90d3 (patch)
tree4d0376ab86a09fb7d3eb01eb7708b762b2545acb
parent6a7b1fe1bb3b723f7c985978660628d0c0d39922 (diff)
downloadpoky-fc1859ea661d77067774c7fa3c1cbd49cebf90d3.tar.gz
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>
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch2
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch2
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch2
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch2
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch2
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch2
-rw-r--r--meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch2
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch2
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch2
-rw-r--r--meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch2
-rw-r--r--meta/recipes-extended/screen/screen-4.0.3/configure.patch2
-rw-r--r--meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch2
-rw-r--r--meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch2
-rw-r--r--meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch2
-rw-r--r--meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch2
-rw-r--r--meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch2
-rw-r--r--meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch2
-rw-r--r--meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch2
-rw-r--r--meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch2
-rw-r--r--meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch2
-rw-r--r--meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch1
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-git/xim.patch55
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch1
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/include_fix.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/nodolt.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/xim.patch55
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch2
-rw-r--r--meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch58
-rw-r--r--meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch2
-rw-r--r--meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch2
-rw-r--r--meta/recipes-kernel/oprofile/oprofile/opstart.patch2
-rw-r--r--meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch232
-rw-r--r--meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch2
-rw-r--r--meta/recipes-sato/settings-daemon/files/addsoundkeys.patch2
-rw-r--r--meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch2
52 files changed, 94 insertions, 400 deletions
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
index 01b4f64..892946f 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: gnome-settings-daemon-2.26.1/configure.ac 3Index: gnome-settings-daemon-2.26.1/configure.ac
2=================================================================== 4===================================================================
3--- gnome-settings-daemon-2.26.1.orig/configure.ac 2009-09-16 22:57:31.000000000 +0100 5--- gnome-settings-daemon-2.26.1.orig/configure.ac 2009-09-16 22:57:31.000000000 +0100
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
index d3fd76c..b8f1661 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in~ 2009-04-24 20:59:51.000000000 -0700 3--- gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in~ 2009-04-24 20:59:51.000000000 -0700
2+++ gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in 2009-04-24 20:59:51.000000000 -0700 4+++ gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in 2009-04-24 20:59:51.000000000 -0700
3@@ -2,7 +2,7 @@ 5@@ -2,7 +2,7 @@
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
index 8e1d0ce..b9cf6e1 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1============================================================ 3============================================================
2 Listen for DeviceAdded in addition to DeviceEnabled 4 Listen for DeviceAdded in addition to DeviceEnabled
3 5
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
index d77063e..965da09 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: gnome-settings-daemon-2.25.90/configure.ac 3Index: gnome-settings-daemon-2.25.90/configure.ac
2=================================================================== 4===================================================================
3--- gnome-settings-daemon-2.25.90.orig/configure.ac 5--- gnome-settings-daemon-2.25.90.orig/configure.ac
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
index 1aff2d6..79f2871 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c 3diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c
2index f84cfad..e8f474a 100644 4index f84cfad..e8f474a 100644
3--- a/plugins/housekeeping/gsd-housekeeping-manager.c 5--- a/plugins/housekeeping/gsd-housekeeping-manager.c
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
index 67f056b..25dc36e 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1diff --git a/configure.ac b/configure.ac 3diff --git a/configure.ac b/configure.ac
2index 135f2ce..ba737a5 100644 4index 135f2ce..ba737a5 100644
3--- a/configure.ac 5--- a/configure.ac
diff --git a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch b/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
index 4aaafb2..f58f30b 100644
--- a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
+++ b/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: libxklavier-3.7/libxklavier.pc.in 3Index: libxklavier-3.7/libxklavier.pc.in
2=================================================================== 4===================================================================
3--- libxklavier-3.7.orig/libxklavier.pc.in 2009-06-10 15:58:46.000000000 +0100 5--- libxklavier-3.7.orig/libxklavier.pc.in 2009-06-10 15:58:46.000000000 +0100
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
index 029d761..63c1847 100644
--- a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
+++ b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1During the build process the mkg3states binary needs to be run. This patch 3During the build process the mkg3states binary needs to be run. This patch
2allows it to be built with the build systems gcc allowing this to work. 4allows it to be built with the build systems gcc allowing this to work.
3 5
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
index fa9e458..60b0b27 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [poky-specific script]
2
1--- a/Makefile 3--- a/Makefile
2+++ b/Makefile 4+++ b/Makefile
3@@ -32,7 +32,7 @@ 5@@ -32,7 +32,7 @@
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
index b88b5e7..aed62fa 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [source code; we'll remove it when upgrading tcf-agent in future]
2
1Index: org.eclipse.tm.tcf.terminals.agent/terminals.c 3Index: org.eclipse.tm.tcf.terminals.agent/terminals.c
2=================================================================== 4===================================================================
3--- org.eclipse.tm.tcf.terminals.agent/terminals.c (revision 0) 5--- org.eclipse.tm.tcf.terminals.agent/terminals.c (revision 0)
diff --git a/meta/recipes-extended/screen/screen-4.0.3/configure.patch b/meta/recipes-extended/screen/screen-4.0.3/configure.patch
index 1061a56..b29071d 100644
--- a/meta/recipes-extended/screen/screen-4.0.3/configure.patch
+++ b/meta/recipes-extended/screen/screen-4.0.3/configure.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1# The patch is borrowed from OE: 3# The patch is borrowed from OE:
2# http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=4ee790cc6974bdfe1c9b06c0567b1c56f56d6615 4# http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=4ee790cc6974bdfe1c9b06c0567b1c56f56d6615
3# and was rebased to screen-4.0.3's configure.in 5# and was rebased to screen-4.0.3's configure.in
diff --git a/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch b/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
index 568d423..fb9b1a4 100644
--- a/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
+++ b/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [this is 2.18(GPLv2) specific]
2
1# glibc also implements the function group_member. To avoid name conflict, 3# glibc also implements the function group_member. To avoid name conflict,
2# here let us append a "_" to which's version. 4# here let us append a "_" to which's version.
3# 5#
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
index 3dbc130..0f52136 100644
--- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
+++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 3--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000
2+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 4+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100
3@@ -154,7 +154,7 @@ 5@@ -154,7 +154,7 @@
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
index e25ecdd..dabec32 100644
--- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
+++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1removes kerberos completely to avoid conflicts with installed kerberos 3removes kerberos completely to avoid conflicts with installed kerberos
2--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 4--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200
3+++ configure.in 2007-01-05 19:42:56.604261797 +0200 5+++ configure.in 2007-01-05 19:42:56.604261797 +0200
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
index 28acbe1..190ba96 100644
--- a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
+++ b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: libart_lgpl-2.3.21/Makefile.am 3Index: libart_lgpl-2.3.21/Makefile.am
2=================================================================== 4===================================================================
3--- libart_lgpl-2.3.21.orig/Makefile.am 2009-04-18 05:29:25.000000000 -0700 5--- libart_lgpl-2.3.21.orig/Makefile.am 2009-04-18 05:29:25.000000000 -0700
diff --git a/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch b/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch
index 217573b..860d7a9 100644
--- a/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch
+++ b/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Automake complains about using += before setting with = 3Automake complains about using += before setting with =
2 4
3Signed-off-by: Saul Wold <sgw@linux.intel.com> 5Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 7fec1e9..c8a3bf5 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- 3---
2 fontconfig.pc.in | 2 +- 4 fontconfig.pc.in | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-) 5 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 44ae450..0f21d1f 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100 3--- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100
2+++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100 4+++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100
3@@ -16,7 +16,7 @@ 5@@ -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 716f562..64b7efa 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1Do not set Os optimization in target APP CFLAGS, since it may have potential 3Do not set Os optimization in target APP CFLAGS, since it may have potential
2error if "--enable-target-optspace" is not set when configuring GCC. 4error if "--enable-target-optspace" is not set when configuring GCC.
3 5
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 ee12f0a..d08d0d5 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: Xsettings-client-0.10/Makefile.am 3Index: Xsettings-client-0.10/Makefile.am
2=================================================================== 4===================================================================
3--- Xsettings-client-0.10.orig/Makefile.am 2008-02-07 14:49:54.000000000 +0000 5--- 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 cef6350..d858a63 100644
--- a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch
+++ b/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- libxcb-1.0.orig/configure.ac 2006-11-23 15:33:01.000000000 +0000 3--- libxcb-1.0.orig/configure.ac 2006-11-23 15:33:01.000000000 +0000
2+++ libxcb-1.0/configure.ac 2008-09-10 20:29:12.000000000 +0100 4+++ libxcb-1.0/configure.ac 2008-09-10 20:29:12.000000000 +0100
3@@ -50,7 +50,7 @@ 5@@ -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 c8aa085..eeb4175 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- 3---
2 configure.ac | 6 +++--- 4 configure.ac | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-) 5 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 011c23e..bf6c7d5 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- libX11-1.3.4.orig/configure.ac 3--- libX11-1.3.4.orig/configure.ac
2+++ libX11-1.3.4/configure.ac 4+++ libX11-1.3.4/configure.ac
3@@ -32,7 +32,6 @@ 5@@ -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 4036757..561b577 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- 3---
2 src/util/Makefile.am | 21 ----------------- 4 src/util/Makefile.am | 21 -----------------
3 1 file changed, 21 deletions(-) 5 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 2dd27fc..b49fc22 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 @@
1Upstream-Status: Pending
2
1--- 3---
2 configure.ac | 9 - 4 configure.ac | 9 -
3 src/Makefile.am | 5 5 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 9dbf6da..7dcdd6a 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 @@
1Upstream-Status: Pending
2
1--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 3--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
2+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 4+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
3@@ -701,7 +701,11 @@ 5@@ -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 a098db1..26d3349 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 @@
1Upstream-Status: Pending
1 2
2# 3#
3# Patch managed by http://www.holgerschurig.de/patcher.html 4# 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 99ed571..b3bcbab 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- 3---
2 configure.ac | 6 +++--- 4 configure.ac | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-) 5 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 ecf9625..cc05fdc 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: libX11-1.2.1/configure.ac 3Index: libX11-1.2.1/configure.ac
2=================================================================== 4===================================================================
3--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 5--- 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 9cc2bbb..5dc6f06 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- 3---
2 src/util/Makefile.am | 17 ----------------- 4 src/util/Makefile.am | 17 -----------------
3 1 file changed, 17 deletions(-) 5 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 0eab197..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1--- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
2+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
3@@ -90,6 +90,52 @@
4 return;
5 }
6
7+XIM
8+XOpenIM (
9+ Display* display,
10+ struct _XrmHashBucketRec* rdb,
11+ char* res_name,
12+ char* res_class)
13+{
14+ return (XIM) NULL;
15+}
16+
17+Status
18+XCloseIM ( XIM im )
19+{
20+ return NULL;
21+}
22+
23+XIC
24+XCreateIC ( XIM im, ...)
25+{
26+ return NULL;
27+}
28+
29+void
30+XDestroyIC ( XIC ic )
31+{
32+ return;
33+}
34+
35+int
36+XmbLookupString (
37+ XIC ic,
38+ XKeyPressedEvent* ev,
39+ char* buffer,
40+ int nbytes,
41+ KeySym* keysym,
42+ Status* status)
43+{
44+ return XLookupNone;
45+}
46+
47+char *
48+XGetICValues( XIC ic, ...)
49+{
50+ return (char *) NULL;
51+}
52+
53 XPointer
54 _XimGetLocaleCode ( _Xconst char* encoding_name )
55 {
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 99ed571..b3bcbab 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- 3---
2 configure.ac | 6 +++--- 4 configure.ac | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-) 5 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 ecf9625..cc05fdc 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: libX11-1.2.1/configure.ac 3Index: libX11-1.2.1/configure.ac
2=================================================================== 4===================================================================
3--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 5--- 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 6705782..0445835 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- 3---
2 src/util/Makefile.am | 17 ----------------- 4 src/util/Makefile.am | 17 -----------------
3 1 file changed, 17 deletions(-) 5 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 54b1727..2e86a48 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100 3--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100
2+++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100 4+++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100
3@@ -83,6 +83,7 @@ 5@@ -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 9dbf6da..7dcdd6a 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 @@
1Upstream-Status: Pending
2
1--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 3--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
2+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 4+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
3@@ -701,7 +701,11 @@ 5@@ -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 a098db1..26d3349 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 @@
1Upstream-Status: Pending
1 2
2# 3#
3# Patch managed by http://www.holgerschurig.de/patcher.html 4# 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 99ed571..b3bcbab 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- 3---
2 configure.ac | 6 +++--- 4 configure.ac | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-) 5 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 ecf9625..cc05fdc 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: libX11-1.2.1/configure.ac 3Index: libX11-1.2.1/configure.ac
2=================================================================== 4===================================================================
3--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100 5--- 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 6705782..0445835 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- 3---
2 src/util/Makefile.am | 17 ----------------- 4 src/util/Makefile.am | 17 -----------------
3 1 file changed, 17 deletions(-) 5 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 0eab197..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11/xim.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1--- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
2+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
3@@ -90,6 +90,52 @@
4 return;
5 }
6
7+XIM
8+XOpenIM (
9+ Display* display,
10+ struct _XrmHashBucketRec* rdb,
11+ char* res_name,
12+ char* res_class)
13+{
14+ return (XIM) NULL;
15+}
16+
17+Status
18+XCloseIM ( XIM im )
19+{
20+ return NULL;
21+}
22+
23+XIC
24+XCreateIC ( XIM im, ...)
25+{
26+ return NULL;
27+}
28+
29+void
30+XDestroyIC ( XIC ic )
31+{
32+ return;
33+}
34+
35+int
36+XmbLookupString (
37+ XIC ic,
38+ XKeyPressedEvent* ev,
39+ char* buffer,
40+ int nbytes,
41+ KeySym* keysym,
42+ Status* status)
43+{
44+ return XLookupNone;
45+}
46+
47+char *
48+XGetICValues( XIC ic, ...)
49+{
50+ return (char *) NULL;
51+}
52+
53 XPointer
54 _XimGetLocaleCode ( _Xconst char* encoding_name )
55 {
diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
index 0d7efc7..d614883 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 @@
1Upstream-Status: Pending
2
1There is no extra reply data and if we say not to disgard it, xcb 3There is no extra reply data and if we say not to disgard it, xcb
2throws fatal asserts. 4throws fatal asserts.
3 5
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 848beff..60331f6 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1This patch makes the build use its own Xcomposite.h over rather than an 3This patch makes the build use its own Xcomposite.h over rather than an
2older Xcomposite.h that might already be installed in the staging dir. 4older Xcomposite.h that might already be installed in the staging dir.
3 5
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 90bded6..b3c58af 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 @@
1Upstream-Status: Pending
2
1--- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200 3--- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200
2+++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200 4+++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200
3@@ -695,6 +695,11 @@ 5@@ -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 197da07..0000000
--- a/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 556a351de83fc6f401b02213dae95731553c216d Mon Sep 17 00:00:00 2001
2From: Loïc Minier <lool@dooz.org>
3Date: Mon, 24 Mar 2008 19:38:27 +0000
4Subject: Bug #10489: Don't retry unix socket connect()s on ENOENT.
5
6If the socket isn't there, it's not gonna magically appear. Either it's
7a server socket and you should have just waited for the SIGUSR1 from the
8server, or it's a stale reference to an ICE socket.
9
10However, do retry once, so fallback from abstract to filesystem namespace
11works.
12
13Originally Debian bug #385976.
14---
15diff --git a/Xtranssock.c b/Xtranssock.c
16index 8a7d2ec..da4afe9 100644
17--- a/Xtranssock.c
18+++ b/Xtranssock.c
19@@ -2146,8 +2146,13 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
20 errno = olderrno;
21
22 /*
23- * If the error was ENOENT, the server may be starting up
24- * and we should try again.
25+ * If the error was ENOENT, the server may be starting up; we used
26+ * to suggest to try again in this case with
27+ * TRANS_TRY_CONNECT_AGAIN, but this introduced problems for
28+ * processes still referencing stale sockets in their environment.
29+ * Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it
30+ * is suggested that higher level stacks handle retries on their
31+ * level when they face a slow starting server.
32 *
33 * If the error was EWOULDBLOCK or EINPROGRESS then the socket
34 * was non-blocking and we should poll using select
35@@ -2161,14 +2166,14 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
36 else if (olderrno == EINTR)
37 return TRANS_TRY_CONNECT_AGAIN;
38 else if (olderrno == ENOENT) {
39- /*
40- * If opening as abstract socket failed, try again "normally"
41- */
42- if (abstract)
43+ /* If opening as abstract socket failed, try again normally */
44+ if (abstract) {
45 ciptr->transptr->flags &= ~(TRANS_ABSTRACT);
46- return TRANS_TRY_CONNECT_AGAIN;
47- }
48- else {
49+ return TRANS_TRY_CONNECT_AGAIN;
50+ } else {
51+ return TRANS_CONNECT_FAILED;
52+ }
53+ } else {
54 PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n",
55 EGET(),0, 0);
56
57--
58cgit 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 0c85cb0..ff8cb25 100644
--- a/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
+++ b/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1Add missing length fields to the replies. Without these, sanity checking in recent X 3Add missing length fields to the replies. Without these, sanity checking in recent X
2breaks things. 4breaks things.
3 5
diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
index b979f57..59a0b1f 100644
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
+++ b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1--- a/Makefile 2010-07-20 18:51:32.000000000 +0800 3--- a/Makefile 2010-07-20 18:51:32.000000000 +0800
2+++ b/Makefile 2010-07-20 18:54:54.000000000 +0800 4+++ b/Makefile 2010-07-20 18:54:54.000000000 +0800
3@@ -4,7 +4,8 @@ 5@@ -4,7 +4,8 @@
diff --git a/meta/recipes-kernel/oprofile/oprofile/opstart.patch b/meta/recipes-kernel/oprofile/oprofile/opstart.patch
index d61c300..c588deb 100644
--- a/meta/recipes-kernel/oprofile/oprofile/opstart.patch
+++ b/meta/recipes-kernel/oprofile/oprofile/opstart.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1Index: oprofile/utils/Makefile.am 3Index: oprofile/utils/Makefile.am
2=================================================================== 4===================================================================
3--- oprofile.orig/utils/Makefile.am 2005-03-31 18:20:41.000000000 +0100 5--- oprofile.orig/utils/Makefile.am 2005-03-31 18:20:41.000000000 +0100
diff --git a/meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch b/meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch
deleted file mode 100644
index e5ab3d9..0000000
--- a/meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch
+++ /dev/null
@@ -1,232 +0,0 @@
1Work in Progress- This patch breaks output_symbol_bytes
2---
3 ChangeLog | 9 +++++++++
4 libpp/callgraph_container.cpp | 10 ++++++++--
5 libpp/callgraph_container.h | 14 ++++++++++----
6 libpp/format_output.cpp | 30 +++++++++++++++++++++++++-----
7 libpp/format_output.h | 6 +++---
8 pp/opreport.cpp | 5 +++--
9 pp/opreport_options.cpp | 4 ++--
10 7 files changed, 60 insertions(+), 18 deletions(-)
11
12Index: oprofile1/pp/opreport.cpp
13===================================================================
14--- oprofile1.orig/pp/opreport.cpp 2007-05-24 15:32:20.000000000 +0100
15+++ oprofile1/pp/opreport.cpp 2007-05-24 20:07:14.000000000 +0100
16@@ -555,10 +555,11 @@ int opreport(options::spec const & spec)
17
18 output_diff_symbols(pc1, pc2, multiple_apps);
19 } else if (options::callgraph) {
20- callgraph_container cg_container;
21+ callgraph_container cg_container(options::debug_info,
22+ options::details);
23 cg_container.populate(options::archive_path, iprofiles,
24 options::extra_found_images,
25- options::debug_info, options::threshold,
26+ options::threshold,
27 options::merge_by.lib, options::symbol_filter);
28
29 output_cg_symbols(cg_container, multiple_apps);
30Index: oprofile1/ChangeLog
31===================================================================
32--- oprofile1.orig/ChangeLog 2007-05-24 18:30:47.000000000 +0100
33+++ oprofile1/ChangeLog 2007-05-24 20:07:14.000000000 +0100
34@@ -1,5 +1,14 @@
35 2007-05-24 Richard Purdie <rpurdie@openedhand.com>
36
37+ * libpp/callgraph_container.cpp:
38+ * libpp/callgraph_container.h:
39+ * libpp/format_output.cpp:
40+ * libpp/format_output.h:
41+ * pp/opreport.cpp:
42+ * pp/opreport_options.cpp: Add callgraph XML detail support
43+
44+2007-05-24 Richard Purdie <rpurdie@openedhand.com>
45+
46 * events/arm/xscale1/events:
47 * events/arm/xscale2/events: Add extra Xscale PMU event definitions
48
49Index: oprofile1/libpp/callgraph_container.cpp
50===================================================================
51--- oprofile1.orig/libpp/callgraph_container.cpp 2007-05-24 15:32:20.000000000 +0100
52+++ oprofile1/libpp/callgraph_container.cpp 2007-05-24 20:07:14.000000000 +0100
53@@ -391,15 +391,21 @@ const symbol_collection & arc_recorder::
54 return cg_syms;
55 }
56
57+callgraph_container::callgraph_container(bool debug_info, bool need_details)
58+ :
59+ pc(debug_info, need_details),
60+ debug_info(debug_info)
61+{
62+}
63+
64
65 void callgraph_container::populate(string const & archive_path,
66 list<inverted_profile> const & iprofiles,
67- extra_images const & extra, bool debug_info, double threshold,
68+ extra_images const & extra, double threshold,
69 bool merge_lib, string_filter const & sym_filter)
70 {
71 // non callgraph samples container, we record sample at symbol level
72 // not at vma level.
73- profile_container pc(debug_info, false);
74
75 list<inverted_profile>::const_iterator it;
76 list<inverted_profile>::const_iterator const end = iprofiles.end();
77Index: oprofile1/libpp/callgraph_container.h
78===================================================================
79--- oprofile1.orig/libpp/callgraph_container.h 2007-05-24 15:32:20.000000000 +0100
80+++ oprofile1/libpp/callgraph_container.h 2007-05-24 20:07:14.000000000 +0100
81@@ -19,8 +19,8 @@
82 #include "symbol.h"
83 #include "symbol_functors.h"
84 #include "string_filter.h"
85+#include "profile_container.h"
86
87-class profile_container;
88 class inverted_profile;
89 class profile_t;
90 class extra_images;
91@@ -103,6 +103,8 @@ private:
92 */
93 class callgraph_container {
94 public:
95+ callgraph_container(bool debug_info, bool need_details);
96+
97 /**
98 * Populate the container, must be called once only.
99 * @param archive_path oparchive prefix path
100@@ -118,9 +120,8 @@ public:
101 */
102 void populate(std::string const & archive_path,
103 std::list<inverted_profile> const & iprofiles,
104- extra_images const & extra, bool debug_info,
105- double threshold, bool merge_lib,
106- string_filter const & sym_filter);
107+ extra_images const & extra, double threshold,
108+ bool merge_lib, string_filter const & sym_filter);
109
110 /// return hint on how data must be displayed.
111 column_flags output_hint() const;
112@@ -131,6 +132,9 @@ public:
113 // return all the cg symbols
114 const symbol_collection & get_symbols() const;
115
116+ // profile container callgraph is based on
117+ profile_container pc;
118+
119 private:
120 /**
121 * Record caller/callee for one cg file
122@@ -162,6 +166,8 @@ private:
123 profile_container const & pc, bool debug_info,
124 bool merge_lib);
125
126+ bool debug_info;
127+
128 /// record all main symbols
129 void add_symbols(profile_container const & pc);
130
131Index: oprofile1/pp/opreport_options.cpp
132===================================================================
133--- oprofile1.orig/pp/opreport_options.cpp 2007-05-24 15:32:20.000000000 +0100
134+++ oprofile1/pp/opreport_options.cpp 2007-05-24 20:07:14.000000000 +0100
135@@ -165,8 +165,8 @@ void check_options(bool diff)
136
137 if (callgraph) {
138 symbols = true;
139- if (details) {
140- cerr << "--callgraph is incompatible with --details" << endl;
141+ if (details && !xml) {
142+ cerr << "--callgraph is incompatible with --details without --xml" << endl;
143 do_exit = true;
144 }
145
146Index: oprofile1/libpp/format_output.cpp
147===================================================================
148--- oprofile1.orig/libpp/format_output.cpp 2007-05-24 15:32:20.000000000 +0100
149+++ oprofile1/libpp/format_output.cpp 2007-05-24 20:07:14.000000000 +0100
150@@ -594,9 +594,9 @@ xml_formatter::
151 xml_formatter(profile_container const * p,
152 symbol_collection & s)
153 :
154+ need_details(false),
155 profile(p),
156- symbols(s),
157- need_details(false)
158+ symbols(s)
159 {
160 if (profile)
161 counts.total = profile->samples_count();
162@@ -673,8 +673,8 @@ void xml_formatter::output_symbol_data(o
163 if (name.size() > 0 && name[0] != '?') {
164 output_attribute(out, datum, ff_vma, STARTING_ADDR);
165
166- if (need_details)
167- xml_support->output_symbol_bytes(bytes_out, symb, sd_it->second);
168+ //if (need_details)
169+ // xml_support->output_symbol_bytes(bytes_out, symb, sd_it->second);
170 }
171 out << close_element();
172
173@@ -843,7 +843,7 @@ output_attribute(ostream & out, field_da
174 xml_cg_formatter::
175 xml_cg_formatter(callgraph_container const * cg, symbol_collection & s)
176 :
177- xml_formatter(0, s),
178+ xml_formatter(&cg->pc, s),
179 callgraph(cg)
180 {
181 counts.total = callgraph->samples_count();
182@@ -946,6 +946,26 @@ output_symbol(ostream & out,
183
184 out << init_attr(ID_REF, indx);
185
186+ if (need_details) {
187+ ostringstream details;
188+ symbol_details_t & sd = symbol_details[indx];
189+ size_t const detail_lo = sd.index;
190+
191+ string detail_str = output_symbol_details(symb, sd.index, lo, hi);
192+
193+ if (detail_str.size() > 0) {
194+ if (sd.id < 0)
195+ sd.id = indx;
196+ details << detail_str;
197+ }
198+
199+ if (sd.index > detail_lo) {
200+ sd.details = sd.details + details.str();
201+ out << init_attr(DETAIL_LO, detail_lo);
202+ out << init_attr(DETAIL_HI, sd.index-1);
203+ }
204+ }
205+
206 out << close_element(NONE, true);
207
208 out << open_element(CALLERS);
209Index: oprofile1/libpp/format_output.h
210===================================================================
211--- oprofile1.orig/libpp/format_output.h 2007-05-24 15:32:20.000000000 +0100
212+++ oprofile1/libpp/format_output.h 2007-05-24 20:07:14.000000000 +0100
213@@ -249,6 +249,9 @@ public:
214 // output SymbolData XML elements
215 void output_symbol_data(std::ostream & out);
216
217+ /// true if we need to show details for each symbols
218+ bool need_details;
219+
220 private:
221 /// container we work from
222 profile_container const * profile;
223@@ -256,9 +259,6 @@ private:
224 // ordered collection of symbols associated with this profile
225 symbol_collection & symbols;
226
227- /// true if we need to show details for each symbols
228- bool need_details;
229-
230 // count of DetailData items output so far
231 size_t detail_count;
232
diff --git a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch b/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
index e837765..ae4cf5d 100644
--- a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
+++ b/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [this patch is 1.13 specific and 2.0 will be coming.]
2
1Running PowerTop in Poky in dump mode (with --dump) always ends with a 3Running PowerTop in Poky in dump mode (with --dump) always ends with a
2segmentation fault. 4segmentation fault.
3 5
diff --git a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
index e06f029..baf06d6 100644
--- a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
+++ b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1Index: settings-daemon/settings-daemon.c 3Index: settings-daemon/settings-daemon.c
2=================================================================== 4===================================================================
3--- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100 5--- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100
diff --git a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
index 5fd96d4..5943744 100644
--- a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
+++ b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1after gcc linking has changed, all the libraries must be explicitely specified to for linking. 3after gcc linking has changed, all the libraries must be explicitely specified to for linking.
2This patch avoids this linking error: 4This patch avoids this linking error:
3 5