Changeset 186500 in webkit

Timestamp:

Jul 8, 2015 7:00:31 AM (9 years ago)

Author:

clopez@igalia.com

Message:

[GTK] [Wayland] Allow building and testing the Wayland target with the default JHBuild moduleset.
​https://bugs.webkit.org/show_bug.cgi?id=146056

Reviewed by Martin Robinson.

• gtk/install-dependencies: libepoxy is now required for building GTK+.
• gtk/jhbuild-wayland.modules: Removed. Not longer needed.
• gtk/jhbuild.modules: Upgrade GTK+ (3.16.4) and required dependencies for building:

Cairo (1.14.2), Gdk-Pixbuf (2.30.8) and GLib (2.44.1).

• gtk/patches/cairo-1.12.8-add_disable-lto.patch: Removed. Not longer needed.

Cairo removed support for LTO on (1.14). Upstream commit: c7ff9bb.

• gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch: Removed. Not longer needed.

GTK+ merged this patch on GTK+-3.10. Upstream commit: 8d83d98.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/install-dependencies (modified) (3 diffs)
• gtk/jhbuild-wayland.modules (deleted)
• gtk/jhbuild.modules (modified) (5 diffs)
• gtk/patches/cairo-1.12.8-add_disable-lto.patch (deleted)
• gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch (deleted)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-07-08  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [GTK] [Wayland] Allow building and testing the Wayland target with the default JHBuild moduleset.
+        https://bugs.webkit.org/show_bug.cgi?id=146056
+
+        Reviewed by Martin Robinson.
+
+        * gtk/install-dependencies: libepoxy is now required for building GTK+.
+        * gtk/jhbuild-wayland.modules: Removed. Not longer needed.
+        * gtk/jhbuild.modules: Upgrade GTK+ (3.16.4) and required dependencies for building:
+        Cairo (1.14.2), Gdk-Pixbuf (2.30.8) and GLib (2.44.1).
+        * gtk/patches/cairo-1.12.8-add_disable-lto.patch: Removed. Not longer needed.
+        Cairo removed support for LTO on (1.14). Upstream commit: c7ff9bb.
+        * gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch: Removed. Not longer needed.
+        GTK+ merged this patch on GTK+-3.10. Upstream commit: 8d83d98.
+
 2015-07-06  Matt Rajca  <mrajca@apple.com>
 

trunk/Tools/gtk/install-dependencies

@@ -123 +123 @@
         libcroco3-dev \
         libegl1-mesa-dev \
+        libepoxy-dev \
         libgcrypt11-dev \
         libgpg-error-dev \
@@ -255 +256 @@
         icon-naming-utils \
         libcroco \
+        libepoxy \
         libgcrypt \
         libgpg-error \
@@ -370 +372 @@
         libXfont-devel \
         libcroco-devel \
+        libepoxy-devel \
         libgcrypt-devel \
         libgpg-error-devel \

trunk/Tools/gtk/jhbuild.modules

@@ -64 +64 @@
 
   <autotools id="cairo"
-             autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no --disable-lto"
+             autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no"
              makeargs="">
     <dependencies>
@@ -71 +71 @@
       <dep package="glib"/>
     </dependencies>
-    <branch module="releases/cairo-1.12.8.tar.xz" version="1.12.8"
+    <branch module="releases/cairo-1.14.2.tar.xz" version="1.14.2"
             repo="cairographics.org"
-            hash="sha256:8fbb6fc66117ab4100bad830cb4479497e53c6f3facb98bf05c8d298554ebdd9"
-            md5sum="8b3dcade859c44fb7e56fc68edfe9a45">
-      <patch file="cairo-1.12.8-add_disable-lto.patch" strip="1"/>
-    </branch>
+            hash="sha1:c8da68aa66ca0855b5d0ff552766d3e8679e1d24"/>
   </autotools>
 
@@ -128 +125 @@
       <dep package="glib"/>
     </dependencies>
-    <branch module="/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-2.26.5.tar.xz" version="2.26.5"
-            repo="ftp.gnome.org"
-            hash="sha256:77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84"
-            md5sum="339329e6d619ee3e1cb93979111b04c0"/>
+    <branch module="/pub/GNOME/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.8.tar.xz" version="2.30.8"
+            repo="ftp.gnome.org"
+            hash="sha256:4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be"/>
   </autotools>
 
@@ -157 +153 @@
       <dep package="gdk-pixbuf"/>
     </dependencies>
-    <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">
-      <patch file="gtk-3.6-do-not-shutdown-accessibility.patch" strip="1"/>
-    </branch>
+    <branch module="/pub/GNOME/sources/gtk+/3.16/gtk+-3.16.4.tar.xz" version="3.16.4"
+            repo="ftp.gnome.org"
+            hash="sha256:1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e"/>
   </autotools>
 
@@ -170 +164 @@
       <dep package="libffi"/>
     </dependencies>
-    <branch module="/pub/GNOME/sources/glib/2.41/glib-2.41.2.tar.xz" version="2.41.2"
-            repo="ftp.gnome.org"
-            hash="sha256:da1f7258655f0e196b9304cb9515784634f3797437923e236bb3466348811c96"
-            md5sum="9636f60e99b98fd0fdb5239f905ac008">
+    <branch module="/pub/GNOME/sources/glib/2.44/glib-2.44.1.tar.xz" version="2.44.1"
+            repo="ftp.gnome.org"
+            hash="sha256:8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07">
       <patch file="glib-warning-fix.patch" strip="1"/>
     </branch>