From 1d2af678d1af4c5255d18c7f3b1f33aa2eafbdbf Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Mon, 7 Jul 2008 12:04:19 +0000 Subject: Bump midori version --- package/midori/midori-0.0.17-webkit.patch | 67 ------------------------------- package/midori/midori-0.0.18-webkit.patch | 67 +++++++++++++++++++++++++++++++ package/midori/midori.mk | 2 +- 3 files changed, 68 insertions(+), 68 deletions(-) delete mode 100644 package/midori/midori-0.0.17-webkit.patch create mode 100644 package/midori/midori-0.0.18-webkit.patch (limited to 'package') diff --git a/package/midori/midori-0.0.17-webkit.patch b/package/midori/midori-0.0.17-webkit.patch deleted file mode 100644 index 6a5e5ffa5..000000000 --- a/package/midori/midori-0.0.17-webkit.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -rup midori-0.0.17-orig/configure.in midori-0.0.17/configure.in ---- midori-0.0.17-orig/configure.in 2008-01-23 21:47:18.000000000 -0500 -+++ midori-0.0.17/configure.in 2008-02-11 14:11:08.000000000 -0500 -@@ -53,13 +53,13 @@ GTK_VER=`pkg-config --modversion gtk+-2. - 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 -diff -rup midori-0.0.17-orig/src/global.h midori-0.0.17/src/global.h ---- midori-0.0.17-orig/src/global.h 2008-01-22 21:13:40.000000000 -0500 -+++ midori-0.0.17/src/global.h 2008-02-11 14:01:54.000000000 -0500 -@@ -16,7 +16,7 @@ - #include "../katze/katze.h" - - #include --#include -+#include - - // -- globals - -diff -rup midori-0.0.17-orig/src/helpers.c midori-0.0.17/src/helpers.c ---- midori-0.0.17-orig/src/helpers.c 2008-01-20 11:46:16.000000000 -0500 -+++ midori-0.0.17/src/helpers.c 2008-02-11 14:03:57.000000000 -0500 -@@ -16,7 +16,7 @@ - #include "../katze/katze.h" - - #include --#include -+#include - - GtkIconTheme* get_icon_theme(GtkWidget* widget) - { -diff -rup midori-0.0.17-orig/src/webSearch.h midori-0.0.17/src/webSearch.h ---- midori-0.0.17-orig/src/webSearch.h 2007-12-14 22:09:47.000000000 -0500 -+++ midori-0.0.17/src/webSearch.h 2008-02-11 14:03:25.000000000 -0500 -@@ -16,7 +16,7 @@ - - #include - #include --#include -+#include - - // -- Types - -diff -rup midori-0.0.17-orig/src/webView.h midori-0.0.17/src/webView.h ---- midori-0.0.17-orig/src/webView.h 2008-01-04 02:46:44.000000000 -0500 -+++ midori-0.0.17/src/webView.h 2008-02-11 14:02:49.000000000 -0500 -@@ -16,7 +16,7 @@ - #include "browser.h" - #include "debug.h" - --#include -+#include - - WebKitNavigationResponse - on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame diff --git a/package/midori/midori-0.0.18-webkit.patch b/package/midori/midori-0.0.18-webkit.patch new file mode 100644 index 000000000..6a5e5ffa5 --- /dev/null +++ b/package/midori/midori-0.0.18-webkit.patch @@ -0,0 +1,67 @@ +diff -rup midori-0.0.17-orig/configure.in midori-0.0.17/configure.in +--- midori-0.0.17-orig/configure.in 2008-01-23 21:47:18.000000000 -0500 ++++ midori-0.0.17/configure.in 2008-02-11 14:11:08.000000000 -0500 +@@ -53,13 +53,13 @@ GTK_VER=`pkg-config --modversion gtk+-2. + 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 +diff -rup midori-0.0.17-orig/src/global.h midori-0.0.17/src/global.h +--- midori-0.0.17-orig/src/global.h 2008-01-22 21:13:40.000000000 -0500 ++++ midori-0.0.17/src/global.h 2008-02-11 14:01:54.000000000 -0500 +@@ -16,7 +16,7 @@ + #include "../katze/katze.h" + + #include +-#include ++#include + + // -- globals + +diff -rup midori-0.0.17-orig/src/helpers.c midori-0.0.17/src/helpers.c +--- midori-0.0.17-orig/src/helpers.c 2008-01-20 11:46:16.000000000 -0500 ++++ midori-0.0.17/src/helpers.c 2008-02-11 14:03:57.000000000 -0500 +@@ -16,7 +16,7 @@ + #include "../katze/katze.h" + + #include +-#include ++#include + + GtkIconTheme* get_icon_theme(GtkWidget* widget) + { +diff -rup midori-0.0.17-orig/src/webSearch.h midori-0.0.17/src/webSearch.h +--- midori-0.0.17-orig/src/webSearch.h 2007-12-14 22:09:47.000000000 -0500 ++++ midori-0.0.17/src/webSearch.h 2008-02-11 14:03:25.000000000 -0500 +@@ -16,7 +16,7 @@ + + #include + #include +-#include ++#include + + // -- Types + +diff -rup midori-0.0.17-orig/src/webView.h midori-0.0.17/src/webView.h +--- midori-0.0.17-orig/src/webView.h 2008-01-04 02:46:44.000000000 -0500 ++++ midori-0.0.17/src/webView.h 2008-02-11 14:02:49.000000000 -0500 +@@ -16,7 +16,7 @@ + #include "browser.h" + #include "debug.h" + +-#include ++#include + + WebKitNavigationResponse + on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame diff --git a/package/midori/midori.mk b/package/midori/midori.mk index 9db65cf5c..498ae43b3 100644 --- a/package/midori/midori.mk +++ b/package/midori/midori.mk @@ -4,7 +4,7 @@ # ############################################################# -MIDORI_VERSION = 0.0.17 +MIDORI_VERSION = 0.0.18 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.gz MIDORI_SITE = http://software.twotoasts.de/media/midori/ MIDORI_AUTORECONF = YES -- cgit v1.2.3