debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Build fix: Webkit's header and pkgconfig name have changed.

Browse source
This commit is contained in:
Christian Dywan 2008-02-03 10:51:35 +01:00
parent 65535e1d87
commit 25ac3e9932
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure.in
View file

@ -52,15 +52,15 @@ AC_SUBST(GTK_LIBS)
GTK_VER=`pkg-config --modversion gtk+-2.0` GTK_VER=`pkg-config --modversion gtk+-2.0`
AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version]) AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version])
# Checks for WebKitGtk # Checks for WebKit
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 if test "x${have_webkit}" = "xfalse" ; then
AC_MSG_ERROR([No WebKitGtk package information found]) AC_MSG_ERROR([No WebKit package information found])
fi fi
AC_SUBST(WEBKIT_CFLAGS) AC_SUBST(WEBKIT_CFLAGS)
AC_SUBST(WEBKIT_LIBS) 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]) AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKIT_VER", [WebKit version])
# Checks for libsexy # Checks for libsexy
PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false) PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false)

2
src/global.h
View file

@ -16,7 +16,7 @@
#include "../katze/katze.h" #include "../katze/katze.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <webkit.h> #include <webkit/webkit.h>
// -- globals // -- globals

2
src/helpers.c
View file

@ -16,7 +16,7 @@
#include "../katze/katze.h" #include "../katze/katze.h"
#include <string.h> #include <string.h>
#include <webkit.h> #include <webkit/webkit.h>
GtkIconTheme* get_icon_theme(GtkWidget* widget) GtkIconTheme* get_icon_theme(GtkWidget* widget)
{ {

2
src/main.c
View file

@ -21,7 +21,7 @@
#include <string.h> #include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <webkit.h> #include <webkit/webkit.h>
#include "config.h" #include "config.h"

2
src/webSearch.h
View file

@ -16,7 +16,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libsexy/sexy.h> #include <libsexy/sexy.h>
#include <webkit.h> #include <webkit/webkit.h>
// -- Types // -- Types

2
src/webView.h
View file

@ -16,7 +16,7 @@
#include "browser.h" #include "browser.h"
#include "debug.h" #include "debug.h"
#include <webkit.h> #include <webkit/webkit.h>
WebKitNavigationResponse WebKitNavigationResponse
on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame