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

Proposed by Sam Spilsbury on 2012-08-22
Status: Merged
Approved by: Sam Spilsbury on 2012-08-22
Approved revision: 3317
Merged at revision: 3318
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1039843
Merge into: lp:compiz/0.9.8
Diff against target: 46 lines (+19/-1) 3 files modified
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1039843
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve on 2012-08-22
Daniel van Vugt 2012-08-22 Needs Fixing on 2012-08-22
Review via email: mp+120689@code.launchpad.net

Commit Message

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

Description of the Change

Detect if rsvg 2.36.2 is installed

To post a comment you must log in.
Daniel van Vugt (vanvugt) wrote :

Tested OK

review: Approve
Unity Merger (unity-merger) wrote :

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) wrote :

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) wrote :

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

Preview Diff

[J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/imgsvg/CMakeLists.txt'
2--- plugins/imgsvg/CMakeLists.txt 2009-03-15 05:09:18 +0000
3+++ plugins/imgsvg/CMakeLists.txt 2012-08-22 05:09:19 +0000
4@@ -2,4 +2,15 @@
5
6 include (CompizPlugin)
7
8-compiz_plugin(imgsvg PLUGINDEPS composite opengl PKGDEPS cairo>=1.0 cairo-xlib librsvg-2.0>=2.14.0)
9\ No newline at end of file
10+pkg_check_modules (RSVG librsvg-2.0>=2.36.2)
11+
12+if (RSVG_FOUND)
13+ compiz_set (HAVE_RSVG_2_36_2 1)
14+endif (RSVG_FOUND)
15+
16+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/imgsvg-config.h.in
17+ ${CMAKE_CURRENT_BINARY_DIR}/src/imgsvg-config.h)
18+
19+include_directories (${CMAKE_CURRENT_BINARY_DIR}/src)
20+
21+compiz_plugin(imgsvg PLUGINDEPS composite opengl PKGDEPS cairo>=1.0 cairo-xlib librsvg-2.0>=2.14.0)
22
23=== added file 'plugins/imgsvg/src/imgsvg-config.h.in'
24--- plugins/imgsvg/src/imgsvg-config.h.in 1970-01-01 00:00:00 +0000
25+++ plugins/imgsvg/src/imgsvg-config.h.in 2012-08-22 05:09:19 +0000
26@@ -0,0 +1,1 @@
27+#cmakedefine HAVE_RSVG_2_36_2
28
29=== modified file 'plugins/imgsvg/src/imgsvg.h'
30--- plugins/imgsvg/src/imgsvg.h 2012-08-21 11:33:35 +0000
31+++ plugins/imgsvg/src/imgsvg.h 2012-08-22 05:09:19 +0000
32@@ -33,8 +33,14 @@
33 #include <stdlib.h>
34 #include <string.h>
35
36+#include <imgsvg-config.h>
37+
38 #include <cairo/cairo-xlib.h>
39 #include <librsvg/rsvg.h>
40+
41+#ifndef HAVE_RSVG_2_36_2
42+#include <librsvg/rsvg-cairo.h>
43+#endif
44
45 #include <X11/Xatom.h>
46 #include <X11/extensions/shape.h>

Subscribers

People subscribed via source and target branches