>From 898c8f9f43e5057857cebe4b5ae5ab2659b1895a Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofour...@redhat.com>
Date: Fri, 30 Nov 2012 12:04:40 +0100
Subject: [PATCH] tools: check for librsvg version 2.36.2

to avoid a warning at build time as including <librsvg/rsvg-cairo.h>
directly is deprecated in version 2.36.2 or later.

Signed-off-by: Olivier Fourdan <ofour...@redhat.com>
---
 tools/show-svg-image.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/tools/show-svg-image.c b/tools/show-svg-image.c
index af57b37..7c806a1 100644
--- a/tools/show-svg-image.c
+++ b/tools/show-svg-image.c
@@ -33,9 +33,14 @@
 #include <gtk/gtk.h>
 #include <cairo.h>
 #include <librsvg/rsvg.h>
-#include <librsvg/rsvg-cairo.h>
 #include "libwacom.h"
 
+#ifndef LIBRSVG_CHECK_VERSION
+#include <librsvg/librsvg-features.h>
+#endif
+#if !LIBRSVG_CHECK_VERSION(2,36,2)
+#include <librsvg/rsvg-cairo.h>
+#endif
 
 #define INACTIVE_COLOR		"#ededed"
 #define ACTIVE_COLOR		"#729fcf"
-- 
1.7.1

------------------------------------------------------------------------------
Keep yourself connected to Go Parallel: 
TUNE You got it built. Now make it sing. Tune shows you how.
http://goparallel.sourceforge.net
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to