summaryrefslogtreecommitdiffstats
path: root/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch')
-rw-r--r--meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch99
1 files changed, 99 insertions, 0 deletions
diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch b/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch
new file mode 100644
index 0000000000..18e8a88e25
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch
@@ -0,0 +1,99 @@
1diff -Nurd openmoko-browser2.orig/configure.ac openmoko-browser2/configure.ac
2--- openmoko-browser2.orig/configure.ac 2007-10-02 09:00:38.000000000 +0200
3+++ openmoko-browser2/configure.ac 2008-03-05 12:12:32.954623867 +0100
4@@ -40,7 +40,7 @@
5 # base deps
6 PKG_CHECK_MODULES(OPENMOKO, libmokoui2 >= 0.1.0)
7 PKG_CHECK_MODULES(GTHREAD, gthread-2.0 )
8-PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk)
9+PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0)
10
11 # glib-genmarshal
12 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
13diff -Nurd openmoko-browser2.orig/src/browser-data.h openmoko-browser2/src/browser-data.h
14--- openmoko-browser2.orig/src/browser-data.h 2007-12-12 20:31:07.000000000 +0100
15+++ openmoko-browser2/src/browser-data.h 2008-03-05 12:12:50.497959252 +0100
16@@ -27,7 +27,7 @@
17 #ifndef OPENMOKO_BROWSER_DATA_H
18 #define OPENMOKO_BROWSER_DATA_H
19
20-#include "webkitwebview.h"
21+#include <webkit/webkitwebview.h>
22
23 #include <glib.h>
24 #include <gtk/gtk.h>
25diff -Nurd openmoko-browser2.orig/src/current-page.c openmoko-browser2/src/current-page.c
26--- openmoko-browser2.orig/src/current-page.c 2007-12-12 20:31:07.000000000 +0100
27+++ openmoko-browser2/src/current-page.c 2008-03-05 12:13:56.032884030 +0100
28@@ -28,8 +28,8 @@
29 #include "current-page.h"
30
31 #include <moko-finger-scroll.h>
32-#include <webkitwebframe.h>
33-#include <webkitwebview.h>
34+#include <webkit/webkitwebframe.h>
35+#include <webkit/webkitwebview.h>
36
37 /*
38 * From a list of BrowserPage's in BrowserData::currentPage show
39@@ -42,7 +42,7 @@
40 static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data)
41 {
42 g_return_if_fail (data->currentPage);
43- webkit_web_view_go_backward(data->currentPage->webKitPage);
44+ webkit_web_view_go_back(data->currentPage->webKitPage);
45 }
46
47 static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data)
48@@ -66,7 +66,7 @@
49 g_assert (page == data->currentPage->webKitPage);
50
51 if (prog == 100) {
52- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page));
53+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (page));
54 gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page));
55 gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL);
56 }
57@@ -176,7 +176,7 @@
58 * Update the GtkToolItems
59 */
60 /* XXX ### FIXME TODO check if we should show stop/reload */
61- gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage));
62+ gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (data->currentPage->webKitPage));
63 gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage));
64 gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL);
65 gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE);
66diff -Nurd openmoko-browser2.orig/src/main.c openmoko-browser2/src/main.c
67--- openmoko-browser2.orig/src/main.c 2007-12-12 20:31:07.000000000 +0100
68+++ openmoko-browser2/src/main.c 2008-03-05 12:14:46.337942098 +0100
69@@ -33,7 +33,7 @@
70 #include <gtk/gtk.h>
71 #include <glib/gi18n.h>
72
73-#include <webkit.h>
74+#include <webkit/webkit.h>
75
76 #include <moko-finger-scroll.h>
77 #include <moko-stock.h>
78@@ -55,7 +55,6 @@
79 gdk_threads_init ();
80 gdk_threads_enter ();
81 gtk_init (&argc, &argv);
82- webkit_init ();
83 moko_stock_register ();
84 g_set_application_name (_("Browser"));
85
86diff -Nurd openmoko-browser2.orig/src/open-pages-page.c openmoko-browser2/src/open-pages-page.c
87--- openmoko-browser2.orig/src/open-pages-page.c 2007-12-12 20:31:07.000000000 +0100
88+++ openmoko-browser2/src/open-pages-page.c 2008-03-05 12:13:37.671282983 +0100
89@@ -28,8 +28,8 @@
90 #include "open-pages-page.h"
91 #include "current-page.h"
92
93-#include <webkitwebframe.h>
94-#include <webkitwebview.h>
95+#include <webkit/webkitwebframe.h>
96+#include <webkit/webkitwebview.h>
97 #include <moko-finger-scroll.h>
98
99 #include <glib/gi18n.h>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-20 11:27:01 +0000