From 79031b082b19d726dc166fd11e6a66503cda60f2 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Thu, 12 May 2011 08:08:05 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch | 2 ++ meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch | 2 ++ meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch | 2 ++ meta/recipes-sato/eds/eds-dbus/nossl.patch | 2 ++ meta/recipes-sato/eds/eds-dbus/oh-contact.patch | 2 ++ meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch | 2 ++ meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch | 2 ++ meta/recipes-sato/eds/eds-dbus/parallelmake.patch | 2 ++ meta/recipes-sato/leafpad/files/owl-menu.patch | 2 ++ meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch | 2 ++ .../matchbox-desktop/files/dso_linking_change_build_fix.patch | 2 ++ meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch | 2 ++ meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch | 2 ++ meta/recipes-sato/matchbox-keyboard/files/single-instance.patch | 1 + meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch | 2 ++ meta/recipes-sato/matchbox-panel-2/startup_fix.diff | 2 ++ meta/recipes-sato/matchbox-stroke/files/configure_fix.patch | 2 ++ .../matchbox-stroke/files/dso_linking_change_build_fix.patch | 1 + meta/recipes-sato/matchbox-stroke/files/single-instance.patch | 1 + .../matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch | 2 ++ meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch | 2 ++ meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch | 2 ++ .../recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch | 2 ++ meta/recipes-sato/owl-video-widget/owl-video/make-382.patch | 2 ++ meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch | 2 ++ meta/recipes-sato/pcmanfm/files/owl-window-menu.patch | 2 ++ meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch | 2 ++ meta/recipes-sato/pimlico/contacts/make-382.patch | 2 ++ meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch | 2 ++ meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch | 2 ++ meta/recipes-sato/pimlico/dates/make-382.patch | 2 ++ .../recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch | 2 ++ meta/recipes-sato/web/web-webkit/link-with-g++.patch | 3 +++ meta/recipes-sato/web/web-webkit/make-382.patch | 2 ++ meta/recipes-sato/web/web/owl-window-menu.patch | 2 ++ meta/recipes-sato/webkit/files/fix_im.patch | 0 meta/recipes-sato/webkit/files/nodolt.patch | 3 +++ 37 files changed, 71 insertions(+) delete mode 100644 meta/recipes-sato/webkit/files/fix_im.patch (limited to 'meta/recipes-sato') 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 4a034b6c58..493b70df1f 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 @@ +Upstream-Status: Inappropriate [configuration] + Index: trunk/configure.in =================================================================== --- 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 e5c0f51840..fd83b57cb8 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 @@ +Upstream-Status: Inappropriate [configuration] + Index: addressbook/libedata-book/ximian-vcard.h =================================================================== --- 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 d34cc551f1..22c293ddab 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. This patch fix it. +Upstream-Status: Submitted + Signed-off-by: Edwin Zhai Index: git/addressbook/backends/file/e-book-backend-file.c =================================================================== diff --git a/meta/recipes-sato/eds/eds-dbus/nossl.patch b/meta/recipes-sato/eds/eds-dbus/nossl.patch index 30568ff075..67b6d071e0 100644 --- a/meta/recipes-sato/eds/eds-dbus/nossl.patch +++ b/meta/recipes-sato/eds/eds-dbus/nossl.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [disable feature] + Index: git/camel/Makefile.am =================================================================== --- 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 fdd7e4bdfb..9817991de3 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 @@ +Upstream-Status: Inappropriate [configuration] + Index: addressbook/libedata-book/ximian-vcard.h =================================================================== --- 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 8b600698bf..7ef2956e37 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. Signed-off-by: Zhai Edwin +Upstream-Status: Inappropriate [configuration] + Index: git/configure.ac =================================================================== --- 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 128307a5f2..d9b094082c 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 @@ +Upstream-Status: Inappropriate [disable feature] + Index: git/camel/providers/Makefile.am =================================================================== --- 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 08cfac0d83..ee004a9539 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 RP 16/3/10 +Upstream-Status: Pending + Index: git/git.mk =================================================================== --- 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 acfc880307..2ebf74a6f7 100644 --- a/meta/recipes-sato/leafpad/files/owl-menu.patch +++ b/meta/recipes-sato/leafpad/files/owl-menu.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [enable feature] + --- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100 +++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100 @@ -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 9ab51ecedc..825694962b 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 @@ +Upstream-Status: Inappropriate [configuration] + Index: appearance/mb-appearance.c =================================================================== --- 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 54f3670e9b..0edb55e081 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: Nitin A Kamble Date: 2011/01/11 +Upstream-Status: Pending + Index: matchbox-desktop-2/configure.ac =================================================================== --- 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 87fbd50205..8970ac8445 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 Signed-off-by: Yu Ke +Upstream-Status: Pending + diff --git a/src/desktop.c b/src/desktop.c index d4fc2fb..5aa2cfc 100644 --- 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 52cea0e8f7..800bf3b559 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 @@ +Upstream-Status: Inappropriate [configuration] + Index: matchbox-window-manager/configure.ac =================================================================== --- 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 d0adc47f75..18b6c41746 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. Signed-off-by: Zhai Edwin +Upstream-Status: Inappropriate [configuration] Index: matchbox-keyboard/matchbox-keyboard.desktop =================================================================== 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 54ca74d8ce..71a4727391 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 @@ +Upstream-Status: Inappropriate [other] - need clean up + diff -ur git.ORIG/applets/startup/startup.c git/applets/startup/startup.c --- git.ORIG/applets/startup/startup.c 2011-04-28 08:13:25.000000000 -0600 +++ 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 9262d33eae..d9a0876296 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. Signed-off-by: Zhai Edwin +Upstream-Status: Pending + Index: matchbox-panel-2/applets/startup/startup.c =================================================================== --- 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 52cea0e8f7..800bf3b559 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 @@ +Upstream-Status: Inappropriate [configuration] + Index: matchbox-window-manager/configure.ac =================================================================== --- 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 dd45341190..cbfa7dee69 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: Nitin A Kamble Date: 2011/01/11 +Upstream-Status: Pending Index: matchbox-stroke/configure.ac =================================================================== diff --git a/meta/recipes-sato/matchbox-stroke/files/single-instance.patch b/meta/recipes-sato/matchbox-stroke/files/single-instance.patch index f4fec079b5..239aadba58 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. Signed-off-by: Zhai Edwin +Upstream-Status: Inappropriate [configuration] Index: matchbox-stroke/matchbox-stroke.desktop =================================================================== 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 b12e920004..d8f264fc2a 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 Signed-off-by: Saul Wold +Upstream-Status: Pending + Index: matchbox-sato/Sato/matchbox2/Makefile.am =================================================================== --- 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 cc095873f9..5bc279a019 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. Signed-off-by: Dongxiao Xu +Upstream-Status: Pending + diff -ruN libowl-av-orig/libowl-av/owl-tag-reader.c libowl-av/libowl-av/owl-tag-reader.c --- libowl-av-orig/libowl-av/owl-tag-reader.c 2010-10-12 14:30:26.000000000 +0800 +++ 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 6ba37fbb2e..a8be781dc9 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 @@ +Upstream-Status: Inappropriate [configuration] + Index: libowl-av/Makefile.am =================================================================== --- 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 e153c5e3b9..437f72be86 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. Signed-off-by: Dongxiao Xu +Upstream-Status: Pending + diff -ruN video-orig/src/video.c video/src/video.c --- video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800 +++ 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 7d8aff7984..d219c31858 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. JL - 15/12/10 +Upstream-Status: Inappropriate [configuration] + Index: video/Makefile.am =================================================================== --- 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 2f654a5fb6..0118081abf 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. Signed-off-by: Zhai Edwin +Upstream-Status: Inappropriate [embedded specific] + Index: pcmanfm-0.9.7/data/ui/Makefile.am =================================================================== --- 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 f3d4e61a22..0826a16bc2 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 Signed-off-by: Zhai Edwin +Upstream-Status: Inappropriate [enable feature] + Index: pcmanfm-0.9.7/configure.ac =================================================================== --- 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 4b9238b43a..532387667b 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 @@ +Upstream-Status: Inappropriate [enable feature] + Index: contacts-0.9/src/contacts-gtk.c =================================================================== --- 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 f85d6b24fa..a7cfee3a00 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. JL - 15/12/10 +Upstream-Status: Accepted + Index: git/Makefile.am =================================================================== --- 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 d5901658be..714623efe6 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 @@ src/dates_platform.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) +Upstream-Status: Inappropriate [enable feature] + Index: git/src/dates_gtk.c =================================================================== --- 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 07a0264c14..eccc782e4b 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. Nitin A Kamble Date: 2011/01/19 +Upstream-Status: Pending + Index: git/src/Makefile.am =================================================================== --- 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 9147361261..fad3c5826e 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. JL - 15/12/10 +Upstream-Status: Accepted + Index: git/Makefile.am =================================================================== --- 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 cfa6a0dd18..b392a932ae 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. RP - 12/8/10 +Upstream-Status: Pending + Index: sato-icon-theme-0.4.1/configure.ac =================================================================== --- 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 50d6e93792..e0c678457a 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. This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset. RP - 14/4/08 + +Upstream-Status: Inappropriate [configuration] + --- webkit.orig/src/Makefile.am +++ webkit/src/Makefile.am @@ -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 253743d18f..3689435e32 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 JL - 15/12/10 +Upstream-Status: Inappropriate [configuration] + Index: webkit/Makefile.am =================================================================== --- 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 8b46c3256d..1e5916a8fc 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 @@ +Upstream-Status: Inappropriate [enable feature] + Index: trunk/src/web_main.c =================================================================== --- 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 e69de29bb2..0000000000 diff --git a/meta/recipes-sato/webkit/files/nodolt.patch b/meta/recipes-sato/webkit/files/nodolt.patch index 53313671f4..e713e8b5ec 100644 --- a/meta/recipes-sato/webkit/files/nodolt.patch +++ b/meta/recipes-sato/webkit/files/nodolt.patch @@ -1,6 +1,9 @@ Dolt cause build error on some platform, so disable it. Signed-off-by: Zhai Edwin + +Upstream-Status: Inappropriate [configuration] + Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac =================================================================== --- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800 -- cgit v1.2.3-54-g00ecf