<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186500] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186500">186500</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2015-07-08 07:00:31 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkinstalldependencies">trunk/Tools/gtk/install-dependencies</a></li>
<li><a href="#trunkToolsgtkjhbuildmodules">trunk/Tools/gtk/jhbuild.modules</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsgtkjhbuildwaylandmodules">trunk/Tools/gtk/jhbuild-wayland.modules</a></li>
<li><a href="#trunkToolsgtkpatchescairo1128add_disableltopatch">trunk/Tools/gtk/patches/cairo-1.12.8-add_disable-lto.patch</a></li>
<li><a href="#trunkToolsgtkpatchesgtk36donotshutdownaccessibilitypatch">trunk/Tools/gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (186499 => 186500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-08 13:43:25 UTC (rev 186499)
+++ trunk/Tools/ChangeLog 2015-07-08 14:00:31 UTC (rev 186500)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-07-06 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: propagate metadata changes to UI clients
</span></span></pre></div>
<a id="trunkToolsgtkinstalldependencies"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/install-dependencies (186499 => 186500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/install-dependencies 2015-07-08 13:43:25 UTC (rev 186499)
+++ trunk/Tools/gtk/install-dependencies 2015-07-08 14:00:31 UTC (rev 186500)
</span><span class="lines">@@ -122,6 +122,7 @@
</span><span class="cx"> icon-naming-utils \
</span><span class="cx"> libcroco3-dev \
</span><span class="cx"> libegl1-mesa-dev \
</span><ins>+ libepoxy-dev \
</ins><span class="cx"> libgcrypt11-dev \
</span><span class="cx"> libgpg-error-dev \
</span><span class="cx"> libjson-glib-dev \
</span><span class="lines">@@ -254,6 +255,7 @@
</span><span class="cx"> gobject-introspection \
</span><span class="cx"> icon-naming-utils \
</span><span class="cx"> libcroco \
</span><ins>+ libepoxy \
</ins><span class="cx"> libgcrypt \
</span><span class="cx"> libgpg-error \
</span><span class="cx"> p11-kit \
</span><span class="lines">@@ -369,6 +371,7 @@
</span><span class="cx"> itstool \
</span><span class="cx"> libXfont-devel \
</span><span class="cx"> libcroco-devel \
</span><ins>+ libepoxy-devel \
</ins><span class="cx"> libgcrypt-devel \
</span><span class="cx"> libgpg-error-devel \
</span><span class="cx"> libp11-devel \
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildwaylandmodules"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/gtk/jhbuild-wayland.modules (186499 => 186500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild-wayland.modules 2015-07-08 13:43:25 UTC (rev 186499)
+++ trunk/Tools/gtk/jhbuild-wayland.modules 2015-07-08 14:00:31 UTC (rev 186500)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-<?xml version="1.0"?>
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-
- <!-- This file contains a set of modules to set up an enviroment for wayland support. -->
- <repository type="tarball" name="ftp.gnome.org"
- href="http://ftp.gnome.org"/>
-
- <autotools id="gdk-pixbuf" autogen-sh="configure"
- autogenargs="--disable-introspection">
- <dependencies>
- <dep package="glib"/>
- </dependencies>
- <branch module="/pub/GNOME/sources/gdk-pixbuf/2.29/gdk-pixbuf-2.29.3.tar.xz" version="2.29.3"
- repo="ftp.gnome.org"
- hash="sha256:f3ab2e153809ceedc3f8b9b22cdee018ffe7bbec2d2a8b5154e0ce220ea7d088"/>
- </autotools>
-
- <autotools id="gtk+" autogen-sh="configure"
- autogenargs="--disable-introspection --enable-x11-backend --enable-wayland-backend">
- <dependencies>
- <dep package="glib"/>
- <dep package="cairo"/>
- <dep package="at-spi2-atk"/>
- <dep package="gdk-pixbuf"/>
- </dependencies>
- <branch module="/pub/GNOME/sources/gtk+/3.12/gtk+-3.12.0.tar.xz" version="3.12.0"
- repo="ftp.gnome.org"
- hash="sha256:eb69741cd4029b5a1ac9cf04d9de55dcf9e30777a63891750f5d20cc554b6e4b"/>
- </autotools>
-
- <autotools id="glib"
- autogen-sh="configure"
- autogenargs="--disable-dtrace">
- <dependencies>
- <dep package="libffi"/>
- </dependencies>
- <branch module="/pub/GNOME/sources/glib/2.40/glib-2.40.0.tar.xz" version="2.40.0"
- repo="ftp.gnome.org"
- hash="sha256:0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5"/>
- </autotools>
-</moduleset>
</del></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (186499 => 186500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules 2015-07-08 13:43:25 UTC (rev 186499)
+++ trunk/Tools/gtk/jhbuild.modules 2015-07-08 14:00:31 UTC (rev 186500)
</span><span class="lines">@@ -63,19 +63,16 @@
</span><span class="cx"> href="http://anongit.freedesktop.org/git"/>
</span><span class="cx">
</span><span class="cx"> <autotools id="cairo"
</span><del>- autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no --disable-lto"
</del><ins>+ autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no"
</ins><span class="cx"> makeargs="">
</span><span class="cx"> <dependencies>
</span><span class="cx"> <dep package="fontconfig"/>
</span><span class="cx"> <dep package="pixman"/>
</span><span class="cx"> <dep package="glib"/>
</span><span class="cx"> </dependencies>
</span><del>- <branch module="releases/cairo-1.12.8.tar.xz" version="1.12.8"
</del><ins>+ <branch module="releases/cairo-1.14.2.tar.xz" version="1.14.2"
</ins><span class="cx"> repo="cairographics.org"
</span><del>- hash="sha256:8fbb6fc66117ab4100bad830cb4479497e53c6f3facb98bf05c8d298554ebdd9"
- md5sum="8b3dcade859c44fb7e56fc68edfe9a45">
- <patch file="cairo-1.12.8-add_disable-lto.patch" strip="1"/>
- </branch>
</del><ins>+ hash="sha1:c8da68aa66ca0855b5d0ff552766d3e8679e1d24"/>
</ins><span class="cx"> </autotools>
</span><span class="cx">
</span><span class="cx"> <autotools id="pixman" autogen-sh="configure"
</span><span class="lines">@@ -127,10 +124,9 @@
</span><span class="cx"> <dependencies>
</span><span class="cx"> <dep package="glib"/>
</span><span class="cx"> </dependencies>
</span><del>- <branch module="/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-2.26.5.tar.xz" version="2.26.5"
</del><ins>+ <branch module="/pub/GNOME/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.8.tar.xz" version="2.30.8"
</ins><span class="cx"> repo="ftp.gnome.org"
</span><del>- hash="sha256:77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84"
- md5sum="339329e6d619ee3e1cb93979111b04c0"/>
</del><ins>+ hash="sha256:4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be"/>
</ins><span class="cx"> </autotools>
</span><span class="cx">
</span><span class="cx"> <autotools id="librsvg" autogen-sh="configure"
</span><span class="lines">@@ -156,11 +152,9 @@
</span><span class="cx"> <dep package="at-spi2-atk"/>
</span><span class="cx"> <dep package="gdk-pixbuf"/>
</span><span class="cx"> </dependencies>
</span><del>- <branch module="/pub/GNOME/sources/gtk+/3.6/gtk+-3.6.0.tar.xz" version="3.6.0"
</del><ins>+ <branch module="/pub/GNOME/sources/gtk+/3.16/gtk+-3.16.4.tar.xz" version="3.16.4"
</ins><span class="cx"> repo="ftp.gnome.org"
</span><del>- hash="sha256:e13f45225a795ebe9e4047486fa57b3232e6a21539983775db6cd4ae9046b049">
- <patch file="gtk-3.6-do-not-shutdown-accessibility.patch" strip="1"/>
- </branch>
</del><ins>+ hash="sha256:1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e"/>
</ins><span class="cx"> </autotools>
</span><span class="cx">
</span><span class="cx"> <autotools id="glib"
</span><span class="lines">@@ -169,10 +163,9 @@
</span><span class="cx"> <dependencies>
</span><span class="cx"> <dep package="libffi"/>
</span><span class="cx"> </dependencies>
</span><del>- <branch module="/pub/GNOME/sources/glib/2.41/glib-2.41.2.tar.xz" version="2.41.2"
</del><ins>+ <branch module="/pub/GNOME/sources/glib/2.44/glib-2.44.1.tar.xz" version="2.44.1"
</ins><span class="cx"> repo="ftp.gnome.org"
</span><del>- hash="sha256:da1f7258655f0e196b9304cb9515784634f3797437923e236bb3466348811c96"
- md5sum="9636f60e99b98fd0fdb5239f905ac008">
</del><ins>+ hash="sha256:8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07">
</ins><span class="cx"> <patch file="glib-warning-fix.patch" strip="1"/>
</span><span class="cx"> </branch>
</span><span class="cx"> </autotools>
</span></span></pre></div>
<a id="trunkToolsgtkpatchescairo1128add_disableltopatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/gtk/patches/cairo-1.12.8-add_disable-lto.patch (186499 => 186500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/cairo-1.12.8-add_disable-lto.patch 2015-07-08 13:43:25 UTC (rev 186499)
+++ trunk/Tools/gtk/patches/cairo-1.12.8-add_disable-lto.patch 2015-07-08 14:00:31 UTC (rev 186500)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-From c3645d97ebd24c6f7ad850785d585aebc706a11c Mon Sep 17 00:00:00 2001
-From: Bryce Harrington <b.harrington@samsung.com>
-Date: Tue, 8 Jul 2014 13:14:20 -0700
-Subject: configure.ac: Add a --disable-lto configure option
-
-Link-Time Optimization seems to be stable enough with gcc 4.8 and 4.9,
-but has proven to be an issue in the past for many cairo users (webkit,
-efl, ubuntu, opensuse, gentoo, arch...) who carry patches to disable it.
-
-Gentoo's patch[1] adds a --disable-lto option to leave it enabled by
-default but give users the ability to work around lto related build
-problems (c.f. fdo #77060). Patch appears to have been authored by
-Alexandre Rostovtsev[2].
-
-1: sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/cairo/files/cairo-1.12.16-lto-optional.patch
-2: https://bugs.gentoo.org/show_bug.cgi?id=509552
-
-Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=60852
-Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
-Reviewed-by: Uli Schlachter <psychon@znc.in>
-
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index f984eb2..a72d948 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -38,13 +38,18 @@ dnl options. Namely, the following:
-
- dnl -flto working really needs a test link, not just a compile
-
--safe_MAYBE_WARN="$MAYBE_WARN"
--MAYBE_WARN="$MAYBE_WARN -flto"
--AC_TRY_LINK([],[
-+AC_ARG_ENABLE(lto,
-+ AS_HELP_STRING([--disable-lto],
-+ [Do not try to use Link-Time Optimization]))
-+if test "x$enable_lto" != "xno"; then
-+ safe_MAYBE_WARN="$MAYBE_WARN"
-+ MAYBE_WARN="$MAYBE_WARN -flto"
-+ AC_TRY_LINK([],[
- int main(int argc, char **argv) { return 0; }
--],[],[
-+ ],[],[
- MAYBE_WARN="$safe_MAYBE_WARN"
--])
-+ ])
-+fi
-
- MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
-
---
-cgit v0.10.2
-
</del></span></pre></div>
<a id="trunkToolsgtkpatchesgtk36donotshutdownaccessibilitypatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch (186499 => 186500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch 2015-07-08 13:43:25 UTC (rev 186499)
+++ trunk/Tools/gtk/patches/gtk-3.6-do-not-shutdown-accessibility.patch 2015-07-08 14:00:31 UTC (rev 186500)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>---- gtk+-3.6.0/gtk/gtkmain.c 2012-09-18 16:34:42.000000000 +0100
-+++ gtk+-3.6.0/gtk/gtkmain.c 2013-09-16 17:36:58.046546545 +0100
-@@ -671,7 +671,6 @@
-
- /* XXX: Remove me after getting rid of gail */
- extern void _gtk_accessibility_init (void);
--extern void _gtk_accessibility_shutdown (void);
-
- static void
- do_post_parse_initialization (int *argc,
-@@ -1180,8 +1179,6 @@
-
- /* Synchronize the recent manager singleton */
- _gtk_recent_manager_sync ();
--
-- _gtk_accessibility_shutdown ();
- }
- }
-
---- gtk+-3.6.0/gtk/gtkapplication.c 2012-09-24 00:57:30.000000000 +0100
-+++ gtk+-3.6.0/gtk/gtkapplication.c 2013-09-16 17:37:23.154671051 +0100
-@@ -47,8 +47,6 @@
- #include <gdk/x11/gdkx.h>
- #endif
-
--extern void _gtk_accessibility_shutdown (void);
--
- /**
- * SECTION:gtkapplication
- * @title: GtkApplication
-@@ -433,8 +431,6 @@
- /* Synchronize the recent manager singleton */
- _gtk_recent_manager_sync ();
-
-- _gtk_accessibility_shutdown ();
--
- G_APPLICATION_CLASS (gtk_application_parent_class)
- ->shutdown (application);
- }
</del></span></pre>
</div>
</div>
</body>
</html>