diff options
Diffstat (limited to 'meta/recipes-sato/web/web')
-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 |
2 files changed, 0 insertions, 118 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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10 | ||
4 | Fix following build error: | ||
5 | |||
6 | | NOTE: make -j 16 | ||
7 | | Makefile:719: *** missing separator (did you mean TAB instead of 8 spaces?). Stop. | ||
8 | | ERROR: oe_runmake failed | ||
9 | |||
10 | Index: git/Makefile.am | ||
11 | =================================================================== | ||
12 | --- git.orig/Makefile.am | ||
13 | +++ git/Makefile.am | ||
14 | @@ -5,5 +5,5 @@ SUBDIRS = src data | ||
15 | MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing | ||
16 | |||
17 | snapshot: | ||
18 | - $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
19 | + $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
20 | |||
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 @@ | |||
1 | Upstream-Status: Inappropriate [enable feature] | ||
2 | |||
3 | Index: trunk/src/web_main.c | ||
4 | =================================================================== | ||
5 | --- trunk.orig/src/web_main.c 2007-12-18 15:04:13.000000000 -0800 | ||
6 | +++ trunk/src/web_main.c 2010-11-15 11:40:44.762994000 -0800 | ||
7 | @@ -20,6 +20,8 @@ | ||
8 | #include "web_bookmarks.h" | ||
9 | #include "web_request.h" | ||
10 | |||
11 | +#include <libowl/owlwindowmenu.h> | ||
12 | + | ||
13 | static void | ||
14 | copy_cb (GtkWindow *main_window) | ||
15 | { | ||
16 | @@ -833,10 +835,8 @@ | ||
17 | main (int argc, char **argv) | ||
18 | { | ||
19 | GtkWidget *widget; | ||
20 | -#ifdef WITH_HILDON | ||
21 | GList *children, *c; | ||
22 | GtkMenu *menu; | ||
23 | -#endif | ||
24 | WebPages pages; | ||
25 | GConfClient *client; | ||
26 | GModule *module; | ||
27 | @@ -889,33 +889,12 @@ | ||
28 | WEB_API_VERSION, pages.backend->api_version); | ||
29 | pages.backend->init (&(pages.backend_data), &pages); | ||
30 | |||
31 | -#ifdef WITH_HILDON | ||
32 | - osso_initialize ("web", "0.0", FALSE, NULL); | ||
33 | - pages.appview = hildon_appview_new (""); | ||
34 | - pages.window = hildon_app_new_with_appview (pages.appview); | ||
35 | - hildon_app_set_title (pages.window, "Web"); | ||
36 | - gtk_widget_show (pages.appview); | ||
37 | - | ||
38 | - /* Reparent widgets to hildon appview */ | ||
39 | - widget = glade_xml_get_widget (pages.xml, "main_vbox"); | ||
40 | - gtk_container_remove ( | ||
41 | - GTK_CONTAINER (gtk_widget_get_parent (widget)), | ||
42 | - g_object_ref (widget)); | ||
43 | - gtk_container_add (GTK_CONTAINER (pages.appview), widget); | ||
44 | - | ||
45 | - widget = glade_xml_get_widget (pages.xml, "main_toolbar"); | ||
46 | - gtk_container_remove ( | ||
47 | - GTK_CONTAINER (gtk_widget_get_parent (widget)), | ||
48 | - g_object_ref (widget)); | ||
49 | - gtk_box_pack_end (GTK_BOX (pages.appview->vbox), | ||
50 | - widget, TRUE, TRUE, 0); | ||
51 | - gtk_widget_show_all (GTK_WIDGET (pages.appview->vbox)); | ||
52 | - | ||
53 | - gtk_widget_destroy (glade_xml_get_widget (pages.xml, "main_window")); | ||
54 | + pages.window = glade_xml_get_widget (pages.xml, "main_window"); | ||
55 | |||
56 | /* Reparent menu items */ | ||
57 | widget = glade_xml_get_widget (pages.xml, "main_menubar"); | ||
58 | - menu = hildon_appview_get_menu (pages.appview); | ||
59 | + menu = gtk_menu_new (); | ||
60 | + | ||
61 | children = gtk_container_get_children (GTK_CONTAINER (widget)); | ||
62 | for (c = children; c; c = c->next) { | ||
63 | GtkWidget *menuitem = GTK_WIDGET (c->data); | ||
64 | @@ -926,12 +905,6 @@ | ||
65 | gtk_widget_destroy (widget); | ||
66 | g_list_free (children); | ||
67 | |||
68 | - g_signal_connect (G_OBJECT (pages.window), | ||
69 | - "key_press_event", G_CALLBACK (web_key_press_cb), &pages); | ||
70 | -#else | ||
71 | - pages.window = glade_xml_get_widget (pages.xml, "main_window"); | ||
72 | -#endif | ||
73 | - | ||
74 | web_bookmarks_init (&pages); | ||
75 | |||
76 | /* Set history menus */ | ||
77 | @@ -1064,6 +1037,8 @@ | ||
78 | |||
79 | gtk_widget_show (pages.window); | ||
80 | |||
81 | + owl_set_window_menu (GTK_WINDOW(pages.window), GTK_MENU(menu)); | ||
82 | + | ||
83 | gtk_main (); | ||
84 | |||
85 | g_module_close (module); | ||
86 | Index: trunk/src/Makefile.am | ||
87 | =================================================================== | ||
88 | --- trunk.orig/src/Makefile.am 2007-12-18 15:04:13.000000000 -0800 | ||
89 | +++ trunk/src/Makefile.am 2010-11-15 11:41:15.754994000 -0800 | ||
90 | @@ -18,7 +18,7 @@ | ||
91 | web.h web_history.h web_bookmarks.h web_request.h \ | ||
92 | web_utils.h glibcurl.h | ||
93 | |||
94 | -web_LDADD = $(WEB_LIBS) | ||
95 | +web_LDADD = $(WEB_LIBS) -lowl | ||
96 | |||
97 | MAINTAINERCLEANFILES = config.h.in Makefile.in | ||
98 | |||