[GTK][Jhbuild] Move ATK to the main moduleset, bump ATK, at-spi2-(atk|core) versions...
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 3 Apr 2013 19:16:55 +0000 (19:16 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 3 Apr 2013 19:16:55 +0000 (19:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=113883

Reviewed by Martin Robinson.

* gtk/jhbuild-optional.modules: Remove the ATK entry as it is now placed in jhbuild.modules.
* gtk/jhbuild.modules: Add ATK to the list of webkitgtk-testing-dependencies metamodule, using the 2.8.0 version.
The at-spi2-core and at-spi2-atk versions are also increased to 2.8.0.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147574 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/gtk/jhbuild-optional.modules
Tools/gtk/jhbuild.modules

index 5d11a64..c7dc796 100644 (file)
@@ -1,3 +1,14 @@
+2013-04-03  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK][Jhbuild] Move ATK to the main moduleset, bump ATK, at-spi2-(atk|core) versions to 2.8.0
+        https://bugs.webkit.org/show_bug.cgi?id=113883
+
+        Reviewed by Martin Robinson.
+
+        * gtk/jhbuild-optional.modules: Remove the ATK entry as it is now placed in jhbuild.modules.
+        * gtk/jhbuild.modules: Add ATK to the list of webkitgtk-testing-dependencies metamodule, using the 2.8.0 version.
+        The at-spi2-core and at-spi2-atk versions are also increased to 2.8.0.
+
 2013-04-03  Manuel Rego Casasnovas  <rego@igalia.com>
 
         [GTK] Include Pango in jhbuild-optional.modules
index eaf60f1..886b0d3 100644 (file)
@@ -9,7 +9,6 @@
 
   <metamodule id="webkitgtk-clutter-dependencies">
     <dependencies>
-      <dep package="atk"/>
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
       <dep package="cogl"/>
             hash="sha256:ee50538daca9447be6ad1ed0d049fbb2dc5a1bcaecd13fda847b9b66f922ee37"/>
   </autotools>
 
-  <autotools id="atk"
-           autogen-sh="configure"
-           autogenargs="--disable-introspection">
-    <branch module="/pub/GNOME/sources/atk/2.5/atk-2.5.3.tar.xz" version="2.5.3"
-            repo="ftp.gnome.org"
-            hash="sha256:ac118ef34ef5490fa113cf50cffdff7735d6293723bf35df958a89fbda876313"/>
-  </autotools>
-
   <autotools id="pango"
           autogen-sh="configure"
           autogenargs="--disable-introspection">
index 6335f0b..e1f4e9b 100644 (file)
@@ -20,6 +20,7 @@
       <dep package="gnome-icon-theme-symbolic"/>
       <dep package="gnome-themes-standard"/>
       <dep package="libsoup"/>
+      <dep package="atk"/>
       <dep package="at-spi2-core"/>
       <dep package="at-spi2-atk"/>
       <dep package="gstreamer"/>
     </branch>
   </autotools>
 
+  <autotools id="atk"
+             autogen-sh="configure"
+             autogenargs="--disable-introspection">
+    <branch module="pub/GNOME/sources/atk/2.8/atk-2.8.0.tar.xz" version="2.8.0"
+            repo="ftp.gnome.org"
+            hash="sha256:b22519176226f3e07cf6d932b77852e6b6be4780977770704b32d0f4e0686df4"/>
+  </autotools>
+
   <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.8/at-spi2-core-2.8.0.tar.xz" version="2.8.0"
             repo="ftp.gnome.org"
-            hash="sha256:f5b69ea237d1bb9da36a717a6e810baf3cd4094770f8361793e6cb3ec2443c3c">
+            hash="sha256:1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458">
     </branch>
     <dependencies>
       <dep package="glib"/>
   </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.8/at-spi2-atk-2.8.0.tar.xz" version="2.8.0"
             repo="ftp.gnome.org"
-            hash="sha256:bdbead509bb87e8939b06385febdadddef3c5e25dce4a0ed39f9a83d36c0c69b">
+            hash="sha256:4688acbc1474cda0aa49341f109ad0726603ce3e872cc6521c74931338c7ba20">
     </branch>
     <dependencies>
       <dep package="glib"/>
+      <dep package="atk"/>
       <dep package="at-spi2-core"/>
     </dependencies>
   </autotools>