SOURCES: midori-webkit.patch (NEW) - patches for WebKit >= 30885
czarny
czarny at pld-linux.org
Fri Mar 14 21:50:11 CET 2008
Author: czarny Date: Fri Mar 14 20:50:11 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- patches for WebKit >= 30885
---- Files affected:
SOURCES:
midori-webkit.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/midori-webkit.patch
diff -u /dev/null SOURCES/midori-webkit.patch:1.1
--- /dev/null Fri Mar 14 21:50:11 2008
+++ SOURCES/midori-webkit.patch Fri Mar 14 21:50:06 2008
@@ -0,0 +1,167 @@
+diff -urN midori-0.0.17/configure.in midori-0.0.17.new/configure.in
+--- midori-0.0.17/configure.in 2008-01-24 03:47:18.000000000 +0100
++++ midori-0.0.17.new/configure.in 2008-03-14 21:31:11.746945932 +0100
+@@ -53,7 +53,7 @@
+ 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
+diff -urN midori-0.0.17/configure.in~ midori-0.0.17.new/configure.in~
+--- midori-0.0.17/configure.in~ 1970-01-01 01:00:00.000000000 +0100
++++ midori-0.0.17.new/configure.in~ 2008-01-24 03:47:18.000000000 +0100
+@@ -0,0 +1,103 @@
++# Register ourselves to autoconf
++AC_INIT([midori], [0.0.17], [christian at twotoasts.de])
++AC_CONFIG_SRCDIR([src/main.h])
++AC_CONFIG_HEADER([config.h])
++
++AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
++AM_PROG_LIBTOOL
++
++# Checks for programs
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_MAKE_SET
++
++# Checks for header files
++AC_HEADER_STDC
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_C_CONST
++
++# Checks if we want debugging support
++AC_ARG_ENABLE([debug],
++AC_HELP_STRING([--enable-debug=@<:@no/simple/yes@:>@]
++ , [Turn on debugging @<:@default=simple@:>@])
++ , [], [enable_debug=simple])
++AC_MSG_CHECKING([whether to enable debugging support])
++AC_MSG_RESULT([$enable_debug])
++if test x"$enable_debug" = x"simple"; then
++ AC_DEFINE([SOKOKE_DEBUG], 1, [Level of debugging support])
++fi
++if test x"$enable_debug" = x"yes"; then
++ # Check whether the compiler accepts -Wall
++ save_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS -Wall"
++ AC_MSG_CHECKING([whether $CC accepts -Wall])
++ AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
++ AC_MSG_RESULT([yes])
++ ], [
++ AC_MSG_RESULT([no])
++ CFLAGS="$save_CFLAGS"
++ ])
++ AC_DEFINE([SOKOKE_DEBUG], 2, [Level of debugging support])
++fi
++AC_DEFINE_UNQUOTED([SOKOKE_DEBUG_], "$enable_debug", [Debugging?])
++
++# Checks for GTK+2
++PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=true, have_gtk=false)
++if test "x${have_gtk}" = "xfalse" ; then
++ AC_MSG_ERROR([No GTK+2 package information found])
++fi
++AC_SUBST(GTK_CFLAGS)
++AC_SUBST(GTK_LIBS)
++GTK_VER=`pkg-config --modversion gtk+-2.0`
++AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version])
++
++# Checks for WebKitGtk
++PKG_CHECK_MODULES(WEBKIT, WebKitGtk, 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`
++AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version])
++
++# Checks for libsexy
++PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false)
++if test "x${have_libsexy}" = "xfalse" ; then
++ AC_MSG_ERROR([No Libsexy package information found])
++fi
++AC_SUBST(LIBSEXY_CFLAGS)
++AC_SUBST(LIBSEXY_LIBS)
++LIBSEXY_VER=`pkg-config --modversion libsexy`
++AC_DEFINE_UNQUOTED([LIBSEXY_VER], "$LIBSEXY_VER", [Libsexy version])
++
++# Checks for LibXML2
++PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6, have_libxml=true, have_libxml=false)
++if test "x${have_libxml}" = "xfalse" ; then
++ AC_MSG_ERROR([No libXML2 package information found])
++fi
++AC_SUBST(LIBXML_CFLAGS)
++AC_SUBST(LIBXML_LIBS)
++LIBXML_VER=`pkg-config --modversion libxml-2.0`
++AC_DEFINE_UNQUOTED([LIBXML_VER], "$LIBXML_VER", [libXML2 version])
++
++# Here we tell the configure script which files to *create*
++AC_CONFIG_FILES([
++ Makefile \
++ katze/Makefile \
++ src/Makefile
++])
++AC_OUTPUT
++
++# Show us what we have
++echo
++echo " GTK+2 $GTK_VER"
++echo " WebKit $WEBKIT_VER"
++echo " Libsexy $LIBSEXY_VER"
++echo " libXML2 $LIBXML_VER"
++echo " GetText N/A"
++echo
++echo " Debugging $enable_debug"
++echo
++echo " Prefix $prefix"
+diff -urN midori-0.0.17/src/global.h midori-0.0.17.new/src/global.h
+--- midori-0.0.17/src/global.h 2008-01-23 03:13:40.000000000 +0100
++++ midori-0.0.17.new/src/global.h 2008-03-14 21:27:49.078864219 +0100
+@@ -16,7 +16,7 @@
+ #include "../katze/katze.h"
+
+ #include <gtk/gtk.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+
+ // -- globals
+
+diff -urN midori-0.0.17/src/helpers.c midori-0.0.17.new/src/helpers.c
+--- midori-0.0.17/src/helpers.c 2008-01-20 17:46:16.000000000 +0100
++++ midori-0.0.17.new/src/helpers.c 2008-03-14 21:29:01.944748071 +0100
+@@ -16,7 +16,7 @@
+ #include "../katze/katze.h"
+
+ #include <string.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+
+ GtkIconTheme* get_icon_theme(GtkWidget* widget)
+ {
+diff -urN midori-0.0.17/src/webSearch.h midori-0.0.17.new/src/webSearch.h
+--- midori-0.0.17/src/webSearch.h 2007-12-15 04:09:47.000000000 +0100
++++ midori-0.0.17.new/src/webSearch.h 2008-03-14 21:28:42.635693788 +0100
+@@ -16,7 +16,7 @@
+
+ #include <gtk/gtk.h>
+ #include <libsexy/sexy.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+
+ // -- Types
+
+diff -urN midori-0.0.17/src/webView.h midori-0.0.17.new/src/webView.h
+--- midori-0.0.17/src/webView.h 2008-01-04 08:46:44.000000000 +0100
++++ midori-0.0.17.new/src/webView.h 2008-03-14 21:29:25.050223186 +0100
+@@ -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
================================================================
More information about the pld-cvs-commit
mailing list