Merge lp:~compiz-team/compiz/compiz.fix_1039843 into lp:compiz/0.9.8

[Sam Spilsbury]

Detect if rsvg 2.36.2 is installed (LP: #1039843)

Detect if rsvg 2.36.2 is installed

[Daniel van Vugt (vanvugt)]

Tested OK

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/60/console reported an error when processing this lp:~compiz-team/compiz/compiz.fix_1039843 branch.
Not merging it.

[Daniel van Vugt (vanvugt)]

Jenkins says:
/usr/include/librsvg-2.0/librsvg/rsvg-cairo.h:27:2: error: #warning "Including <librsvg/rsvg-cairo.h> directly is deprecated." [-Werror=cpp]
cc1plus: all warnings being treated as errors

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

review: Approve

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'plugins/imgsvg/CMakeLists.txt'
--- plugins/imgsvg/CMakeLists.txt	2009-03-15 05:09:18 +0000
+++ plugins/imgsvg/CMakeLists.txt	2012-08-22 05:09:19 +0000
@@ -2,4 +2,15 @@
 
 include (CompizPlugin)
 
-compiz_plugin(imgsvg PLUGINDEPS composite opengl PKGDEPS cairo>=1.0 cairo-xlib librsvg-2.0>=2.14.0)
 \ No newline at end of file
+pkg_check_modules (RSVG librsvg-2.0>=2.36.2)
+
+if (RSVG_FOUND)
+    compiz_set (HAVE_RSVG_2_36_2 1)
+endif (RSVG_FOUND)
+
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/imgsvg-config.h.in
+		${CMAKE_CURRENT_BINARY_DIR}/src/imgsvg-config.h)
+
+include_directories (${CMAKE_CURRENT_BINARY_DIR}/src)
+
+compiz_plugin(imgsvg PLUGINDEPS composite opengl PKGDEPS cairo>=1.0 cairo-xlib librsvg-2.0>=2.14.0)
 
=== added file 'plugins/imgsvg/src/imgsvg-config.h.in'
--- plugins/imgsvg/src/imgsvg-config.h.in	1970-01-01 00:00:00 +0000
+++ plugins/imgsvg/src/imgsvg-config.h.in	2012-08-22 05:09:19 +0000
@@ -0,0 +1,1 @@
+#cmakedefine HAVE_RSVG_2_36_2
 
=== modified file 'plugins/imgsvg/src/imgsvg.h'
--- plugins/imgsvg/src/imgsvg.h	2012-08-21 11:33:35 +0000
+++ plugins/imgsvg/src/imgsvg.h	2012-08-22 05:09:19 +0000
@@ -33,8 +33,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <imgsvg-config.h>
+
 #include <cairo/cairo-xlib.h>
 #include <librsvg/rsvg.h>
+ 
+#ifndef HAVE_RSVG_2_36_2
+#include <librsvg/rsvg-cairo.h>
+#endif
 
 #include <X11/Xatom.h>
 #include <X11/extensions/shape.h>