Title: [105075] trunk/Tools
- Revision
- 105075
- Author
- [email protected]
- Date
- 2012-01-16 10:40:21 -0800 (Mon, 16 Jan 2012)
Log Message
[GTK] Include gtk+3 in the jhbuild modules
https://bugs.webkit.org/show_bug.cgi?id=76284
Patch by Mario Sanchez Prada <[email protected]> on 2012-01-16
Reviewed by Philippe Normand.
* gtk/jhbuild.modules: Add some gtk+3 to the jhbuild moduleset.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (105074 => 105075)
--- trunk/Tools/ChangeLog 2012-01-16 18:17:35 UTC (rev 105074)
+++ trunk/Tools/ChangeLog 2012-01-16 18:40:21 UTC (rev 105075)
@@ -1,3 +1,12 @@
+2012-01-16 Mario Sanchez Prada <[email protected]>
+
+ [GTK] Include gtk+3 in the jhbuild modules
+ https://bugs.webkit.org/show_bug.cgi?id=76284
+
+ Reviewed by Philippe Normand.
+
+ * gtk/jhbuild.modules: Add some gtk+3 to the jhbuild moduleset.
+
2012-01-16 Dan Winship <[email protected]>
Add myself as a committer
Modified: trunk/Tools/gtk/jhbuild.modules (105074 => 105075)
--- trunk/Tools/gtk/jhbuild.modules 2012-01-16 18:17:35 UTC (rev 105074)
+++ trunk/Tools/gtk/jhbuild.modules 2012-01-16 18:40:21 UTC (rev 105075)
@@ -9,6 +9,7 @@
<dep package="fonts"/>
<dep package="fontconfig"/>
<dep package="freetype6"/>
+ <dep package="gtk+"/>
<dep package="glib"/>
<dep package="glib-networking"/>
<dep package="gnome-icon-theme"/>
@@ -90,6 +91,17 @@
md5sum="79390673f5d07a8fb342bc09b5055b6f"/>
</autotools>
+ <autotools id="gtk+">
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="cairo"/>
+ </dependencies>
+ <branch module="/pub/GNOME/sources/gtk+/3.0/gtk+-3.0.12.tar.xz" version="3.0.12"
+ repo="ftp.gnome.org"
+ hash="sha256:219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9"
+ md5sum="b9869b671b0fe5905dce2fee57c965cf"/>
+ </autotools>
+
<autotools id="glib">
<dependencies>
<dep package="libffi"/>
@@ -140,6 +152,9 @@
</autotools>
<autotools id="gnome-icon-theme" autogen-sh="configure">
+ <dependencies>
+ <dep package="gtk+"/>
+ </dependencies>
<branch module="pub/GNOME/sources/gnome-icon-theme/3.2/gnome-icon-theme-3.2.1.tar.xz" version="3.2.1"
repo="ftp.gnome.org"
hash="sha256:a7f0a8b17e91ac338fdbc01ac59a8738e9c1e201de492c070d43aacf291a8959"
Modified: trunk/Tools/gtk/jhbuildrc (105074 => 105075)
--- trunk/Tools/gtk/jhbuildrc 2012-01-16 18:17:35 UTC (rev 105074)
+++ trunk/Tools/gtk/jhbuildrc 2012-01-16 18:40:21 UTC (rev 105075)
@@ -44,3 +44,6 @@
addpath('XDG_DATA_DIRS', '/usr/share')
addpath('XDG_CONFIG_DIRS', '/etc/xdg')
+
+# GTK+ 3.0.12 misses the -lm flag when linking the tests.
+module_makeargs['gtk+'] = 'LDFLAGS="-lm" ' + makeargs
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
