Changeset 190622 in webkit

Timestamp:

Oct 6, 2015 10:21:22 AM (9 years ago)

Author:

commit-queue@webkit.org

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.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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/jhbuild.modules (modified) (5 diffs)
• jhbuild/jhbuild-wrapper (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+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.
+
 2015-10-06  Daniel Bates  <dbates@webkit.org>
 

trunk/Tools/gtk/jhbuild.modules

@@ -39 +39 @@
   <include href="jhbuild-optional.modules"/>
 
+  <!-- Please use http/https to access repositories to be friendly to users stuck behind firewalls. -->
   <repository type="git" name="github.com"
-      href="git://github.com"/>
+      href="https://github.com"/>
   <repository type="tarball" name="sourceware.org-mirror"
       href="http://mirrors.kernel.org/sources.redhat.com/"/>
@@ -46 +47 @@
       href="http://ftp.gnome.org"/>
   <repository type="git" name="git.gnome.org"
-      href="git://git.gnome.org/"/>
+      href="https://git.gnome.org/browse/"/>
   <repository type="tarball" name="cairographics.org"
       href="http://cairographics.org"/>
@@ -53 +54 @@
   <repository type="tarball" name="xorg"
       href="http://xorg.freedesktop.org"/>
-  <repository type="tarball" name="ftp.freedesktop.org"
-      href="ftp://ftp.freedesktop.org"/>
   <repository type="tarball" name="xmlsoft.org"
-      href="ftp://xmlsoft.org"/>
+      href="http://xmlsoft.org"/>
   <repository type="tarball" name="gstreamer"
       href="http://gstreamer.freedesktop.org/src/"/>
@@ -275 +274 @@
 
   <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"
@@ -363 +361 @@
     <!--- 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>

trunk/Tools/jhbuild/jhbuild-wrapper

@@ -83 +83 @@
 
     # 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: