Title: [173159] trunk/Tools
Revision
173159
Author
clo...@igalia.com
Date
2014-09-01 11:10:32 -0700 (Mon, 01 Sep 2014)

Log 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).

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (173158 => 173159)


--- trunk/Tools/ChangeLog	2014-09-01 18:06:33 UTC (rev 173158)
+++ trunk/Tools/ChangeLog	2014-09-01 18:10:32 UTC (rev 173159)
@@ -1,5 +1,15 @@
 2014-09-01  Carlos Alberto Lopez Perez  <clo...@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  <clo...@igalia.com>
+
         [GTK] install-dependencies don't installs dbus-launch that is needed for the API tests.
         https://bugs.webkit.org/show_bug.cgi?id=136425
 

Modified: trunk/Tools/gtk/jhbuild.modules (173158 => 173159)


--- trunk/Tools/gtk/jhbuild.modules	2014-09-01 18:06:33 UTC (rev 173158)
+++ trunk/Tools/gtk/jhbuild.modules	2014-09-01 18:10:32 UTC (rev 173159)
@@ -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"/>
@@ -128,6 +128,8 @@
              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"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to