Title: [190622] trunk/Tools
- Revision
- 190622
- Author
- commit-qu...@webkit.org
- Date
- 2015-10-06 10:21:22 -0700 (Tue, 06 Oct 2015)
Log Message
[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.salisb...@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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (190621 => 190622)
--- trunk/Tools/ChangeLog 2015-10-06 17:20:23 UTC (rev 190621)
+++ trunk/Tools/ChangeLog 2015-10-06 17:21:22 UTC (rev 190622)
@@ -1,3 +1,25 @@
+2015-10-06 Mark Salisbury <mark.salisb...@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.
+
2015-10-06 Daniel Bates <dba...@webkit.org>
Enable XSLT when building WebKit for iOS using the public iOS SDK
Modified: trunk/Tools/gtk/jhbuild.modules (190621 => 190622)
--- 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)
@@ -38,24 +38,23 @@
<include href=""
+ <!-- Please use http/https to access repositories to be friendly to users stuck behind firewalls. -->
<repository type="git" name="github.com"
- href=""
+ href=""
<repository type="tarball" name="sourceware.org-mirror"
href=""
<repository type="tarball" name="ftp.gnome.org"
href=""
<repository type="git" name="git.gnome.org"
- href=""
+ href=""
<repository type="tarball" name="cairographics.org"
href=""
<repository type="tarball" name="freedesktop.org"
href=""
<repository type="tarball" name="xorg"
href=""
- <repository type="tarball" name="ftp.freedesktop.org"
- href=""
<repository type="tarball" name="xmlsoft.org"
- href=""
+ href=""
<repository type="tarball" name="gstreamer"
href=""
<repository type="tarball" name="savannah.gnu.org"
@@ -274,9 +273,8 @@
</autotools>
<autotools id="libxml2"
- autogen-sh="configure"
- autogenargs="--without-python">
- <branch module="/libxml2/libxml2-2.9.1.tar.gz" version="2.9.1"
+ autogen-sh="./autogen.sh; ./configure --with-python=no">
+ <branch module="/sources/libxml2-2.9.1.tar.gz" version="2.9.1"
repo="xmlsoft.org"
hash="sha256:fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb"
md5sum="9c0cfef285d5c4a5c80d00904ddab380"/>
@@ -362,10 +360,9 @@
<autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri --with-gallium-drivers=swrast" skip-install="true">
<!--- WARNING: At jhbuildrc, when we define the path to the Gallium llvmpipe software rasterizer (needed by XvfbDriver),
we assume that the directory is named "Mesa". So, don't change the checkoutdir name even if you update the version. -->
- <branch module="/pub/mesa/10.5.4/mesa-10.5.4.tar.xz" version="10.5.4"
+ <branch module="git/mesa/mesa.git" version="10.5.4" tag="mesa-10.5.4"
checkoutdir="Mesa"
- repo="ftp.freedesktop.org"
- hash="sha256:b51e723f3a20d842c88a92d809435b229fc4744ca0dbec0317d9d4a3ac4c6803">
+ repo="freedesktop-git">
</branch>
</autotools>
Modified: trunk/Tools/jhbuild/jhbuild-wrapper (190621 => 190622)
--- 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)
@@ -82,7 +82,7 @@
os.makedirs(installation_prefix)
# Use only 1 thread to workaround a QEMU bug - see http://webkit.org/b/143095 for details.
- process = subprocess.Popen(['git', 'clone', '--config', 'pack.threads=1', 'git://git.gnome.org/jhbuild'], cwd=source_path)
+ process = subprocess.Popen(['git', 'clone', '--config', 'pack.threads=1', 'https://git.gnome.org/browse/jhbuild'], cwd=source_path)
process.wait()
if process.returncode != 0:
raise Exception('jhbuild git clone failed with return code: %i' % process.returncode)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
