Commit 7ce4e113 authored by Christian Persch's avatar Christian Persch

Require gio-2.0

parent 0cc1279c
...@@ -19,7 +19,7 @@ dnl =========================================================================== ...@@ -19,7 +19,7 @@ dnl ===========================================================================
FONTCONFIG_REQUIRED=1.0.1 dnl Same as in Pango, ??? FONTCONFIG_REQUIRED=1.0.1 dnl Same as in Pango, ???
GLIB_REQUIRED=2.12.0 GLIB_REQUIRED=2.12.0
GIO_REQUIRED=2.15.4 GIO_REQUIRED=2.16.0
LIBXML_REQUIRED=2.4.7 LIBXML_REQUIRED=2.4.7
CAIRO_REQUIRED=1.2.0 CAIRO_REQUIRED=1.2.0
PANGOFT2_REQUIRED=1.2.0 PANGOFT2_REQUIRED=1.2.0
...@@ -122,6 +122,7 @@ AC_SUBST(GLIB_MKENUMS) ...@@ -122,6 +122,7 @@ AC_SUBST(GLIB_MKENUMS)
PKG_CHECK_MODULES(LIBRSVG, \ PKG_CHECK_MODULES(LIBRSVG, \
gdk-pixbuf-$GTK_API_VERSION >= $GDK_PIXBUF_REQUIRED \ gdk-pixbuf-$GTK_API_VERSION >= $GDK_PIXBUF_REQUIRED \
glib-2.0 >= $GLIB_REQUIRED \ glib-2.0 >= $GLIB_REQUIRED \
gio-2.0 >= $GIO_REQUIRED \
libxml-2.0 >= $LIBXML_REQUIRED \ libxml-2.0 >= $LIBXML_REQUIRED \
pangoft2 >= $PANGOFT2_REQUIRED \ pangoft2 >= $PANGOFT2_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \ pangocairo >= $PANGOCAIRO_REQUIRED \
...@@ -130,19 +131,6 @@ PKG_CHECK_MODULES(LIBRSVG, \ ...@@ -130,19 +131,6 @@ PKG_CHECK_MODULES(LIBRSVG, \
fontconfig >= $FONTCONFIG_REQUIRED fontconfig >= $FONTCONFIG_REQUIRED
freetype2) freetype2)
test_gio=true
PKG_CHECK_EXISTS(gio-2.0 >= $GIO_REQUIRED, [
PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
LIBRSVG_CFLAGS="$LIBRSVG_CFLAGS $GIO_CFLAGS"
LIBRSVG_LIBS="$LIBRSVG_LIBS $GIO_LIBS"
AC_DEFINE(HAVE_GIO, 1, [Defined if gio is avaiable])
],[
test_gio=false
])
AC_SUBST(LIBRSVG_LIBS)
AC_SUBST(LIBRSVG_CFLAGS)
dnl =========================================================================== dnl ===========================================================================
LIBGSF_CFLAGS="" LIBGSF_CFLAGS=""
...@@ -389,7 +377,6 @@ librsvg-$VERSION for gtk+-$GTK_API_VERSION ...@@ -389,7 +377,6 @@ librsvg-$VERSION for gtk+-$GTK_API_VERSION
Build theme engine: ${enable_gtk_theme} Build theme engine: ${enable_gtk_theme}
Build miscellaenous tools: ${build_misc_tools} Build miscellaenous tools: ${build_misc_tools}
Handle svgz files: ${test_gsf} Handle svgz files: ${test_gsf}
Use GIO: ${test_gio}
Use libcroco for css parsing: ${test_croco} Use libcroco for css parsing: ${test_croco}
" "
......
...@@ -10,6 +10,6 @@ Name: librsvg ...@@ -10,6 +10,6 @@ Name: librsvg
Description: library that renders svg files Description: library that renders svg files
Version: @VERSION@ Version: @VERSION@
Requires: glib-2.0 gdk-pixbuf-@GTK_API_VERSION@ cairo Requires: glib-2.0 gdk-pixbuf-@GTK_API_VERSION@ cairo
Requires.private: Requires.private: gio-2.0
Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@ Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@
...@@ -34,9 +34,7 @@ ...@@ -34,9 +34,7 @@
#include <math.h> #include <math.h>
#include <errno.h> #include <errno.h>
#include "rsvg-css.h" #include "rsvg-css.h"
#ifdef HAVE_GIO
#include <gio/gio.h> #include <gio/gio.h>
#endif
static GByteArray * static GByteArray *
rsvg_acquire_base64_resource (const char *data, GError ** error) rsvg_acquire_base64_resource (const char *data, GError ** error)
...@@ -117,8 +115,6 @@ rsvg_acquire_file_resource (const char *filename, const char *base_uri, GError * ...@@ -117,8 +115,6 @@ rsvg_acquire_file_resource (const char *filename, const char *base_uri, GError *
return array; return array;
} }
#ifdef HAVE_GIO
static GByteArray * static GByteArray *
rsvg_acquire_vfs_resource (const char *filename, const char *base_uri, GError ** error) rsvg_acquire_vfs_resource (const char *filename, const char *base_uri, GError ** error)
{ {
...@@ -162,7 +158,6 @@ rsvg_acquire_vfs_resource (const char *filename, const char *base_uri, GError ** ...@@ -162,7 +158,6 @@ rsvg_acquire_vfs_resource (const char *filename, const char *base_uri, GError **
return array; return array;
} }
#endif
GByteArray * GByteArray *
_rsvg_acquire_xlink_href_resource (const char *href, const char *base_uri, GError ** err) _rsvg_acquire_xlink_href_resource (const char *href, const char *base_uri, GError ** err)
...@@ -178,10 +173,8 @@ _rsvg_acquire_xlink_href_resource (const char *href, const char *base_uri, GErro ...@@ -178,10 +173,8 @@ _rsvg_acquire_xlink_href_resource (const char *href, const char *base_uri, GErro
if (!arr) if (!arr)
arr = rsvg_acquire_file_resource (href, base_uri, NULL); arr = rsvg_acquire_file_resource (href, base_uri, NULL);
#ifdef HAVE_GIO
if (!arr) if (!arr)
arr = rsvg_acquire_vfs_resource (href, base_uri, NULL); arr = rsvg_acquire_vfs_resource (href, base_uri, NULL);
#endif
return arr; return arr;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment