diff options
| -rw-r--r-- | meta/recipes-sato/web/web/fix_makefile.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-sato/web/web/owl-window-menu.patch | 98 | ||||
| -rw-r--r-- | meta/recipes-sato/web/web_git.bb | 28 |
3 files changed, 0 insertions, 146 deletions
diff --git a/meta/recipes-sato/web/web/fix_makefile.patch b/meta/recipes-sato/web/web/fix_makefile.patch deleted file mode 100644 index 3dd3b15928..0000000000 --- a/meta/recipes-sato/web/web/fix_makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ -Upstream-Status: Pending - -Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10 -Fix following build error: - -| NOTE: make -j 16 -| Makefile:719: *** missing separator (did you mean TAB instead of 8 spaces?). Stop. -| ERROR: oe_runmake failed - -Index: git/Makefile.am -=================================================================== ---- git.orig/Makefile.am -+++ git/Makefile.am -@@ -5,5 +5,5 @@ SUBDIRS = src data - MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing - - snapshot: -- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` -+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` - diff --git a/meta/recipes-sato/web/web/owl-window-menu.patch b/meta/recipes-sato/web/web/owl-window-menu.patch deleted file mode 100644 index 1e5916a8fc..0000000000 --- a/meta/recipes-sato/web/web/owl-window-menu.patch +++ /dev/null @@ -1,98 +0,0 @@ -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 -+++ trunk/src/web_main.c 2010-11-15 11:40:44.762994000 -0800 -@@ -20,6 +20,8 @@ - #include "web_bookmarks.h" - #include "web_request.h" - -+#include <libowl/owlwindowmenu.h> -+ - static void - copy_cb (GtkWindow *main_window) - { -@@ -833,10 +835,8 @@ - main (int argc, char **argv) - { - GtkWidget *widget; --#ifdef WITH_HILDON - GList *children, *c; - GtkMenu *menu; --#endif - WebPages pages; - GConfClient *client; - GModule *module; -@@ -889,33 +889,12 @@ - WEB_API_VERSION, pages.backend->api_version); - pages.backend->init (&(pages.backend_data), &pages); - --#ifdef WITH_HILDON -- osso_initialize ("web", "0.0", FALSE, NULL); -- pages.appview = hildon_appview_new (""); -- pages.window = hildon_app_new_with_appview (pages.appview); -- hildon_app_set_title (pages.window, "Web"); -- gtk_widget_show (pages.appview); -- -- /* Reparent widgets to hildon appview */ -- widget = glade_xml_get_widget (pages.xml, "main_vbox"); -- gtk_container_remove ( -- GTK_CONTAINER (gtk_widget_get_parent (widget)), -- g_object_ref (widget)); -- gtk_container_add (GTK_CONTAINER (pages.appview), widget); -- -- widget = glade_xml_get_widget (pages.xml, "main_toolbar"); -- gtk_container_remove ( -- GTK_CONTAINER (gtk_widget_get_parent (widget)), -- g_object_ref (widget)); -- gtk_box_pack_end (GTK_BOX (pages.appview->vbox), -- widget, TRUE, TRUE, 0); -- gtk_widget_show_all (GTK_WIDGET (pages.appview->vbox)); -- -- gtk_widget_destroy (glade_xml_get_widget (pages.xml, "main_window")); -+ pages.window = glade_xml_get_widget (pages.xml, "main_window"); - - /* Reparent menu items */ - widget = glade_xml_get_widget (pages.xml, "main_menubar"); -- menu = hildon_appview_get_menu (pages.appview); -+ menu = gtk_menu_new (); -+ - children = gtk_container_get_children (GTK_CONTAINER (widget)); - for (c = children; c; c = c->next) { - GtkWidget *menuitem = GTK_WIDGET (c->data); -@@ -926,12 +905,6 @@ - gtk_widget_destroy (widget); - g_list_free (children); - -- g_signal_connect (G_OBJECT (pages.window), -- "key_press_event", G_CALLBACK (web_key_press_cb), &pages); --#else -- pages.window = glade_xml_get_widget (pages.xml, "main_window"); --#endif -- - web_bookmarks_init (&pages); - - /* Set history menus */ -@@ -1064,6 +1037,8 @@ - - gtk_widget_show (pages.window); - -+ owl_set_window_menu (GTK_WINDOW(pages.window), GTK_MENU(menu)); -+ - gtk_main (); - - g_module_close (module); -Index: trunk/src/Makefile.am -=================================================================== ---- trunk.orig/src/Makefile.am 2007-12-18 15:04:13.000000000 -0800 -+++ trunk/src/Makefile.am 2010-11-15 11:41:15.754994000 -0800 -@@ -18,7 +18,7 @@ - web.h web_history.h web_bookmarks.h web_request.h \ - web_utils.h glibcurl.h - --web_LDADD = $(WEB_LIBS) -+web_LDADD = $(WEB_LIBS) -lowl - - MAINTAINERCLEANFILES = config.h.in Makefile.in - diff --git a/meta/recipes-sato/web/web_git.bb b/meta/recipes-sato/web/web_git.bb deleted file mode 100644 index ac4810df8e..0000000000 --- a/meta/recipes-sato/web/web_git.bb +++ /dev/null @@ -1,28 +0,0 @@ -LICENSE = "GPLv2" -SECTION = "x11" -DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl" -DESCRIPTION = "Web is a multi-platform web browsing application." -PR = "r0" - -SRCREV = "e9a1c9433b9500feb7e3b9bb135debcea3a3e651" -PV = "0.0+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/web-sato;protocol=git \ - file://owl-window-menu.patch \ - file://fix_makefile.patch \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -S = "${WORKDIR}/git" - -do_unpack_append () { - bb.build.exec_func('do_remove_patches', d) -} - -do_remove_patches () { - rm -rf ${S}/patches -} - -inherit autotools pkgconfig gconf - |