Modified: trunk/ChangeLog (147415 => 147416)
--- trunk/ChangeLog 2013-04-02 10:49:31 UTC (rev 147415)
+++ trunk/ChangeLog 2013-04-02 10:58:47 UTC (rev 147416)
@@ -1,3 +1,15 @@
+2013-04-02 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r147401.
+ http://trac.webkit.org/changeset/147401
+ https://bugs.webkit.org/show_bug.cgi?id=113767
+
+ The patch makes it extremely hard to set up the dependencies
+ properly on the GTK builders (Requested by zdobersek on
+ #webkit).
+
+ * Source/autotools/Versions.m4:
+
2013-04-02 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Bump required versions of some dependencies
Modified: trunk/Source/autotools/Versions.m4 (147415 => 147416)
--- trunk/Source/autotools/Versions.m4 2013-04-02 10:49:31 UTC (rev 147415)
+++ trunk/Source/autotools/Versions.m4 2013-04-02 10:58:47 UTC (rev 147416)
@@ -15,25 +15,25 @@
m4_define([libjavascriptcoregtk_version], [13:8:13])
m4_define([libwebkit2gtk_version], [21:0:21])
-m4_define([gtk2_required_version], [2.24.10])
+m4_define([gtk2_required_version], [2.10])
m4_define([gail2_required_version], [1.8])
-m4_define([gtk3_required_version], [3.6.0])
+m4_define([gtk3_required_version], [3.4.0])
m4_define([gail3_required_version], [3.0])
-m4_define([atspi2_required_version], [2.5.3])
+m4_define([atspi2_required_version], [2.2.1])
m4_define([cairo_required_version], [1.10])
m4_define([enchant_required_version], [0.22])
-m4_define([fontconfig_required_version], [2.5])
+m4_define([fontconfig_required_version], [2.4])
m4_define([freetype2_required_version], [9.0])
-m4_define([glib_required_version], [2.36.0])
-m4_define([gobject_introspection_required], [1.32.0])
+m4_define([glib_required_version], [2.32.0])
+m4_define([gobject_introspection_required], [0.9.5])
m4_define([gstreamer_plugins_base_required_version], [1.0.3])
m4_define([gstreamer_required_version], [1.0.3])
m4_define([harfbuzz_required_version], [0.9.7])
-m4_define([libsoup_required_version], [2.42.0])
+m4_define([libsoup_required_version], [2.40.0])
m4_define([libxml_required_version], [2.6])
m4_define([libxslt_required_version], [1.1.7])
-m4_define([pango_required_version], [1.32.0])
+m4_define([pango_required_version], [1.21.0])
m4_define([sqlite_required_version], [3.0])
m4_define([clutter_required_version], [1.12])
Modified: trunk/Tools/ChangeLog (147415 => 147416)
--- trunk/Tools/ChangeLog 2013-04-02 10:49:31 UTC (rev 147415)
+++ trunk/Tools/ChangeLog 2013-04-02 10:58:47 UTC (rev 147416)
@@ -1,3 +1,15 @@
+2013-04-02 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r147401.
+ http://trac.webkit.org/changeset/147401
+ https://bugs.webkit.org/show_bug.cgi?id=113767
+
+ The patch makes it extremely hard to set up the dependencies
+ properly on the GTK builders (Requested by zdobersek on
+ #webkit).
+
+ * gtk/jhbuild.modules:
+
2013-04-02 Sudarsana Nagineni <sudarsana.nagin...@intel.com>
[EFL][WK2] Empty tooltip shown when hovering over popup menu items
Modified: trunk/Tools/gtk/jhbuild.modules (147415 => 147416)
--- trunk/Tools/gtk/jhbuild.modules 2013-04-02 10:49:31 UTC (rev 147415)
+++ trunk/Tools/gtk/jhbuild.modules 2013-04-02 10:58:47 UTC (rev 147416)
@@ -135,12 +135,12 @@
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
- <dep package="at-spi2-atk"/>
<dep package="gdk-pixbuf"/>
</dependencies>
- <branch module="/pub/GNOME/sources/gtk+/3.6/gtk+-3.6.0.tar.xz" version="3.6.0"
+ <branch module="/pub/GNOME/sources/gtk+/3.4/gtk+-3.4.2.tar.xz" version="3.4.2"
repo="ftp.gnome.org"
- hash="sha256:e13f45225a795ebe9e4047486fa57b3232e6a21539983775db6cd4ae9046b049"/>
+ hash="sha256:b1ab72bc61434418160ff0c7edfd93c74758ed8a35e2ed3d07e3e218c2705480"
+ md5sum="9e20443fbaa3ba3e9cbd2fc44d6be121"/>
</autotools>
<autotools id="glib"
@@ -149,9 +149,9 @@
<dependencies>
<dep package="libffi"/>
</dependencies>
- <branch module="/pub/GNOME/sources/glib/2.36/glib-2.36.0.tar.xz" version="2.36.0"
+ <branch module="/pub/GNOME/sources/glib/2.35/glib-2.35.2.tar.xz" version="2.35.2"
repo="ftp.gnome.org"
- hash="sha256:455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227"/>
+ hash="sha256:84fffa2041850352b83a7b27c127f1c4e8b3d169aa3a000b100820ba10f8c19e"/>
</autotools>
<autotools id="glib-networking">
@@ -169,10 +169,9 @@
<dependencies>
<dep package="glib-networking"/>
</dependencies>
- <branch module="/pub/GNOME/sources/libsoup/2.42/libsoup-2.42.0.tar.xz" version="2.42.0"
- repo="ftp.gnome.org"
- hash="sha256:9e0e7eb5d3f7401ccf521fbc289fc1fa0923b7c7833729e2ed7696f7b848893e"
- md5sum="a632a38d2983c2a88679672d00940128"/>
+ <branch module="libsoup" version="2.40.2-r1"
+ repo="git.gnome.org"
+ revision="5651d18eb8c9edff5961a32c488641bf6776ca6b"/>
</autotools>
<autotools id="fontconfig" autogen-sh="configure">
@@ -219,9 +218,10 @@
<autotools id="at-spi2-core"
autogenargs="--disable-introspection">
- <branch module="pub/GNOME/sources/at-spi2-core/2.5/at-spi2-core-2.5.3.tar.xz" version="2.5.3"
+ <branch module="pub/GNOME/sources/at-spi2-core/2.2/at-spi2-core-2.2.1.tar.xz" version="2.2.1"
repo="ftp.gnome.org"
- hash="sha256:f5b69ea237d1bb9da36a717a6e810baf3cd4094770f8361793e6cb3ec2443c3c">
+ hash="sha256:2a4129420decca3657e163a4dbb1a3cb28acafe32ea1292417fdd81084d48fac"
+ md5sum="183916373d6906ff6b220bd44d15ff97">
</branch>
<dependencies>
<dep package="glib"/>
@@ -229,9 +229,10 @@
</autotools>
<autotools id="at-spi2-atk">
- <branch module="pub/GNOME/sources/at-spi2-atk/2.5/at-spi2-atk-2.5.3.tar.xz" version="2.5.3"
+ <branch module="pub/GNOME/sources/at-spi2-atk/2.2/at-spi2-atk-2.2.1.tar.xz" version="2.2.1"
repo="ftp.gnome.org"
- hash="sha256:bdbead509bb87e8939b06385febdadddef3c5e25dce4a0ed39f9a83d36c0c69b">
+ hash="sha256:6677def34b16c9a28d6ad96473ea56a3c0e13aa968e584df004cd44c8691ea1a"
+ md5sum="19646097aca25a9c1b8ba7ab8d172916">
</branch>
<dependencies>
<dep package="glib"/>
