midori: update to 0.0.17 and add patch to go with the new webkit

* also updated preferred version.

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 28934a7..c2ca9e0 100644 (file)
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -8,6 +8,7 @@ PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_intltool = "0.35.5"
 PREFERRED_VERSION_intltool-native = "0.35.5"
 PREFERRED_VERSION_libtool = "1.5.24"
+PREFERRED_VERSION_midori = "0.0.17"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.10"

diff --git a/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch b/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch
new file mode 100644 (file)
index 0000000..61c6c8a
--- /dev/null
+++ b/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch
@@ -0,0 +1,72 @@
+Index: midori-0.0.17/configure.in
+===================================================================
+--- midori-0.0.17.orig/configure.in    2008-03-10 18:08:54.000000000 +0800
++++ midori-0.0.17/configure.in 2008-03-10 18:10:04.000000000 +0800
+@@ -53,13 +53,13 @@
+ AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version])
+ 
+ # Checks for WebKitGtk
+-PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false)
++PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false)
+ if test "x${have_webkit}" = "xfalse" ; then
+     AC_MSG_ERROR([No WebKitGtk package information found])
+ fi
+ AC_SUBST(WEBKIT_CFLAGS)
+ AC_SUBST(WEBKIT_LIBS)
+-WEBKIT_VER=`pkg-config --modversion WebKitGtk`
++WEBKIT_VER=`pkg-config --modversion webkit-1.0`
+ AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version])
+ 
+ # Checks for libsexy
+Index: midori-0.0.17/src/global.h
+===================================================================
+--- midori-0.0.17.orig/src/global.h    2008-03-10 18:12:25.000000000 +0800
++++ midori-0.0.17/src/global.h 2008-03-10 18:12:29.000000000 +0800
+@@ -16,7 +16,7 @@
+ #include "../katze/katze.h"
+ 
+ #include <gtk/gtk.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ // -- globals
+ 
+Index: midori-0.0.17/src/helpers.c
+===================================================================
+--- midori-0.0.17.orig/src/helpers.c   2008-03-10 18:14:43.000000000 +0800
++++ midori-0.0.17/src/helpers.c        2008-03-10 18:14:59.000000000 +0800
+@@ -16,7 +16,7 @@
+ #include "../katze/katze.h"
+ 
+ #include <string.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ GtkIconTheme* get_icon_theme(GtkWidget* widget)
+ {
+Index: midori-0.0.17/src/webSearch.h
+===================================================================
+--- midori-0.0.17.orig/src/webSearch.h 2008-03-10 18:14:38.000000000 +0800
++++ midori-0.0.17/src/webSearch.h      2008-03-10 18:14:48.000000000 +0800
+@@ -16,7 +16,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <libsexy/sexy.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ // -- Types
+ 
+Index: midori-0.0.17/src/webView.h
+===================================================================
+--- midori-0.0.17.orig/src/webView.h   2008-03-10 18:14:15.000000000 +0800
++++ midori-0.0.17/src/webView.h        2008-03-10 18:14:18.000000000 +0800
+@@ -16,7 +16,7 @@
+ #include "browser.h"
+ #include "debug.h"
+ 
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ WebKitNavigationResponse
+ on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame

diff --git a/packages/gtk-webcore/midori_0.0.17.bb b/packages/gtk-webcore/midori_0.0.17.bb
new file mode 100644 (file)
index 0000000..533d4dd
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.17.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+           file://webkit-pkgconfig.patch;patch=1 \
+          "