Commit 8982a0b1 authored by Michael Catanzaro's avatar Michael Catanzaro
Browse files

3.20: Make cairo a sysdep

I'm a bit hesitant because GTK+ requires a cairo that is only one year
old, and this dependency is bound to increase in the future. But we have
to break the circular dependency gobject-introspection -> cairo ->
librsvg -> gdk-pixbuf -> gobject-introspection or new users will never
be able to build anything, and the best way I see to do that is to take
cairo out of the equation. If this doesn't work we might need to explore
building two separate cairos, one as a bootstrap without SVG support.
parent 52a305d3
......@@ -87,23 +87,6 @@
</dependencies>
</autotools>
<autotools id="cairo" autogenargs="--enable-gl">
<if condition-set="quartz">
<autogenargs value="--enable-quartz --disable-gl"/>
</if>
<branch repo="git.freedesktop.org">
</branch>
<dependencies>
<if condition-unset="quartz">
<dep package="fontconfig"/>
<dep package="gl"/>
</if>
<dep package="gtk-doc"/>
<dep package="librsvg"/>
<dep package="pixman"/>
</dependencies>
</autotools>
<autotools id="cairomm" autogen-sh="configure">
<branch module="releases/cairomm-${version}.tar.gz"
version="1.12.0"
......
......@@ -48,6 +48,11 @@
</systemdependencies>
</systemmodule>
<systemmodule id="cairo">
<pkg-config>cairo.pc</pkg-config>
<branch repo="system" version="1.14.0"/>
</systemmodule>
<systemmodule id="c++">
<branch repo="system"/>
<systemdependencies>
......
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