[GTK] [JHBuild] Cyclic dependency between cairo and librsvg.
authorclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Sep 2014 18:10:32 +0000 (18:10 +0000)
committerclopez@igalia.com <clopez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Sep 2014 18:10:32 +0000 (18:10 +0000)
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).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173159 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/gtk/jhbuild.modules

index 1fe77d3f3fb21d0faf448e35321ec4ac55bb8b34..09ac0b162b2a81dbf6d0fc2832ef6946a9946bac 100644 (file)
@@ -1,3 +1,13 @@
+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>
 
         [GTK] install-dependencies don't installs dbus-launch that is needed for the API tests.
index e2b57344ab38e4e133929dae9d9f2aa04147b465..fe299a37b1e904ce9ca3eded87cacd0ba8842fc7 100644 (file)
@@ -60,7 +60,7 @@
 
 
   <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>
       <dep package="fontconfig"/>
              autogenargs="--disable-introspection --enable-pixbuf-loader --disable-gtk-theme">
     <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"
             repo="ftp.gnome.org"