aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-05-16 21:12:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 14:38:52 +0100
commitfc626a1badc8260ac8f4d44db5c40a6072d3956c (patch)
tree52455fb5eb4ba58a5afaea6ed794275453821578
parent46ea0444276c67b1489004e959bcf34970cd6c60 (diff)
downloadopenembedded-core-contrib-fc626a1badc8260ac8f4d44db5c40a6072d3956c.tar.gz
Upstream-Status: Update patch upstream-status for libfm, eggdbus, screenshot...
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-rw-r--r--meta/recipes-core/eggdbus/eggdbus/gtk-doc.patch2
-rw-r--r--meta/recipes-core/eggdbus/eggdbus/marshal.patch2
-rw-r--r--meta/recipes-devtools/qemu/qemu-git/enable-i386-linux-user.patch2
-rw-r--r--meta/recipes-devtools/qemu/qemu-git/fix-nogl.patch2
-rw-r--r--meta/recipes-devtools/qemu/qemu-git/linker-flags.patch3
-rw-r--r--meta/recipes-devtools/qemu/qemu-git/no-strip.patch2
-rw-r--r--meta/recipes-devtools/qemu/qemu-git/qemu-git-qemugl-host.patch2
-rw-r--r--meta/recipes-devtools/qemu/qemu-git/qemu-vmware-vga-depth.patch3
-rw-r--r--meta/recipes-devtools/qemu/qemu-git/qemugl-allow-glxcontext-release.patch2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-props.patch2
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch2
-rw-r--r--meta/recipes-sato/screenshot/files/fix_ldadd_order.patch3
-rw-r--r--meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch2
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 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: eggdbus-0.6/docs/eggdbus/Makefile.am
===================================================================
--- 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 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: eggdbus-0.6/src/eggdbus/Makefile.am
===================================================================
--- 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
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- 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 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- 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:
https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
JL - 15/06/10
+
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- 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 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile
===================================================================
--- 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 @@
+Upstream-Status: Inappropriate [other] - qemugl patch need huge changes for upstream
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- 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 @@
# fix VMware VGA driver depth calculation error, which may cause segmentation fault
#
# ktian1, 06/29/2010
+
+Upstream-Status: Pending
+
Index: qemu-0.14.0/console.h
===================================================================
--- 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
target-i386/opengl_exec.c | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/target-i386/opengl_exec.c
===================================================================
--- 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 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: gtk+-2.12.3/gtk/gtkfilechooser.c
===================================================================
--- 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.
JL 28/03/11
josh@linux.intel.com
+Upstream-Status: Inappropriate [configuration]
+
Index: clutter-box2d-0.10.0/clutter-box2d/Makefile.am
===================================================================
--- 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 @@
Fix the ordering of LDADD options to fix a compilation failure.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am
--- screenshot.orig//Makefile.am 2010-06-29 11:55:00.000000000 -0700
+++ 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 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am
--- libfm-0.1.14-orig//src/Makefile.am 2011-04-26 10:01:44.297664993 +0800
+++ libfm-0.1.14/src/Makefile.am 2011-04-26 10:02:10.637665004 +0800