summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-05-12 00:08:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-13 09:29:01 (GMT)
commit79031b082b19d726dc166fd11e6a66503cda60f2 (patch)
tree6b28c0fb43847fa01e90e91e02d942256d0bf359 /meta/recipes-sato
parentfc1859ea661d77067774c7fa3c1cbd49cebf90d3 (diff)
downloadpoky-79031b082b19d726dc166fd11e6a66503cda60f2.tar.gz
recipes: Add Upstream-Status to multiple recipes
gtk+: Add Upstream-Status ed: Add Upstream-Status gnome-common: Add Upstream-Status libmatchbox: Add Upstream-Status matchbox-wm: Add Upstream-Status x11vnc: Add Upstream-Status xtscal: Add Upstream-Status eds-dbus: Add Upstream-Status matchbox-desktop: Add Upstream-Status matchbox-keyboard: Add Upstream-Status matchbox-stroke: Add Upstream-Status matchbox-theme-sato: Add Upstream-Status owl-video-widget: Add Upstream-Status beecrypt: Add Upstream-Status gnome-icon-theme: Add Upstream-Status tslib: Add Upstream-Status libowl-av: Add Upstream-Status sato-icon-theme: Add Upstream-Status web-webkit: Add Upstream-Status metacity: Add Upstream-Status apr: Add Upstream-Status gdk-pixbuf: Add Upstream-Status pcmanfm: Add Upstream-Status gpgme: Add Upstream-Status eee-acpi-scripts: Add Upstream-Status libgalago: Add Upstream-Status python-pygtk: Add Upstream-Status gnome-mime-data: Add Upstream-Status clutter: Add Upstream-Status clutter-gtk: Add Upstream-Status tidy: Add Upstream-Status mutter: Add Upstream-Status xcursor-transparent-theme: Add Upstream-Status leafpad: Add Upstream-Status matchbox-config-gtk: Add Upstream-Status contacts: Add Upstream-Status dates: Add Upstream-Status web: Add Upstream-Status webkit: Add Upstream-Status - Also removed empty fix_im.patch apr-util: Add Upstream-Status libcroco: Add Upstream-Status liboil: Add Upstream-Status libxslt: Add Upstream-Status libglade: Add Upstream-Status gnome-terminal: Add Upstream-Status xev: Add Upstream-Status claws-mail: Add Upstream-Status clipboard-manager: Add Upstream-Status epdfview: Add Upstream-Status kf: Add Upstream-Status qemu: Add Upstream-Status clutter-gst: Add Upstream-Status table: Add Upstream-Status matchbox-panel-2: Add Upstream-Status (From OE-Core rev: 10bdb737c2c4c6996fd035849109a1e07580a6b9) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch2
-rw-r--r--meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch2
-rw-r--r--meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch2
-rw-r--r--meta/recipes-sato/eds/eds-dbus/nossl.patch2
-rw-r--r--meta/recipes-sato/eds/eds-dbus/oh-contact.patch2
-rw-r--r--meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch2
-rw-r--r--meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch2
-rw-r--r--meta/recipes-sato/eds/eds-dbus/parallelmake.patch2
-rw-r--r--meta/recipes-sato/leafpad/files/owl-menu.patch2
-rw-r--r--meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch2
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch2
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch2
-rw-r--r--meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch2
-rw-r--r--meta/recipes-sato/matchbox-keyboard/files/single-instance.patch1
-rw-r--r--meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch2
-rw-r--r--meta/recipes-sato/matchbox-panel-2/startup_fix.diff2
-rw-r--r--meta/recipes-sato/matchbox-stroke/files/configure_fix.patch2
-rw-r--r--meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch1
-rw-r--r--meta/recipes-sato/matchbox-stroke/files/single-instance.patch1
-rw-r--r--meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch2
-rw-r--r--meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch2
-rw-r--r--meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch2
-rw-r--r--meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch2
-rw-r--r--meta/recipes-sato/owl-video-widget/owl-video/make-382.patch2
-rw-r--r--meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch2
-rw-r--r--meta/recipes-sato/pcmanfm/files/owl-window-menu.patch2
-rw-r--r--meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch2
-rw-r--r--meta/recipes-sato/pimlico/contacts/make-382.patch2
-rw-r--r--meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch2
-rw-r--r--meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch2
-rw-r--r--meta/recipes-sato/pimlico/dates/make-382.patch2
-rw-r--r--meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch2
-rw-r--r--meta/recipes-sato/web/web-webkit/link-with-g++.patch3
-rw-r--r--meta/recipes-sato/web/web-webkit/make-382.patch2
-rw-r--r--meta/recipes-sato/web/web/owl-window-menu.patch2
-rw-r--r--meta/recipes-sato/webkit/files/fix_im.patch0
-rw-r--r--meta/recipes-sato/webkit/files/nodolt.patch3
37 files changed, 71 insertions, 0 deletions
diff --git a/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch b/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
index 4a034b6..493b70d 100644
--- a/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
+++ b/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: trunk/configure.in 3Index: trunk/configure.in
2=================================================================== 4===================================================================
3--- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000 5--- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000
diff --git a/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch b/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
index e5c0f51..fd83b57 100644
--- a/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
+++ b/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: addressbook/libedata-book/ximian-vcard.h 3Index: addressbook/libedata-book/ximian-vcard.h
2=================================================================== 4===================================================================
3--- addressbook/libedata-book/ximian-vcard.h (revision 578) 5--- addressbook/libedata-book/ximian-vcard.h (revision 578)
diff --git a/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch b/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch
index d34cc55..22c293d 100644
--- a/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch
+++ b/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch
@@ -5,6 +5,8 @@ the data base if not exist, but use it without proper initialization.
5 5
6This patch fix it. 6This patch fix it.
7 7
8Upstream-Status: Submitted
9
8Signed-off-by: Edwin Zhai <edwin.zhai@intel.com> 10Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
9Index: git/addressbook/backends/file/e-book-backend-file.c 11Index: git/addressbook/backends/file/e-book-backend-file.c
10=================================================================== 12===================================================================
diff --git a/meta/recipes-sato/eds/eds-dbus/nossl.patch b/meta/recipes-sato/eds/eds-dbus/nossl.patch
index 30568ff..67b6d07 100644
--- a/meta/recipes-sato/eds/eds-dbus/nossl.patch
+++ b/meta/recipes-sato/eds/eds-dbus/nossl.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [disable feature]
2
1Index: git/camel/Makefile.am 3Index: git/camel/Makefile.am
2=================================================================== 4===================================================================
3--- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000 5--- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000
diff --git a/meta/recipes-sato/eds/eds-dbus/oh-contact.patch b/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
index fdd7e4b..9817991 100644
--- a/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
+++ b/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: addressbook/libedata-book/ximian-vcard.h 3Index: addressbook/libedata-book/ximian-vcard.h
2=================================================================== 4===================================================================
3--- addressbook/libedata-book/ximian-vcard.h.orig 2010-02-05 14:57:14.000000000 +0000 5--- addressbook/libedata-book/ximian-vcard.h.orig 2010-02-05 14:57:14.000000000 +0000
diff --git a/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch b/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
index 8b600698..7ef2956 100644
--- a/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
+++ b/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
@@ -3,6 +3,8 @@ This avoid build error due to defination missing.
3 3
4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
5 5
6Upstream-Status: Inappropriate [configuration]
7
6Index: git/configure.ac 8Index: git/configure.ac
7=================================================================== 9===================================================================
8--- git.orig/configure.ac 2010-12-16 10:25:24.000000000 +0800 10--- git.orig/configure.ac 2010-12-16 10:25:24.000000000 +0800
diff --git a/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch b/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
index 128307a..d9b0940 100644
--- a/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
+++ b/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [disable feature]
2
1Index: git/camel/providers/Makefile.am 3Index: git/camel/providers/Makefile.am
2=================================================================== 4===================================================================
3--- git.orig/camel/providers/Makefile.am 2010-07-06 18:49:34.000000000 +0800 5--- git.orig/camel/providers/Makefile.am 2010-07-06 18:49:34.000000000 +0800
diff --git a/meta/recipes-sato/eds/eds-dbus/parallelmake.patch b/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
index 08cfac0..ee004a9 100644
--- a/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
+++ b/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
@@ -4,6 +4,8 @@ commit 6118d5891fee776a087855c335a73c79fdaf036c
4 4
5RP 16/3/10 5RP 16/3/10
6 6
7Upstream-Status: Pending
8
7Index: git/git.mk 9Index: git/git.mk
8=================================================================== 10===================================================================
9--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000 11--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000
diff --git a/meta/recipes-sato/leafpad/files/owl-menu.patch b/meta/recipes-sato/leafpad/files/owl-menu.patch
index acfc880..2ebf74a 100644
--- a/meta/recipes-sato/leafpad/files/owl-menu.patch
+++ b/meta/recipes-sato/leafpad/files/owl-menu.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [enable feature]
2
1--- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100 3--- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100
2+++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100 4+++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100
3@@ -152,7 +152,7 @@ 5@@ -152,7 +152,7 @@
diff --git a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
index 9ab51ec..8256949 100644
--- a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
+++ b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: appearance/mb-appearance.c 3Index: appearance/mb-appearance.c
2=================================================================== 4===================================================================
3--- appearance/mb-appearance.c (revision 1614) 5--- appearance/mb-appearance.c (revision 1614)
diff --git a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
index 54f3670..0edb55e 100644
--- a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
+++ b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
@@ -11,6 +11,8 @@ This patch avoids this linking error:
11Nitin A Kamble <nitin.a.kamble@intel.com> 11Nitin A Kamble <nitin.a.kamble@intel.com>
12Date: 2011/01/11 12Date: 2011/01/11
13 13
14Upstream-Status: Pending
15
14Index: matchbox-desktop-2/configure.ac 16Index: matchbox-desktop-2/configure.ac
15=================================================================== 17===================================================================
16--- matchbox-desktop-2.orig/configure.ac 18--- matchbox-desktop-2.orig/configure.ac
diff --git a/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch b/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch
index 87fbd50..8970ac8 100644
--- a/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch
+++ b/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch
@@ -16,6 +16,8 @@ Date: Sun Mar 6 17:58:45 2011 +0800
16 16
17 Signed-off-by: Yu Ke <ke.yu@intel.com> 17 Signed-off-by: Yu Ke <ke.yu@intel.com>
18 18
19Upstream-Status: Pending
20
19diff --git a/src/desktop.c b/src/desktop.c 21diff --git a/src/desktop.c b/src/desktop.c
20index d4fc2fb..5aa2cfc 100644 22index d4fc2fb..5aa2cfc 100644
21--- a/src/desktop.c 23--- a/src/desktop.c
diff --git a/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
index 52cea0e..800bf3b 100644
--- a/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
+++ b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: matchbox-window-manager/configure.ac 3Index: matchbox-window-manager/configure.ac
2=================================================================== 4===================================================================
3--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000 5--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
diff --git a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch b/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
index d0adc47..18b6c41 100644
--- a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
+++ b/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
@@ -9,6 +9,7 @@ on demand.
9 9
10Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 10Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
11 11
12Upstream-Status: Inappropriate [configuration]
12 13
13Index: matchbox-keyboard/matchbox-keyboard.desktop 14Index: matchbox-keyboard/matchbox-keyboard.desktop
14=================================================================== 15===================================================================
diff --git a/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch b/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
index 54ca74d..71a4727 100644
--- a/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
+++ b/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [other] - need clean up
2
1diff -ur git.ORIG/applets/startup/startup.c git/applets/startup/startup.c 3diff -ur git.ORIG/applets/startup/startup.c git/applets/startup/startup.c
2--- git.ORIG/applets/startup/startup.c 2011-04-28 08:13:25.000000000 -0600 4--- git.ORIG/applets/startup/startup.c 2011-04-28 08:13:25.000000000 -0600
3+++ git/applets/startup/startup.c 2011-04-28 09:36:48.521990746 -0600 5+++ git/applets/startup/startup.c 2011-04-28 09:36:48.521990746 -0600
diff --git a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
index 9262d33..d9a0876 100644
--- a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
+++ b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
@@ -2,6 +2,8 @@ Fixed the compile error caused by typo, upstream also need this.
2 2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4 4
5Upstream-Status: Pending
6
5Index: matchbox-panel-2/applets/startup/startup.c 7Index: matchbox-panel-2/applets/startup/startup.c
6=================================================================== 8===================================================================
7--- matchbox-panel-2/applets/startup/startup.c (revision 2109) 9--- matchbox-panel-2/applets/startup/startup.c (revision 2109)
diff --git a/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch b/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
index 52cea0e..800bf3b 100644
--- a/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
+++ b/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: matchbox-window-manager/configure.ac 3Index: matchbox-window-manager/configure.ac
2=================================================================== 4===================================================================
3--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000 5--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
diff --git a/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
index dd45341..cbfa7de 100644
--- a/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
+++ b/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
@@ -13,6 +13,7 @@ This patch avoids these linking errors:
13Nitin A Kamble <nitin.a.kamble@intel.com> 13Nitin A Kamble <nitin.a.kamble@intel.com>
14Date: 2011/01/11 14Date: 2011/01/11
15 15
16Upstream-Status: Pending
16 17
17Index: matchbox-stroke/configure.ac 18Index: matchbox-stroke/configure.ac
18=================================================================== 19===================================================================
diff --git a/meta/recipes-sato/matchbox-stroke/files/single-instance.patch b/meta/recipes-sato/matchbox-stroke/files/single-instance.patch
index f4fec07..239aadb 100644
--- a/meta/recipes-sato/matchbox-stroke/files/single-instance.patch
+++ b/meta/recipes-sato/matchbox-stroke/files/single-instance.patch
@@ -6,6 +6,7 @@ in matchbox-desktop.
6 6
7Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 7Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
8 8
9Upstream-Status: Inappropriate [configuration]
9 10
10Index: matchbox-stroke/matchbox-stroke.desktop 11Index: matchbox-stroke/matchbox-stroke.desktop
11=================================================================== 12===================================================================
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch
index b12e920..d8f264f 100644
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch
@@ -2,6 +2,8 @@ Background Image name was changed from background.png to template.png
2 2
3Signed-off-by: Saul Wold <sgw@linux.intel.com> 3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4 4
5Upstream-Status: Pending
6
5Index: matchbox-sato/Sato/matchbox2/Makefile.am 7Index: matchbox-sato/Sato/matchbox2/Makefile.am
6=================================================================== 8===================================================================
7--- matchbox-sato.orig/Sato/matchbox2/Makefile.am 2010-12-29 13:08:43.000000000 -0800 9--- matchbox-sato.orig/Sato/matchbox2/Makefile.am 2010-12-29 13:08:43.000000000 -0800
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch b/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
index cc09587..5bc279a 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
+++ b/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
@@ -9,6 +9,8 @@ We will revisit it in next period.
9 9
10Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> 10Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
11 11
12Upstream-Status: Pending
13
12diff -ruN libowl-av-orig/libowl-av/owl-tag-reader.c libowl-av/libowl-av/owl-tag-reader.c 14diff -ruN libowl-av-orig/libowl-av/owl-tag-reader.c libowl-av/libowl-av/owl-tag-reader.c
13--- libowl-av-orig/libowl-av/owl-tag-reader.c 2010-10-12 14:30:26.000000000 +0800 15--- libowl-av-orig/libowl-av/owl-tag-reader.c 2010-10-12 14:30:26.000000000 +0800
14+++ libowl-av/libowl-av/owl-tag-reader.c 2010-10-12 14:32:39.000000000 +0800 16+++ libowl-av/libowl-av/owl-tag-reader.c 2010-10-12 14:32:39.000000000 +0800
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch b/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
index 6ba37fb..a8be781 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
+++ b/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: libowl-av/Makefile.am 3Index: libowl-av/Makefile.am
2=================================================================== 4===================================================================
3--- libowl-av.orig/Makefile.am 5--- libowl-av.orig/Makefile.am
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch b/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
index e153c5e..437f72b 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
+++ b/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
@@ -7,6 +7,8 @@ multi-thread operation.
7 7
8Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> 8Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
9 9
10Upstream-Status: Pending
11
10diff -ruN video-orig/src/video.c video/src/video.c 12diff -ruN video-orig/src/video.c video/src/video.c
11--- video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800 13--- video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800
12+++ video/src/video.c 2010-10-15 16:25:51.780296717 +0800 14+++ video/src/video.c 2010-10-15 16:25:51.780296717 +0800
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch b/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
index 7d8aff7..d219c31 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
+++ b/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
@@ -2,6 +2,8 @@ Make 3.82 is much stricter and demands tabs. Obey.
2 2
3JL - 15/12/10 3JL - 15/12/10
4 4
5Upstream-Status: Inappropriate [configuration]
6
5Index: video/Makefile.am 7Index: video/Makefile.am
6=================================================================== 8===================================================================
7--- video.orig/Makefile.am 9--- video.orig/Makefile.am
diff --git a/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch b/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
index 2f654a5..0118081 100644
--- a/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
+++ b/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
@@ -4,6 +4,8 @@ remove it to work aound this issue.
4 4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6 6
7Upstream-Status: Inappropriate [embedded specific]
8
7Index: pcmanfm-0.9.7/data/ui/Makefile.am 9Index: pcmanfm-0.9.7/data/ui/Makefile.am
8=================================================================== 10===================================================================
9--- pcmanfm-0.9.7.orig/data/ui/Makefile.am 2010-07-29 15:10:18.000000000 +0800 11--- pcmanfm-0.9.7.orig/data/ui/Makefile.am 2010-07-29 15:10:18.000000000 +0800
diff --git a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
index f3d4e61..0826a16 100644
--- a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
+++ b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
@@ -3,6 +3,8 @@ enable owl menu
3 3
4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
5 5
6Upstream-Status: Inappropriate [enable feature]
7
6Index: pcmanfm-0.9.7/configure.ac 8Index: pcmanfm-0.9.7/configure.ac
7=================================================================== 9===================================================================
8--- pcmanfm-0.9.7.orig/configure.ac 2010-07-27 10:28:12.000000000 +0800 10--- pcmanfm-0.9.7.orig/configure.ac 2010-07-27 10:28:12.000000000 +0800
diff --git a/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
index 4b9238b..5323876 100644
--- a/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
+++ b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [enable feature]
2
1Index: contacts-0.9/src/contacts-gtk.c 3Index: contacts-0.9/src/contacts-gtk.c
2=================================================================== 4===================================================================
3--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100 5--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100
diff --git a/meta/recipes-sato/pimlico/contacts/make-382.patch b/meta/recipes-sato/pimlico/contacts/make-382.patch
index f85d6b2..a7cfee3 100644
--- a/meta/recipes-sato/pimlico/contacts/make-382.patch
+++ b/meta/recipes-sato/pimlico/contacts/make-382.patch
@@ -2,6 +2,8 @@ Fix for stricter parser in make 3.82. This fix has been pushed to upstream git.
2 2
3JL - 15/12/10 3JL - 15/12/10
4 4
5Upstream-Status: Accepted
6
5Index: git/Makefile.am 7Index: git/Makefile.am
6=================================================================== 8===================================================================
7--- git.orig/Makefile.am 9--- git.orig/Makefile.am
diff --git a/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
index d590165..714623e 100644
--- a/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
+++ b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
@@ -4,6 +4,8 @@
4 src/dates_platform.h | 2 +- 4 src/dates_platform.h | 2 +-
5 3 files changed, 7 insertions(+), 7 deletions(-) 5 3 files changed, 7 insertions(+), 7 deletions(-)
6 6
7Upstream-Status: Inappropriate [enable feature]
8
7Index: git/src/dates_gtk.c 9Index: git/src/dates_gtk.c
8=================================================================== 10===================================================================
9--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100 11--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
diff --git a/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch b/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
index 07a0264..eccc782 100644
--- a/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
+++ b/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
@@ -30,6 +30,8 @@ file, libtool should have added these needed libraries in there.
30Nitin A Kamble <nitin.a.kamble@intel.com> 30Nitin A Kamble <nitin.a.kamble@intel.com>
31Date: 2011/01/19 31Date: 2011/01/19
32 32
33Upstream-Status: Pending
34
33Index: git/src/Makefile.am 35Index: git/src/Makefile.am
34=================================================================== 36===================================================================
35--- git.orig/src/Makefile.am 37--- git.orig/src/Makefile.am
diff --git a/meta/recipes-sato/pimlico/dates/make-382.patch b/meta/recipes-sato/pimlico/dates/make-382.patch
index 9147361..fad3c58 100644
--- a/meta/recipes-sato/pimlico/dates/make-382.patch
+++ b/meta/recipes-sato/pimlico/dates/make-382.patch
@@ -3,6 +3,8 @@ in upstream git.
3 3
4JL - 15/12/10 4JL - 15/12/10
5 5
6Upstream-Status: Accepted
7
6Index: git/Makefile.am 8Index: git/Makefile.am
7=================================================================== 9===================================================================
8--- git.orig/Makefile.am 10--- git.orig/Makefile.am
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
index cfa6a0d..b392a93 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
@@ -3,6 +3,8 @@ patch adds an option to allow the path to the tool to be specified.
3 3
4RP - 12/8/10 4RP - 12/8/10
5 5
6Upstream-Status: Pending
7
6Index: sato-icon-theme-0.4.1/configure.ac 8Index: sato-icon-theme-0.4.1/configure.ac
7=================================================================== 9===================================================================
8--- sato-icon-theme-0.4.1.orig/configure.ac 2010-08-12 12:23:25.000000000 +0100 10--- sato-icon-theme-0.4.1.orig/configure.ac 2010-08-12 12:23:25.000000000 +0100
diff --git a/meta/recipes-sato/web/web-webkit/link-with-g++.patch b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
index 50d6e93..e0c6784 100644
--- a/meta/recipes-sato/web/web-webkit/link-with-g++.patch
+++ b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
@@ -3,6 +3,9 @@ linking. The easiest way to achieve this is to add a dummy cpp file.
3This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset. 3This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset.
4 4
5RP - 14/4/08 5RP - 14/4/08
6
7Upstream-Status: Inappropriate [configuration]
8
6--- webkit.orig/src/Makefile.am 9--- webkit.orig/src/Makefile.am
7+++ webkit/src/Makefile.am 10+++ webkit/src/Makefile.am
8@@ -1,11 +1,11 @@ 11@@ -1,11 +1,11 @@
diff --git a/meta/recipes-sato/web/web-webkit/make-382.patch b/meta/recipes-sato/web/web-webkit/make-382.patch
index 253743d..3689435 100644
--- a/meta/recipes-sato/web/web-webkit/make-382.patch
+++ b/meta/recipes-sato/web/web-webkit/make-382.patch
@@ -2,6 +2,8 @@ Make 3.82 does not allow 8 spaces instead of a tab
2 2
3JL - 15/12/10 3JL - 15/12/10
4 4
5Upstream-Status: Inappropriate [configuration]
6
5Index: webkit/Makefile.am 7Index: webkit/Makefile.am
6=================================================================== 8===================================================================
7--- webkit.orig/Makefile.am 9--- webkit.orig/Makefile.am
diff --git a/meta/recipes-sato/web/web/owl-window-menu.patch b/meta/recipes-sato/web/web/owl-window-menu.patch
index 8b46c32..1e5916a 100644
--- a/meta/recipes-sato/web/web/owl-window-menu.patch
+++ b/meta/recipes-sato/web/web/owl-window-menu.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Inappropriate [enable feature]
2
1Index: trunk/src/web_main.c 3Index: trunk/src/web_main.c
2=================================================================== 4===================================================================
3--- trunk.orig/src/web_main.c 2007-12-18 15:04:13.000000000 -0800 5--- trunk.orig/src/web_main.c 2007-12-18 15:04:13.000000000 -0800
diff --git a/meta/recipes-sato/webkit/files/fix_im.patch b/meta/recipes-sato/webkit/files/fix_im.patch
deleted file mode 100644
index e69de29..0000000
--- a/meta/recipes-sato/webkit/files/fix_im.patch
+++ /dev/null
diff --git a/meta/recipes-sato/webkit/files/nodolt.patch b/meta/recipes-sato/webkit/files/nodolt.patch
index 5331367..e713e8b 100644
--- a/meta/recipes-sato/webkit/files/nodolt.patch
+++ b/meta/recipes-sato/webkit/files/nodolt.patch
@@ -1,6 +1,9 @@
1Dolt cause build error on some platform, so disable it. 1Dolt cause build error on some platform, so disable it.
2 2
3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> 3Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
4
5Upstream-Status: Inappropriate [configuration]
6
4Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac 7Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac
5=================================================================== 8===================================================================
6--- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800 9--- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800