From 912286f8a198c6aab7f3a79ae1348b80d84f8ce5 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Mon, 8 Feb 2016 09:04:56 +0100 Subject: remove deprecated librsvg/rsvg-cairo.h include Direct include of librsvg/rsvg-cairo.h has been deprecated from 2.36.2 version. Removed it and added required version for librsvg. taken from: https://git.gnome.org/browse/gnome-panel/commit/?id=d306ad3 --- applets/clock/clock-utils.c | 1 - configure.ac | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applets/clock/clock-utils.c b/applets/clock/clock-utils.c index b8a15b5f..088f5231 100644 --- a/applets/clock/clock-utils.c +++ b/applets/clock/clock-utils.c @@ -35,7 +35,6 @@ #include #include -#include #include "clock.h" diff --git a/configure.ac b/configure.ac index 5a595acd..ae117215 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,7 @@ CAIRO_REQUIRED=1.0.0 DBUS_GLIB_REQUIRED=0.80 DCONF_NEW_REQUIRED=0.13.4 DCONF_OLD_REQUIRED=0.10.0 +LIBRSVG_REQUIRED=2.36.2 # GTK library @@ -145,7 +146,7 @@ PKG_CHECK_MODULES(TZ, gio-2.0 >= $GLIB_REQUIRED) AC_SUBST(TZ_CFLAGS) AC_SUBST(TZ_LIBS) -PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 dbus-glib-1 $WEATHER_LIB >= $WEATHER_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED) +PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 >= $LIBRSVG_REQUIRED dbus-glib-1 $WEATHER_LIB >= $WEATHER_REQUIRED mate-desktop-2.0 >= $LIBMATE_DESKTOP_REQUIRED) AC_SUBST(CLOCK_CFLAGS) AC_SUBST(CLOCK_LIBS) -- cgit v1.2.1