diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2011-05-16 21:12:57 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-17 15:14:43 +0100 |
commit | 7a0d252635a348cde789f1802474fa1b644a8fcf (patch) | |
tree | 15a622a053c9d395efa8910585e8b7b5b400f1c7 | |
parent | 2ce14da681aa1fa56e687d16b529bd63622accf2 (diff) | |
download | poky-7a0d252635a348cde789f1802474fa1b644a8fcf.tar.gz |
Upstream-Status: Update patch upstream-status for libfm, eggdbus, screenshot...
(From OE-Core rev: fc626a1badc8260ac8f4d44db5c40a6072d3956c)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
13 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch index 0999a85153..abd7ff4166 100644 --- a/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch +++ b/meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
1 | Index: eggdbus-0.6/docs/eggdbus/Makefile.am | 3 | Index: eggdbus-0.6/docs/eggdbus/Makefile.am |
2 | =================================================================== | 4 | =================================================================== |
3 | --- eggdbus-0.6.orig/docs/eggdbus/Makefile.am | 5 | --- eggdbus-0.6.orig/docs/eggdbus/Makefile.am |
diff --git a/meta/recipes-core/eggdbus/eggdbus/marshal.patch b/meta/recipes-core/eggdbus/eggdbus/marshal.patch index 2b2cb4985b..a605a34c8e 100644 --- a/meta/recipes-core/eggdbus/eggdbus/marshal.patch +++ b/meta/recipes-core/eggdbus/eggdbus/marshal.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
1 | Index: eggdbus-0.6/src/eggdbus/Makefile.am | 3 | Index: eggdbus-0.6/src/eggdbus/Makefile.am |
2 | =================================================================== | 4 | =================================================================== |
3 | --- eggdbus-0.6.orig/src/eggdbus/Makefile.am | 5 | --- eggdbus-0.6.orig/src/eggdbus/Makefile.am |
diff --git a/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch index 3cf0953f10..76ed3a862e 100644 --- a/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch +++ b/meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch | |||
@@ -2,6 +2,8 @@ Enable i386-linux-user | |||
2 | 2 | ||
3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> | 3 | Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> |
4 | 4 | ||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
5 | Index: qemu-0.14.0/Makefile.target | 7 | Index: qemu-0.14.0/Makefile.target |
6 | =================================================================== | 8 | =================================================================== |
7 | --- qemu-0.14.0.orig/Makefile.target | 9 | --- qemu-0.14.0.orig/Makefile.target |
diff --git a/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch b/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch index 0219cc8121..5a65039b81 100644 --- a/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch +++ b/meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
1 | Index: qemu-0.14.0/Makefile.target | 3 | Index: qemu-0.14.0/Makefile.target |
2 | =================================================================== | 4 | =================================================================== |
3 | --- qemu-0.14.0.orig/Makefile.target | 5 | --- qemu-0.14.0.orig/Makefile.target |
diff --git a/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch b/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch index 470cf80cde..4569643a64 100644 --- a/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch +++ b/meta/recipes-devtools/qemu/qemu-git/linker-flags.patch | |||
@@ -7,6 +7,9 @@ More information is available on the Fedora Wiki: | |||
7 | https://fedoraproject.org/wiki/UnderstandingDSOLinkChange | 7 | https://fedoraproject.org/wiki/UnderstandingDSOLinkChange |
8 | 8 | ||
9 | JL - 15/06/10 | 9 | JL - 15/06/10 |
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
10 | Index: qemu-0.14.0/Makefile.target | 13 | Index: qemu-0.14.0/Makefile.target |
11 | =================================================================== | 14 | =================================================================== |
12 | --- qemu-0.14.0.orig/Makefile.target | 15 | --- qemu-0.14.0.orig/Makefile.target |
diff --git a/meta/recipes-devtools/qemu/qemu-git/no-strip.patch b/meta/recipes-devtools/qemu/qemu-git/no-strip.patch index cf0d659724..098070adfc 100644 --- a/meta/recipes-devtools/qemu/qemu-git/no-strip.patch +++ b/meta/recipes-devtools/qemu/qemu-git/no-strip.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
1 | Index: qemu-0.14.0/Makefile | 3 | Index: qemu-0.14.0/Makefile |
2 | =================================================================== | 4 | =================================================================== |
3 | --- qemu-0.14.0.orig/Makefile | 5 | --- qemu-0.14.0.orig/Makefile |
diff --git a/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch b/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch index 92467a7651..bbc9c9eaf9 100644 --- a/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch +++ b/meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [other] - qemugl patch need huge changes for upstream | ||
2 | |||
1 | Index: qemu-0.14.0/Makefile.target | 3 | Index: qemu-0.14.0/Makefile.target |
2 | =================================================================== | 4 | =================================================================== |
3 | --- qemu-0.14.0.orig/Makefile.target | 5 | --- qemu-0.14.0.orig/Makefile.target |
diff --git a/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch b/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch index 42ec98fee5..c4c5424e16 100644 --- a/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch +++ b/meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch | |||
@@ -1,6 +1,9 @@ | |||
1 | # fix VMware VGA driver depth calculation error, which may cause segmentation fault | 1 | # fix VMware VGA driver depth calculation error, which may cause segmentation fault |
2 | # | 2 | # |
3 | # ktian1, 06/29/2010 | 3 | # ktian1, 06/29/2010 |
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
4 | Index: qemu-0.14.0/console.h | 7 | Index: qemu-0.14.0/console.h |
5 | =================================================================== | 8 | =================================================================== |
6 | --- qemu-0.14.0.orig/console.h | 9 | --- qemu-0.14.0.orig/console.h |
diff --git a/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch b/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch index 478b204274..837af5b9b6 100644 --- a/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch +++ b/meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch | |||
@@ -10,6 +10,8 @@ committer Andrzej Zaborowski <andrew.zaborowski@intel.com> Tue, 16 Jun 2009 22:2 | |||
10 | target-i386/opengl_exec.c | 31 ++++++++++++++++--------------- | 10 | target-i386/opengl_exec.c | 31 ++++++++++++++++--------------- |
11 | 1 files changed, 16 insertions(+), 15 deletions(-) | 11 | 1 files changed, 16 insertions(+), 15 deletions(-) |
12 | 12 | ||
13 | Upstream-Status: Inappropriate [configuration] | ||
14 | |||
13 | Index: qemu-0.14.0/target-i386/opengl_exec.c | 15 | Index: qemu-0.14.0/target-i386/opengl_exec.c |
14 | =================================================================== | 16 | =================================================================== |
15 | --- qemu-0.14.0.orig/target-i386/opengl_exec.c | 17 | --- qemu-0.14.0.orig/target-i386/opengl_exec.c |
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch index 7d55f3cbb9..53a089422c 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch +++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [enable feature] | ||
2 | |||
1 | Index: gtk+-2.12.3/gtk/gtkfilechooser.c | 3 | Index: gtk+-2.12.3/gtk/gtkfilechooser.c |
2 | =================================================================== | 4 | =================================================================== |
3 | --- gtk+-2.12.3.orig/gtk/gtkfilechooser.c 2007-12-04 16:52:08.000000000 +0000 | 5 | --- gtk+-2.12.3.orig/gtk/gtkfilechooser.c 2007-12-04 16:52:08.000000000 +0000 |
diff --git a/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch b/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch index cfb50dc703..58f2729209 100644 --- a/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch +++ b/meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch | |||
@@ -6,6 +6,8 @@ introspection is disabled. | |||
6 | JL 28/03/11 | 6 | JL 28/03/11 |
7 | josh@linux.intel.com | 7 | josh@linux.intel.com |
8 | 8 | ||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | |||
9 | Index: clutter-box2d-0.10.0/clutter-box2d/Makefile.am | 11 | Index: clutter-box2d-0.10.0/clutter-box2d/Makefile.am |
10 | =================================================================== | 12 | =================================================================== |
11 | --- clutter-box2d-0.10.0.orig/clutter-box2d/Makefile.am | 13 | --- clutter-box2d-0.10.0.orig/clutter-box2d/Makefile.am |
diff --git a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch index 726d590800..7d9689e893 100644 --- a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch +++ b/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch | |||
@@ -1,6 +1,9 @@ | |||
1 | Fix the ordering of LDADD options to fix a compilation failure. | 1 | Fix the ordering of LDADD options to fix a compilation failure. |
2 | 2 | ||
3 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 3 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
4 | diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am | 7 | diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am |
5 | --- screenshot.orig//Makefile.am 2010-06-29 11:55:00.000000000 -0700 | 8 | --- screenshot.orig//Makefile.am 2010-06-29 11:55:00.000000000 -0700 |
6 | +++ screenshot/Makefile.am 2011-03-01 11:09:01.215813968 -0800 | 9 | +++ screenshot/Makefile.am 2011-03-01 11:09:01.215813968 -0800 |
diff --git a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch b/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch index fade1955e5..79fc9ce3e4 100644 --- a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch +++ b/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
1 | diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am | 3 | diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am |
2 | --- libfm-0.1.14-orig//src/Makefile.am 2011-04-26 10:01:44.297664993 +0800 | 4 | --- libfm-0.1.14-orig//src/Makefile.am 2011-04-26 10:01:44.297664993 +0800 |
3 | +++ libfm-0.1.14/src/Makefile.am 2011-04-26 10:02:10.637665004 +0800 | 5 | +++ libfm-0.1.14/src/Makefile.am 2011-04-26 10:02:10.637665004 +0800 |