Changeset 173159 in webkit

Timestamp:

Sep 1, 2014 11:10:32 AM (10 years ago)

Author:

clopez@igalia.com

Message:

[GTK] [JHBuild] Cyclic dependency between cairo and librsvg.
​https://bugs.webkit.org/show_bug.cgi?id=136431

Reviewed by Martin Robinson.

• gtk/jhbuild.modules: Disable cairo SVG testsuite.

Add missing dependencies for librsvg (glib and cairo).

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/jhbuild.modules (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-09-01  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [GTK] [JHBuild] Cyclic dependency between cairo and librsvg.
+        https://bugs.webkit.org/show_bug.cgi?id=136431
+
+        Reviewed by Martin Robinson.
+
+        * gtk/jhbuild.modules: Disable cairo SVG testsuite.
+        Add missing dependencies for librsvg (glib and cairo).
+
 2014-09-01  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Tools/gtk/jhbuild.modules

@@ -61 +61 @@
 
   <autotools id="cairo" autogen-sh="configure"
-             autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes"
+             autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no"
              makeargs="CFLAGS=-fno-lto CXXFLAGS=-fno-lto LDFLAGS=-fno-lto">
     <dependencies>
@@ -129 +129 @@
     <dependencies>
       <dep package="gdk-pixbuf"/>
+      <dep package="glib"/>
+      <dep package="cairo"/>
     </dependencies>
     <branch module="/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.1.tar.xz" version="2.36.1"