<!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>[190622] 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/190622">190622</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-06 10:21:22 -0700 (Tue, 06 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Make update-webkitgtk-libs work behind firewall
update-webkitgtk-libs can work behind a firewall with changes to
a few packages. Where outbound git and active FTP connections
fail, using http protocol succeeds. Most packages are
already accessed using http.
https://bugs.webkit.org/show_bug.cgi?id=148941
Patch by Mark Salisbury <mark.salisbury@hp.com> on 2015-10-06
Reviewed by Martin Robinson.
Tools
* gtk/jhbuild.modules:
Replace git URLs with http. Remove no longer used ftp repositories.
Update argument for libxml2's autogen.sh script (--without-python
is ignored; --with-python=no is correct).
* jhbuild/jhbuild-wrapper:
Instead of connecting to git://git.gnome.org/jhbuild, connect to
http://git.gnome.org/browse/jhbuild.</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="#trunkToolsjhbuildjhbuildwrapper">trunk/Tools/jhbuild/jhbuild-wrapper</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190621 => 190622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-10-06 17:20:23 UTC (rev 190621)
+++ trunk/Tools/ChangeLog        2015-10-06 17:21:22 UTC (rev 190622)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-10-06 Mark Salisbury <mark.salisbury@hp.com>
+
+ [GTK] Make update-webkitgtk-libs work behind firewall
+
+ update-webkitgtk-libs can work behind a firewall with changes to
+ a few packages. Where outbound git and active FTP connections
+ fail, using http protocol succeeds. Most packages are
+ already accessed using http.
+
+ https://bugs.webkit.org/show_bug.cgi?id=148941
+
+ Reviewed by Martin Robinson.
+
+ Tools
+ * gtk/jhbuild.modules:
+ Replace git URLs with http. Remove no longer used ftp repositories.
+ Update argument for libxml2's autogen.sh script (--without-python
+ is ignored; --with-python=no is correct).
+ * jhbuild/jhbuild-wrapper:
+ Instead of connecting to git://git.gnome.org/jhbuild, connect to
+ http://git.gnome.org/browse/jhbuild.
+
</ins><span class="cx"> 2015-10-06 Daniel Bates <dbates@webkit.org>
</span><span class="cx">
</span><span class="cx"> Enable XSLT when building WebKit for iOS using the public iOS SDK
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (190621 => 190622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules        2015-10-06 17:20:23 UTC (rev 190621)
+++ trunk/Tools/gtk/jhbuild.modules        2015-10-06 17:21:22 UTC (rev 190622)
</span><span class="lines">@@ -38,24 +38,23 @@
</span><span class="cx">
</span><span class="cx"> <include href="jhbuild-optional.modules"/>
</span><span class="cx">
</span><ins>+ <!-- Please use http/https to access repositories to be friendly to users stuck behind firewalls. -->
</ins><span class="cx"> <repository type="git" name="github.com"
</span><del>- href="git://github.com"/>
</del><ins>+ href="https://github.com"/>
</ins><span class="cx"> <repository type="tarball" name="sourceware.org-mirror"
</span><span class="cx"> href="http://mirrors.kernel.org/sources.redhat.com/"/>
</span><span class="cx"> <repository type="tarball" name="ftp.gnome.org"
</span><span class="cx"> href="http://ftp.gnome.org"/>
</span><span class="cx"> <repository type="git" name="git.gnome.org"
</span><del>- href="git://git.gnome.org/"/>
</del><ins>+ href="https://git.gnome.org/browse/"/>
</ins><span class="cx"> <repository type="tarball" name="cairographics.org"
</span><span class="cx"> href="http://cairographics.org"/>
</span><span class="cx"> <repository type="tarball" name="freedesktop.org"
</span><span class="cx"> href="http://www.freedesktop.org"/>
</span><span class="cx"> <repository type="tarball" name="xorg"
</span><span class="cx"> href="http://xorg.freedesktop.org"/>
</span><del>- <repository type="tarball" name="ftp.freedesktop.org"
- href="ftp://ftp.freedesktop.org"/>
</del><span class="cx"> <repository type="tarball" name="xmlsoft.org"
</span><del>- href="ftp://xmlsoft.org"/>
</del><ins>+ href="http://xmlsoft.org"/>
</ins><span class="cx"> <repository type="tarball" name="gstreamer"
</span><span class="cx"> href="http://gstreamer.freedesktop.org/src/"/>
</span><span class="cx"> <repository type="tarball" name="savannah.gnu.org"
</span><span class="lines">@@ -274,9 +273,8 @@
</span><span class="cx"> </autotools>
</span><span class="cx">
</span><span class="cx"> <autotools id="libxml2"
</span><del>- autogen-sh="configure"
- autogenargs="--without-python">
- <branch module="/libxml2/libxml2-2.9.1.tar.gz" version="2.9.1"
</del><ins>+ autogen-sh="./autogen.sh; ./configure --with-python=no">
+ <branch module="/sources/libxml2-2.9.1.tar.gz" version="2.9.1"
</ins><span class="cx"> repo="xmlsoft.org"
</span><span class="cx"> hash="sha256:fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb"
</span><span class="cx"> md5sum="9c0cfef285d5c4a5c80d00904ddab380"/>
</span><span class="lines">@@ -362,10 +360,9 @@
</span><span class="cx"> <autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri --with-gallium-drivers=swrast" skip-install="true">
</span><span class="cx"> <!--- WARNING: At jhbuildrc, when we define the path to the Gallium llvmpipe software rasterizer (needed by XvfbDriver),
</span><span class="cx"> we assume that the directory is named "Mesa". So, don't change the checkoutdir name even if you update the version. -->
</span><del>- <branch module="/pub/mesa/10.5.4/mesa-10.5.4.tar.xz" version="10.5.4"
</del><ins>+ <branch module="git/mesa/mesa.git" version="10.5.4" tag="mesa-10.5.4"
</ins><span class="cx"> checkoutdir="Mesa"
</span><del>- repo="ftp.freedesktop.org"
- hash="sha256:b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803">
</del><ins>+ repo="freedesktop-git">
</ins><span class="cx"> </branch>
</span><span class="cx"> </autotools>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsjhbuildjhbuildwrapper"></a>
<div class="modfile"><h4>Modified: trunk/Tools/jhbuild/jhbuild-wrapper (190621 => 190622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jhbuild/jhbuild-wrapper        2015-10-06 17:20:23 UTC (rev 190621)
+++ trunk/Tools/jhbuild/jhbuild-wrapper        2015-10-06 17:21:22 UTC (rev 190622)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> os.makedirs(installation_prefix)
</span><span class="cx">
</span><span class="cx"> # Use only 1 thread to workaround a QEMU bug - see http://webkit.org/b/143095 for details.
</span><del>- process = subprocess.Popen(['git', 'clone', '--config', 'pack.threads=1', 'git://git.gnome.org/jhbuild'], cwd=source_path)
</del><ins>+ process = subprocess.Popen(['git', 'clone', '--config', 'pack.threads=1', 'https://git.gnome.org/browse/jhbuild'], cwd=source_path)
</ins><span class="cx"> process.wait()
</span><span class="cx"> if process.returncode != 0:
</span><span class="cx"> raise Exception('jhbuild git clone failed with return code: %i' % process.returncode)
</span></span></pre>
</div>
</div>
</body>
</html>