<!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>[192572] 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/192572">192572</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-18 04:43:39 -0800 (Wed, 18 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Update xserver version in jhbuild
https://bugs.webkit.org/show_bug.cgi?id=151383
Reviewed by Alejandro G. Castro.
In <a href="http://trac.webkit.org/projects/webkit/changeset/192568">r192568</a> I assumed the bots would have a recent enough Xvfb
to use the -displayfd option, but I forgot we build our own
xserver just for Xvfb. The version we build is too old, so
we could just use an updated version (the same bots have
installed, for example) to use the -displayfd option.
* gtk/jhbuild.modules: Update xserver to 1.16.4.
* gtk/patches/xserver-fix-glx-init.patch: Deleted.
* gtk/patches/xserver-remove-bogus-dependencies.patch: Updated to
apply on 1.16.4.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkjhbuildmodules">trunk/Tools/gtk/jhbuild.modules</a></li>
<li><a href="#trunkToolsgtkpatchesxserverremovebogusdependenciespatch">trunk/Tools/gtk/patches/xserver-remove-bogus-dependencies.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsgtkpatchesxserverfixglxinitpatch">trunk/Tools/gtk/patches/xserver-fix-glx-init.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192571 => 192572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-18 11:30:48 UTC (rev 192571)
+++ trunk/Tools/ChangeLog 2015-11-18 12:43:39 UTC (rev 192572)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-11-18 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Update xserver version in jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=151383
+
+ Reviewed by Alejandro G. Castro.
+
+ In r192568 I assumed the bots would have a recent enough Xvfb
+ to use the -displayfd option, but I forgot we build our own
+ xserver just for Xvfb. The version we build is too old, so
+ we could just use an updated version (the same bots have
+ installed, for example) to use the -displayfd option.
+
+ * gtk/jhbuild.modules: Update xserver to 1.16.4.
+ * gtk/patches/xserver-fix-glx-init.patch: Deleted.
+ * gtk/patches/xserver-remove-bogus-dependencies.patch: Updated to
+ apply on 1.16.4.
+
+2015-11-18 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Unreviewed. Fix webkitpy tests after r192568.
</span><span class="cx">
</span><span class="cx"> Instead of ignoring exception when closing mock fds, use a helper
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (192571 => 192572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules 2015-11-18 11:30:48 UTC (rev 192571)
+++ trunk/Tools/gtk/jhbuild.modules 2015-11-18 12:43:39 UTC (rev 192572)
</span><span class="lines">@@ -344,16 +344,15 @@
</span><span class="cx"> md5sum="64a3e2cda2687132cadca4efdc63f3b4"/>
</span><span class="cx"> </autotools>
</span><span class="cx">
</span><del>- <autotools id="xserver" autogenargs="--disable-xinerama --enable-glx --enable-composite --disable-xorg --disable-dmx --disable-xnest --disable-xquartz --disable-xwin --disable-xephyr --disable-xfake --disable-xfbdev --disable-install-setuid --disable-unit-tests --enable-unix-transport --enable-tcp-transport --disable-local-transport --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --with-xkb-bin-directory=/usr/bin --without-dtrace">
</del><ins>+ <autotools id="xserver" autogenargs="--disable-xinerama --enable-glx --enable-composite --disable-xorg --disable-dmx --disable-xnest --disable-xquartz --disable-xwin --disable-xephyr --disable-xfake --disable-xfbdev --disable-install-setuid --disable-unit-tests --disable-present --enable-unix-transport --enable-tcp-transport --disable-local-transport --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --with-xkb-bin-directory=/usr/bin --without-dtrace">
</ins><span class="cx"> <dependencies>
</span><span class="cx"> <dep package="pixman"/>
</span><span class="cx"> </dependencies>
</span><del>- <branch module="/releases/individual/xserver/xorg-server-1.12.4.tar.gz" version="1.12.4"
</del><ins>+ <branch module="/releases/individual/xserver/xorg-server-1.16.4.tar.bz2" version="1.16.4"
</ins><span class="cx"> repo="xorg"
</span><del>- hash="sha256:d88225cd3c4a6ecd92d1360b34a0e5b6346e2a04c842c018cef36d8a370714ef"
- md5sum="19c17bf7ac3e2ce34bc40108692c031f">
</del><ins>+ hash="sha256:abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871"
+ md5sum="80d140f631d862b76dc67ae983151c77">
</ins><span class="cx"> <patch file="xserver-remove-bogus-dependencies.patch" strip="1"/>
</span><del>- <patch file="xserver-fix-glx-init.patch" strip="1"/>
</del><span class="cx"> </branch>
</span><span class="cx"> </autotools>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsgtkpatchesxserverfixglxinitpatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/gtk/patches/xserver-fix-glx-init.patch (192571 => 192572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/xserver-fix-glx-init.patch 2015-11-18 11:30:48 UTC (rev 192571)
+++ trunk/Tools/gtk/patches/xserver-fix-glx-init.patch 2015-11-18 12:43:39 UTC (rev 192572)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-diff --git a/mi/miinitext.c b/mi/miinitext.c
-index 6ceae05..cda4e43 100644
---- a/mi/miinitext.c
-+++ b/mi/miinitext.c
-@@ -540,6 +540,9 @@ static ExtensionModule staticExtensions[] = {
- #ifdef DAMAGE
- {DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL},
- #endif
-+#ifdef GLXEXT
-+ {GlxExtensionInit, "GLX", &noGlxExtension, NULL},
-+#endif
- {NULL, NULL, NULL, NULL, NULL}
- };
-
</del></span></pre></div>
<a id="trunkToolsgtkpatchesxserverremovebogusdependenciespatch"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/patches/xserver-remove-bogus-dependencies.patch (192571 => 192572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/xserver-remove-bogus-dependencies.patch 2015-11-18 11:30:48 UTC (rev 192571)
+++ trunk/Tools/gtk/patches/xserver-remove-bogus-dependencies.patch 2015-11-18 12:43:39 UTC (rev 192572)
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> index 9f4992c..06830ae 100644
</span><span class="cx"> --- a/hw/vfb/Makefile.am
</span><span class="cx"> +++ b/hw/vfb/Makefile.am
</span><del>-@@ -25,7 +25,7 @@ XVFB_LIBS = \
- $(XSERVER_LIBS)
</del><ins>+@@ -20,7 +20,7 @@ XVFB_LIBS = \
+ $(top_builddir)/Xi/libXistubs.la
</ins><span class="cx">
</span><span class="cx"> Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
</span><span class="cx"> -Xvfb_DEPENDENCIES = $(XVFB_LIBS)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> index 34f53fc..3509306 100644
</span><span class="cx"> --- a/test/Makefile.am
</span><span class="cx"> +++ b/test/Makefile.am
</span><del>-@@ -117,7 +117,7 @@ libxservertest_la_LIBADD += \
</del><ins>+@@ -131,7 +131,7 @@ libxservertest_la_LIBADD += \
</ins><span class="cx"> endif
</span><span class="cx"> endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>