Title: [101961] trunk/Tools
- Revision
- 101961
- Author
- [email protected]
- Date
- 2011-12-04 10:46:11 -0800 (Sun, 04 Dec 2011)
Log Message
[GTK] Include cairo, pixman and gnome-icon-theme in the jhbuild modules
https://bugs.webkit.org/show_bug.cgi?id=73748
Reviewed by Gustavo Noronha Silva.
* gtk/jhbuild.modules: Add some new modules the jhbuild moduleset.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101960 => 101961)
--- trunk/Tools/ChangeLog 2011-12-04 16:58:28 UTC (rev 101960)
+++ trunk/Tools/ChangeLog 2011-12-04 18:46:11 UTC (rev 101961)
@@ -1,3 +1,12 @@
+2011-12-04 Martin Robinson <[email protected]>
+
+ [GTK] Include cairo, pixman and gnome-icon-theme in the jhbuild modules
+ https://bugs.webkit.org/show_bug.cgi?id=73748
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * gtk/jhbuild.modules: Add some new modules the jhbuild moduleset.
+
2011-12-04 Philippe Normand <[email protected]>
Another GTK build fix after r101922.
Modified: trunk/Tools/gtk/jhbuild.modules (101960 => 101961)
--- trunk/Tools/gtk/jhbuild.modules 2011-12-04 16:58:28 UTC (rev 101960)
+++ trunk/Tools/gtk/jhbuild.modules 2011-12-04 18:46:11 UTC (rev 101961)
@@ -5,10 +5,13 @@
<metamodule id="webkitgtk-testing-dependencies">
<dependencies>
+ <dep package="cairo"/>
<dep package="fonts"/>
+ <dep package="fontconfig"/>
<dep package="freetype6"/>
<dep package="glib"/>
<dep package="glib-networking"/>
+ <dep package="gnome-icon-theme"/>
<dep package="libsoup"/>
</dependencies>
</metamodule>
@@ -21,13 +24,36 @@
href=""
<repository type="tarball" name="p11-glue.freedesktop.org"
href=""
- <repository type="tarball" name="gnome.org"
+ <repository type="tarball" name="ftp.gnome.org"
href=""
<repository type="git" name="git.gnome.org"
href=""
<repository type="tarball" name="gnu.org"
href=""
+ <repository type="tarball" name="cairographics.org"
+ href=""
+ <repository type="tarball" name="freedesktop.org"
+ href=""
+ <autotools id="cairo" autogen-sh="configure">
+ <dependencies>
+ <dep package="pixman"/>
+ </dependencies>
+ <branch module="releases/cairo-1.10.2.tar.gz" version="1.10.2"
+ repo="cairographics.org"
+ hash="sha256:32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"
+ md5sum="f101a9e88b783337b20b2e26dfd26d5f">
+ </branch>
+ </autotools>
+
+ <autotools id="pixman" autogen-sh="configure">
+ <branch module="releases/pixman-0.24.0.tar.gz" version="0.24.0"
+ repo="cairographics.org"
+ hash="sha256:a5647c7158f103eedff5fba799018f4169f6b26b573ab7685812ebc9a1c5d2e4"
+ md5sum="a2d0b120509bdccb10aa7f4bec3730e4">
+ </branch>
+ </autotools>
+
<autotools id="fonts"
skip-autogen="true">
<branch module="downloads/mrobinson/webkitgtk-test-fonts/webkitgtk-test-fonts-0.0.1.tar.gz" version="0.0.1"
@@ -69,7 +95,7 @@
<dep package="libffi"/>
</dependencies>
<branch module="/pub/GNOME/sources/glib/2.31/glib-2.31.2.tar.xz" version="2.31.2"
- repo="gnome.org"
+ repo="ftp.gnome.org"
hash="sha256:19d7921671a487c3c5759a57df7b8508afdbadd7764d62a47a82fff7b399032b"
md5sum="1cbdf314d7c87916a0c3dce83ac0285f"/>
</autotools>
@@ -79,7 +105,7 @@
<dep package="gnutls"/>
</dependencies>
<branch module="/pub/GNOME/sources/glib-networking/2.31/glib-networking-2.31.2.tar.xz" version="2.31.2"
- repo="gnome.org"
+ repo="ftp.gnome.org"
hash="sha256:03e3a2881d2626d1206e72972531661037fe0d32e745bf9b2f63c0d6f5e32a9c"
md5sum="b649b457bd9fd5e0e9b9c4dcb1a74a37"/>
</autotools>
@@ -105,4 +131,20 @@
tag="5cbfc48caf76ced2e28ee06c9e40523273601dc6"/>
</autotools>
+ <autotools id="fontconfig" autogen-sh="configure">
+ <branch module="software/fontconfig/release/fontconfig-2.8.0.tar.gz" version="2.8.0"
+ repo="freedesktop.org"
+ hash="sha256:fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"
+ md5sum="77e15a92006ddc2adbb06f840d591c0e">
+ </branch>
+ </autotools>
+
+ <autotools id="gnome-icon-theme" autogen-sh="configure">
+ <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"
+ md5sum="40be1e5a6eae11181311a6fc432cf892">
+ </branch>
+ </autotools>
+
</moduleset>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
