Changeset 147547 in webkit

Timestamp:

Apr 3, 2013 6:20:28 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Bump required versions of some dependencies
​https://bugs.webkit.org/show_bug.cgi?id=113282

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2013-04-03
Reviewed by Martin Robinson.

.:

This patch updates the following dependencies:

• libsoup 2.42.0: is the current stable release.

• glib 2.36.0: libsoup 2.42 requires 2.35.0, but we don't want to depend on unstable versions and 2.36 is the next stable version after 2.35.

• gtk+ 3.6.0: this is the previous stable release. We don't currently have any code using newer API, so we will be able to remove all the #ifdefed code.

• at-spi2 2.5.3: is the version required by gtk+ 3.6.

• GObject introspection 1.32.0: is the version required by gtk+ 3.6.

• Pango 1.32.0: it's the current stable version and the first one depending on Harfbuzz.

• Fontconfig 2.5: required by pango 1.32.0 when using Harfbuzz.

• gtk+ 2.24.10: it allows us to remove a lot of deprecated code and #ifdefs.

• Source/autotools/Versions.m4:

Tools:

• gtk/jhbuild.modules: Update libsoup, glib, at-spi2 and gtk+ versions.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/autotools/Versions.m4 (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/gtk/jhbuild.modules (modified) (5 diffs)

trunk/ChangeLog

@@ +1 @@
+2013-04-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Bump required versions of some dependencies
+        https://bugs.webkit.org/show_bug.cgi?id=113282
+
+        Reviewed by Martin Robinson.
+
+        This patch updates the following dependencies:
+
+         - libsoup 2.42.0: is the current stable release.
+
+         - glib 2.36.0: libsoup 2.42 requires 2.35.0, but we don't want to
+           depend on unstable versions and 2.36 is the next stable version
+           after 2.35.
+
+         - gtk+ 3.6.0: this is the previous stable release. We don't
+           currently have any code using newer API, so we will be able to
+           remove all the #ifdefed code.
+
+         - at-spi2 2.5.3: is the version required by gtk+ 3.6.
+
+         - GObject introspection 1.32.0: is the version required by gtk+ 3.6.
+
+         - Pango 1.32.0: it's the current stable version and the first one
+           depending on Harfbuzz.
+
+         - Fontconfig 2.5: required by pango 1.32.0 when using Harfbuzz.
+
+         - gtk+ 2.24.10: it allows us to remove a lot of deprecated code
+           and #ifdefs.
+
+        * Source/autotools/Versions.m4:
+
 2013-04-02  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/autotools/Versions.m4

@@ -16 +16 @@
 m4_define([libwebkit2gtk_version], [21:0:21])
 
-m4_define([gtk2_required_version], [2.10])
+m4_define([gtk2_required_version], [2.24.10])
 m4_define([gail2_required_version], [1.8])
-m4_define([gtk3_required_version], [3.4.0])
+m4_define([gtk3_required_version], [3.6.0])
 m4_define([gail3_required_version], [3.0])
 
-m4_define([atspi2_required_version], [2.2.1])
+m4_define([atspi2_required_version], [2.5.3])
 m4_define([cairo_required_version], [1.10])
 m4_define([enchant_required_version], [0.22])
-m4_define([fontconfig_required_version], [2.4])
+m4_define([fontconfig_required_version], [2.5])
 m4_define([freetype2_required_version], [9.0])
-m4_define([glib_required_version], [2.32.0])
-m4_define([gobject_introspection_required], [0.9.5])
+m4_define([glib_required_version], [2.36.0])
+m4_define([gobject_introspection_required], [1.32.0])
 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.40.0])
+m4_define([libsoup_required_version], [2.42.0])
 m4_define([libxml_required_version], [2.6])
 m4_define([libxslt_required_version], [1.1.7])
-m4_define([pango_required_version], [1.21.0])
+m4_define([pango_required_version], [1.32.0])
 m4_define([sqlite_required_version], [3.0])
 

trunk/Tools/ChangeLog

@@ +1 @@
+2013-04-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Bump required versions of some dependencies
+        https://bugs.webkit.org/show_bug.cgi?id=113282
+
+        Reviewed by Martin Robinson.
+
+        * gtk/jhbuild.modules: Update libsoup, glib, at-spi2 and gtk+ versions.
+
 2013-04-03  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
 

trunk/Tools/gtk/jhbuild.modules

@@ -136 +136 @@
       <dep package="glib"/>
       <dep package="cairo"/>
+      <dep package="at-spi2-atk"/>
       <dep package="gdk-pixbuf"/>
     </dependencies>
-    <branch module="/pub/GNOME/sources/gtk+/3.4/gtk+-3.4.2.tar.xz" version="3.4.2"
-            repo="ftp.gnome.org"
-            hash="sha256:b1ab72bc61434418160ff0c7edfd93c74758ed8a35e2ed3d07e3e218c2705480"
-            md5sum="9e20443fbaa3ba3e9cbd2fc44d6be121"/>
+    <branch module="/pub/GNOME/sources/gtk+/3.6/gtk+-3.6.0.tar.xz" version="3.6.0"
+            repo="ftp.gnome.org"
+            hash="sha256:e13f45225a795ebe9e4047486fa57b3232e6a21539983775db6cd4ae9046b049"/>
   </autotools>
 
@@ -150 +150 @@
       <dep package="libffi"/>
     </dependencies>
-    <branch module="/pub/GNOME/sources/glib/2.35/glib-2.35.2.tar.xz" version="2.35.2"
-            repo="ftp.gnome.org"
-            hash="sha256:84fffa2041850352b83a7b27c127f1c4e8b3d169aa3a000b100820ba10f8c19e"/>
+    <branch module="/pub/GNOME/sources/glib/2.36/glib-2.36.0.tar.xz" version="2.36.0"
+            repo="ftp.gnome.org"
+            hash="sha256:455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227"/>
   </autotools>
 
@@ -170 +170 @@
       <dep package="glib-networking"/>
     </dependencies>
-    <branch module="libsoup" version="2.40.2-r1"
-            repo="git.gnome.org"
-            revision="5651d18eb8c9edff5961a32c488641bf6776ca6b"/>
+    <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"/>
   </autotools>
 
@@ -219 +220 @@
   <autotools id="at-spi2-core" 
              autogenargs="--disable-introspection">
-    <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:2a4129420decca3657e163a4dbb1a3cb28acafe32ea1292417fdd81084d48fac"
-            md5sum="183916373d6906ff6b220bd44d15ff97">
+    <branch module="pub/GNOME/sources/at-spi2-core/2.5/at-spi2-core-2.5.3.tar.xz" version="2.5.3"
+            repo="ftp.gnome.org"
+            hash="sha256:f5b69ea237d1bb9da36a717a6e810baf3cd4094770f8361793e6cb3ec2443c3c">
     </branch>
     <dependencies>
@@ -230 +230 @@
 
   <autotools id="at-spi2-atk">
-    <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:6677def34b16c9a28d6ad96473ea56a3c0e13aa968e584df004cd44c8691ea1a"
-            md5sum="19646097aca25a9c1b8ba7ab8d172916">
+    <branch module="pub/GNOME/sources/at-spi2-atk/2.5/at-spi2-atk-2.5.3.tar.xz" version="2.5.3"
+            repo="ftp.gnome.org"
+            hash="sha256:bdbead509bb87e8939b06385febdadddef3c5e25dce4a0ed39f9a83d36c0c69b">
     </branch>
     <dependencies>