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

Fix Gtk+ < 2.13 and GIO build

Browse source
This commit is contained in:
Christian Dywan 2008-07-06 23:47:40 +02:00
parent c796974152
commit 25edd5e13b
5 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.in
View file

@ -38,6 +38,14 @@ if test x"$enable_debug" = x"yes"; then
]) ])
fi fi
# Checks for GIO2
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, have_gio=true, have_gio=false)
if test "x${have_gio}" = "xfalse" ; then
AC_MSG_ERROR([No GIO2 package information found])
fi
AC_SUBST(GIO_CFLAGS)
AC_SUBST(GIO_LIBS)
# Checks for GTK+2 # Checks for GTK+2
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=true, have_gtk=false) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6, have_gtk=true, have_gtk=false)
if test "x${have_gtk}" = "xfalse" ; then if test "x${have_gtk}" = "xfalse" ; then

2
midori/Makefile.am
View file

@ -1,4 +1,5 @@
INCLUDES = \ INCLUDES = \
$(GIO_CFLAGS) \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(WEBKIT_CFLAGS) \ $(WEBKIT_CFLAGS) \
$(LIBSEXY_CFLAGS) \ $(LIBSEXY_CFLAGS) \
@ -7,6 +8,7 @@ INCLUDES = \
AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\" AM_CFLAGS = -DMIDORI_LOCALEDIR=\""$(localedir)"\"
LDADD = \ LDADD = \
$(GIO_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(WEBKIT_LIBS) \ $(WEBKIT_LIBS) \
$(LIBSEXY_LIBS) \ $(LIBSEXY_LIBS) \

6
midori/compat.h
View file

@ -12,7 +12,7 @@
#ifndef __COMPAT_H__ #ifndef __COMPAT_H__
#define __COMPAT_H__ #define __COMPAT_H__
#include "glib.h" #include <glib.h>
#if GLIB_CHECK_VERSION(2, 16, 0) #if GLIB_CHECK_VERSION(2, 16, 0)
#include <gio/gio.h> #include <gio/gio.h>
#endif #endif
@ -22,6 +22,8 @@ G_BEGIN_DECLS
#if !GTK_CHECK_VERSION(2, 14, 0) #if !GTK_CHECK_VERSION(2, 14, 0)
#if GLIB_CHECK_VERSION(2,16, 0)
GdkPixbuf* GdkPixbuf*
gdk_pixbuf_new_from_stream (GInputStream* stream, gdk_pixbuf_new_from_stream (GInputStream* stream,
GCancellable* cancellable, GCancellable* cancellable,
@ -29,6 +31,8 @@ gdk_pixbuf_new_from_stream (GInputStream* stream,
#endif #endif
#endif
#if !GTK_CHECK_VERSION(2, 12, 0) #if !GTK_CHECK_VERSION(2, 12, 0)
void void

2
midori/wscript_build
View file

@ -5,5 +5,5 @@ obj = bld.create_obj ('cc', 'program')
obj.target = 'midori' obj.target = 'midori'
obj.includes = '.. ../katze' obj.includes = '.. ../katze'
obj.find_sources_in_dirs ('.') obj.find_sources_in_dirs ('.')
obj.uselib = 'GTK WEBKIT LIBXML LIBSEXY' obj.uselib = 'GIO GTK WEBKIT LIBXML LIBSEXY'
obj.uselib_local = 'katze' obj.uselib_local = 'katze'

1
wscript
View file

@ -35,6 +35,7 @@ def configure (conf):
nls = 'no' nls = 'no'
conf.check_message_custom ('localization', 'support', nls) conf.check_message_custom ('localization', 'support', nls)
conf.check_pkg ('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=False)
conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True) conf.check_pkg ('gtk+-2.0', destvar='GTK', vnum='2.6.0', mandatory=True)
conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True) conf.check_pkg ('webkit-1.0', destvar='WEBKIT', vnum='0.1', mandatory=True)
conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True) conf.check_pkg ('libxml-2.0', destvar='LIBXML', vnum='2.6', mandatory=True)