From 1526621b8ec0c62d0aad218eda45779a5cdf6865 Mon Sep 17 00:00:00 2001
From: Antoine Martin <totaam@xpra.org>
Date: Wed, 3 Jan 2018 16:31:34 +0000
Subject: [PATCH] #1575: reduce our diff against upstream

git-svn-id: https://xpra.org/svn/Xpra/trunk@17847 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 .../modulesets-stable/bootstrap.modules       |  88 ++--
 .../gtk-osx-bootstrap.modules                 |  60 ++-
 .../modulesets-stable/gtk-osx-network.modules | 490 ++++++++----------
 .../modulesets-stable/gtk-osx-python.modules  |  61 +--
 4 files changed, 309 insertions(+), 390 deletions(-)

diff --git a/osx/jhbuild/modulesets-stable/bootstrap.modules b/osx/jhbuild/modulesets-stable/bootstrap.modules
index 530a7d2446..0680a008ac 100644
--- a/osx/jhbuild/modulesets-stable/bootstrap.modules
+++ b/osx/jhbuild/modulesets-stable/bootstrap.modules
@@ -21,13 +21,9 @@
   <repository type="tarball" name="intltool"
               href="http://launchpad.net/intltool/trunk/"/>
 
-  <autotools id="make" bootstrap="true">
-    <branch repo="ftp.gnu.org" module="make/make-3.82.tar.gz" version="3.82"/>
-  </autotools>
-
   <autotools id='readline' autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
-      version="6.3">
+    <branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
+      version="7.0">
     </branch>
   </autotools>
 
@@ -40,29 +36,21 @@
   </autotools>
 
   <autotools id="xz" autogen-sh="configure" bootstrap="true">
-    <branch repo="tukaani.org" module="xz/xz-5.2.1.tar.bz2" version="5.2.1"/>
+    <branch repo="tukaani.org" module="xz/xz-5.2.3.tar.bz2" version="5.2.3"/>
   </autotools>
 
   <autotools id="apr">
-    <branch repo="apache.org" module="apr/apr-1.4.5.tar.bz2" version="1.4.5"/>
+    <branch repo="apache.org" module="apr/apr-1.5.2.tar.bz2" version="1.5.2"/>
   </autotools>
 
   <autotools id="apr-util" autogenargs="--with-apr=$PREFIX/bin/apr-1-config">
-    <branch repo="apache.org" module="apr/apr-util-1.3.12.tar.bz2"
-            version="1.3.12"/>
-    <dependencies>
+    <branch repo="apache.org" module="apr/apr-util-1.5.4.bz2"
+            version="1.5.4" />
+      <dependencies>
       <dep package="apr"/>
     </dependencies>
   </autotools>
 
-  <autotools id="subversion">
-    <branch repo="apache.org" module="subversion/subversion-1.5.9.tar.bz2"
-            version="1.5.9"/>
-    <dependencies>
-      <dep package="apr-util"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gettext-tools" autogen-sh="configure"
              autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf --disable-csharp --with-included-glib">
     <branch repo="ftp.gnu.org" source-subdir="gettext-tools"
@@ -72,29 +60,22 @@
   <!-- cmakes ./configure is picky about invalid flags so we manually set it -->
   <autotools id="cmake" autogen-sh="bootstrap"
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s">
-    <branch repo="cmake" module="v3.2/cmake-3.2.1.tar.gz" version="3.2.1">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/cmake-libnetwork.patch" strip="1"/>
+    <branch repo="cmake" module="v3.10/cmake-3.10.0.tar.gz" version="3.10.0">
     </branch>
   </autotools>
 
-  <autotools id="m4" autogen-sh="configure" bootstrap="true">
-    <branch repo="ftp.gnu.org"
-            module="m4/m4-1.4.17.tar.xz" version="1.4.17"/>
-  </autotools>
-
   <autotools id="autoconf" autogen-sh="configure" bootstrap="true">
     <branch repo="ftp.gnu.org"
             module="autoconf/autoconf-2.69.tar.xz" version="2.69"/>
     <dependencies>
       <dep package="xz"/>
-      <dep package="m4"/>
     </dependencies>
   </autotools>
 
   <autotools id="autoconf-archive" autogen-sh="configure">
     <branch repo="ftp.gnu.org"
-            module="autoconf-archive/autoconf-archive-2016.09.16.tar.xz"
-            version="2016-09.16"/>
+            module="autoconf-archive/autoconf-archive-2017.03.21.tar.xz"
+            version="2017-03-21"/>
   </autotools>
 
   <autotools id="libtool" autogen-sh="configure" bootstrap="true">
@@ -154,38 +135,38 @@
   <autotools id="pkg-config" autogen-sh="configure"
              autogenargs="--with-internal-glib">
     <branch repo="pkgconfig"
-            module="pkg-config-0.28.tar.gz" version="0.28"/>
+            module="pkg-config-0.29.2.tar.gz" version="0.29.2"/>
   </autotools>
 
-  <!-- 10.5-10.10 have 2.3, gstreamer requires 2.4. -->
+  <!-- MacOS provides 2.3 (presumably the last GPL2 version, gstreamer
+       requires 2.4. -->
   <autotools id="bison" autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="bison/bison-3.0.2.tar.xz"
-            version="3.0.2"/>
-  </autotools>
-
-  <autotools id="bison2" autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="bison/bison-2.7.1.tar.xz"
-            version="2.7.1"/>
+    <branch repo="ftp.gnu.org" module="bison/bison-3.0.4.tar.xz"
+            version="3.0.4">
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/bison-3.0.4-vasnprintf.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package='flex'/>
+    </dependencies>
   </autotools>
-
-  <!-- 10.4 has 2.5.4, too old for gstreamer (and probably others as well)
-       10.6-10.10 have 2.5.35, 10.5 2.5.33 -->
+  
+  <!-- MacOS hasn't updated flex since 2012. Since it's BSD-licensed
+       it must be just because Apple doesn't use it and doesn't
+       care. We'll provide something more up-to-date. -->
   <autotools id="flex" autogen-sh="configure">
-    <branch repo="sourceforge" module="flex/flex-2.5.37.tar.bz2"
-            version="2.5.37"/>
+    <branch module="flex/flex-2.6.0.tar.xz" version="2.6.0"
+            repo="sourceforge" />
   </autotools>
-
-  <!-- Expat could be skipped for >= 10.5 since it's is part of the SDK there. -->
+  
   <autotools id="expat" autogen-sh="configure">
-    <branch module="expat/expat-2.2.0.tar.gz" version="2.2.0"
-            hash="sha256:d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff"/>
+    <branch module="expat/expat-2.2.0.tar.bz2" version="2.2.0"
             repo="sourceforge"/>
   </autotools>
 
   <perl id="perl-xml-parser" makeargs="EXPATLIBPATH=${prefix}/lib EXPATINCPATH=${prefix}/include">
     <branch repo="cpan"
-            module="authors/id/T/TO/TODDR/XML-Parser-2.41.tar.gz"
-            version="2.41"/>
+            module="authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz"
+            version="2.44"/>
     <dependencies>
       <dep package="expat"/>
     </dependencies>
@@ -203,8 +184,8 @@
 
   <!-- Needed for building Gnome apps from the repository -->
   <autotools id="gnome-common">
-    <branch module="gnome-common/3.14/gnome-common-3.14.0.tar.xz" version="3.14.0"
-            hash="sha256:4c00242f781bb441289f49dd80ed1d895d84de0c94bfc2c6818a104c9e39262c"/>
+    <branch module="gnome-common/3.18/gnome-common-3.18.0.tar.xz" version="3.18.0"
+            hash="sha256:22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"/>
   </autotools>
   <!-- This is generated by tarring up the needed docbook stylesheets
        for gtk-doc to work. If someone wants to work on a setup that
@@ -215,7 +196,7 @@
   -->
   <autotools id="gtk-osx-docbook" autogen-sh="configure"
              supports-non-srcdir-builds="no" >
-    <branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.2.tar.gz"
+    <branch repo="sourceforge" module="gtk-osx/gtk-osx-docbook-1.2.tar.bz2"
             version="1.2"/>
   </autotools>
 
@@ -232,13 +213,10 @@
   <metamodule id="meta-bootstrap">
     <dependencies>
       <dep package="xz"/>
-      <dep package="make"/>     <!-- Needed for Tiger, skipped otherwise -->
-      <dep package="subversion"/>   <!-- Needed for Tiger, skipped otherwise -->
       <dep package="gettext-tools" /> <!-- Needed for 64-bit -->
       <dep package="readline" />
       <dep package="bash" />  <!-- Needed for El Cap and later to work around SIP. -->
       <dep package="cmake"/>
-      <dep package="m4"/>	<!-- Can be skipped for Leopard and later -->
       <dep package="autoconf" />
       <dep package="autoconf-archive" />
       <dep package="libtool" />
diff --git a/osx/jhbuild/modulesets-stable/gtk-osx-bootstrap.modules b/osx/jhbuild/modulesets-stable/gtk-osx-bootstrap.modules
index db41fb0558..92896e1260 100644
--- a/osx/jhbuild/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/osx/jhbuild/modulesets-stable/gtk-osx-bootstrap.modules
@@ -4,12 +4,12 @@
 <moduleset>
 
   <repository type="tarball" name="ftp.gnome.org" default="yes"
-	      href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
+              href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
   <repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="sourceforge"
-	      href="http://downloads.sourceforge.net/sourceforge/"/>
+              href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="jpeg"
-	      href="http://www.ijg.org/files/"/>
+              href="http://www.ijg.org/files/"/>
   <repository type="tarball" name="libtiff"
 	      href="http://download.osgeo.org/"/>
   <repository type="tarball" name="fontconfig"
@@ -28,6 +28,12 @@
   <repository type="tarball" name="ragel"
               href="http://www.colm.net/files/ragel/"/>
 
+  <autotools id='readline' autogen-sh="configure">
+    <branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
+      version="7.0">
+    </branch>
+  </autotools>
+  
   <autotools id="libpng" autogenargs="--enable-shared" autogen-sh="configure">
     <branch version="1.6.29" module="libpng/libpng-1.6.34.tar.xz"
             repo="sourceforge" hash="sha256:2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"/>
@@ -70,7 +76,7 @@
   </autotools>
 
   <autotools id="libxslt" autogen-sh="configure">
-    <branch version="1.1.28" module="libxslt-1.1.28.tar.gz"
+    <branch version="1.1.29" module="libxslt-1.1.29.tar.gz"
 	    repo="xmlsoft.org"/>
     <dependencies>
       <dep package="libxml2"/>
@@ -86,8 +92,8 @@
   </autotools>
 
   <autotools id="yelp-xsl">
-    <branch version="3.16.1" module="yelp-xsl/3.16/yelp-xsl-3.16.1.tar.xz"
-            hash="sha256:3295eecc4b03d2a239f7a1bdf4a1311d34c46c3055e6535c1f72bb5a49b4174a"/>
+    <branch version="3.20.1" module="yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz"
+            hash="sha256:dc61849e5dca473573d32e28c6c4e3cf9c1b6afe241f8c26e29539c415f97ba0"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
@@ -96,8 +102,8 @@
   </autotools>
 
   <autotools id="yelp-tools">
-    <branch version="3.16.1" module="yelp-tools/3.16/yelp-tools-3.16.1.tar.xz"
-            hash="sha256:b4f66c145af1c6448dc51037d305d6844da13dc31d07729b8e29005ee4fef89c"/>
+    <branch version="3.18.0" module="yelp-tools/3.18/yelp-tools-3.18.0.tar.xz"
+            hash="sha256:c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
@@ -108,8 +114,8 @@
 
   <autotools id="gtk-doc" autogen-sh="configure"
              autogenargs="--with-xml-catalog=$JHBUILD_PREFIX/share/xml/catalog">
-    <branch version="1.21" module="gtk-doc/1.21/gtk-doc-1.21.tar.xz"
-            hash="sha256:5d934d012ee08edd1585544792efa80da271652587ba5b843d2cea8e8b80ee3e"/>
+    <branch version="1.25" module="gtk-doc/1.25/gtk-doc-1.25.tar.xz"
+            hash="sha256:1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42"/>
     <dependencies>
       <dep package="libxml2"/>
       <dep package="itstool"/>
@@ -119,20 +125,21 @@
 
   <autotools id="icu" autogen-sh="source/configure" autogenargs="--enable-rpath"
              makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
-    <branch repo="icu" version="55.1" checkoutdir="icu"
-            module="icu4c/55.1/icu4c-55_1-src.tgz"/>
+    <branch repo="icu" version="58.2" checkoutdir="icu"
+            module="icu4c/58.2/icu4c-58_2-src.tgz"/>
   </autotools>
 
+
   <autotools id="ragel" autogen-sh='autoreconf'>
-    <branch repo="ragel" module="ragel-6.9.tar.gz" version="6.9">
+    <branch repo="ragel" module="ragel-6.10.tar.gz" version="6.10">
       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/ragel-6.9-setiosflags.patch" strip="1"/>
     </branch>
   </autotools>
 
   <autotools id="harfbuzz" autogen-sh="configure"
              autogenargs="--with-coretext --with-freetype --with-icu">
-    <branch repo="harfbuzz" module="harfbuzz-0.9.40.tar.bz2" version="0.9.40">
-       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/harfbuzz-kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch" strip="1"/>
+    <branch repo="harfbuzz" module="harfbuzz-1.4.5.tar.bz2" version="1..45">
+       <!--patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/harfbuzz-kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch" strip="1"/-->
     </branch>
     <dependencies>
       <dep package="freetype-no-harfbuzz"/>
@@ -140,14 +147,17 @@
       <dep package="glib"/>
       <dep package="icu"/>
     </dependencies>
+    <after>
+      <dep package="icu55"/>
+    </after>
   </autotools>
 
   <autotools id="freetype-no-harfbuzz" autogen-sh="configure"
              skip-autogen="never"
              autogenargs="--without-bzip2 --without-harfbuzz">
-    <branch module="freetype/freetype-2.5.3.tar.gz" version="2.5.3"
-	    repo="sourceforge">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/freetype-2.5.3-ccexe_cflags.patch" strip="1"/>
+    <branch module="freetype/freetype-2.7.1.tar.gz" version="2.7.1"
+            repo="sourceforge">
+      <!--patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/freetype-2.5.3-ccexe_cflags.patch" strip="1"/-->
     </branch>
     <dependencies>
       <dep package="zlib"/>
@@ -156,7 +166,7 @@
 
   <autotools id="freetype" autogen-sh="configure" skip-autogen="never"
 	     autogenargs="--without-bzip2">
-    <branch module="freetype/freetype-2.5.3.tar.gz" version="2.5.3"
+    <branch module="freetype/freetype-2.7.1.tar.gz" version="2.7.1"
             repo="sourceforge">
     </branch>
     <dependencies>
@@ -166,9 +176,9 @@
   </autotools>
 
   <autotools id="fontconfig" autogen-sh="autoreconf"
-	     autogenargs="--disable-docs">
-    <branch repo="fontconfig" version="2.11.1"
-            module="fontconfig-2.11.1.tar.bz2"/>
+             autogenargs="--disable-docs">
+    <branch repo="fontconfig" version="2.12.1"
+            module="fontconfig-2.12.1.tar.bz2"/>
     <dependencies>
       <dep package="freetype"/>
     </dependencies>
@@ -186,12 +196,6 @@
             module="gettext/gettext-0.19.8.tar.xz" version="0.19.8"/>
   </autotools>
 
-  <autotools id='readline' autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="readline/readline-7.0.tar.gz"
-      version="7.0">
-    </branch>
-  </autotools>
-
   <metamodule id="meta-gtk-osx-bootstrap">
     <dependencies>
       <dep package="libpng"/>
diff --git a/osx/jhbuild/modulesets-stable/gtk-osx-network.modules b/osx/jhbuild/modulesets-stable/gtk-osx-network.modules
index 3781c069ec..1f84bbb0d6 100644
--- a/osx/jhbuild/modulesets-stable/gtk-osx-network.modules
+++ b/osx/jhbuild/modulesets-stable/gtk-osx-network.modules
@@ -1,267 +1,223 @@
-<?xml version="1.0"?>
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-  <repository name="ftp.gnome.org" type="tarball" default="yes"
-              href="http://ftp.gnome.org/pub/GNOME/sources/"/>
-  <repository name="openssl" type="tarball"
-              href="ftp://ftp.openssl.org/source/"/>
-  <repository name="ftp.gnu.org" type="tarball" href="ftp://ftp.gnu.org/gnu/"/>
-  <repository name="sourceforge" type="tarball"
-              href="http://downloads.sourceforge.net/sourceforge/"/>
-  <repository name="gnutls" type="tarball" href="ftp://ftp.gnutls.org/"/>
-  <repository name="webm" type="tarball"
-              href="http://downloads.webmproject.org/releases/"/>
-  <repository name="webkit.org" type="tarball"
-              href="http://www.webkitgtk.org/releases/"/>
-  <repository type="tarball" name="github.com" default="yes" href="https://github.com/"/>
-  <repository type="tarball" name="zlib.net" default="yes" href="http://zlib.net/"/>
-
-  <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
-  <metamodule id="meta-gtk-osx-webkit">
-    <dependencies>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="WebKit"/>
-    </dependencies>
-  </metamodule>
-
-  <!-- Same as meta-gtk-osx-webkit above, but builds the last version that
-  worked on SDK <= 10.5 -->
-  <metamodule id="meta-gtk-osx-webkit1.6">
-    <dependencies>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="WebKit1.6"/>
-    </dependencies>
-  </metamodule>
-
-  <!-- Builds latest stable version of WebKitGTK for GTK 3.x -->
-  <metamodule id="meta-gtk-osx-webkit-gtk3">
-    <dependencies>
-      <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="webkit2gtk3"/>
-    </dependencies>
-  </metamodule>
-
-  <!-- of the many arguments such as prefix and libdir that jhbuild might pass
-  to configure, openssl only understands prefix, and only with =. -->
-  <autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
-             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl %(autogenargs)s"
-             makeinstallargs="install_sw" supports-non-srcdir-builds="no">
-    <branch module="openssl-1.1.0g.tar.gz" version="1.1.0g"
-    		hash="sha256:de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af" repo="openssl"/>
-  </autotools>
-
-  <!-- Rudely demands TeX to build documentation -->
-  <!-- Assembler files are missing md5-compress.asm for x86_64 -->
-  <autotools id="libnettle" autogen-sh="configure"
-             autogenargs="--disable-documentation --disable-assembler">
-    <!-- gnutls 3.3.x does not support nettle 3.0 -->
-    <branch repo="ftp.gnu.org" version="2.7.1"
-            module="nettle/nettle-2.7.1.tar.gz">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/libnettle-cc-for-build-needs-cflags.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="gmp"/>
-      <dep package="openssl"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libtasn1" supports-non-srcdir-builds="no"
-             autogen-sh="configure">
-    <branch repo="ftp.gnu.org" version="4.12"
-            module="/libtasn1/libtasn1-4.12.tar.gz"/>
-  </autotools>
-
-  <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
-             supports-non-srcdir-builds="no">
-    <branch repo="zlib.net" version="1.2.11"
-            module="zlib-1.2.11.tar.gz"
-            hash="sha256:c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"
-            />
-  </autotools>
-
-  <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
-  <autotools id="gnutls" autogen-sh="configure"
-             autogenargs="--disable-gtk-doc-html --without-p11-kit">
-    <branch repo="gnutls" version="3.3.12"
-            module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
-    <dependencies>
-      <dep package="libnettle"/>
-      <dep package="libtasn1"/>
-      <dep package="zlib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="glib-networking" autogen-sh="configure"
-             autogenargs="--without-ca-certificates set_more_warnings=no">
-    <branch module="glib-networking/2.44/glib-networking-2.44.0.tar.xz"
-            hash="sha256:8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"
-            version="2.44.0"/>
-    <dependencies>
-      <dep package="gnutls"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libsoup" autogen-sh="configure"
-             autogenargs="set_more_warnings=no">
-    <branch module="libsoup/2.48/libsoup-2.48.1.tar.xz" version="2.48.1"
-            hash="sha256:9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="glib-networking"/>
-      <dep package="sqlite"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libwebp" autogen-sh="configure">
-    <branch repo="github.com" module="/webmproject/libwebp/archive/v0.6.0.tar.gz" version="0.6.0"
-    	hash="sha256:e1bd8b81098b8094edba0f161baf89f9fb1492e3fca19cf1d28eff4b88518702"
-    />
-  </autotools>
-
-  <!-- This is WebKitGTK 1.x, for GTK 2.x.
-    disable-geolocation: Requires geoclue. No module for this yet.
-    disable-video: Requires gstreamer. If you want video, add to .jhbuildrc:
-      append_autogenargs('WebKit', '&#45;-enable-video')
-    Wno-c++11-extensions: Suppresses clang warning that makes output
-      inconvenient to read.
-    std=c99: Required for inline keyword in C.
-  -->
-  <autotools id="WebKit" autogen-sh="autoreconf"
-             autogenargs='--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=2.0 --disable-geolocation --disable-webkit2 CXXFLAGS="$CXXFLAGS -Wno-c++11-extensions" CFLAGS="$CFLAGS -std=c99"'>
-    <branch repo="webkit.org" module="webkitgtk-1.10.2.tar.xz" version="1.10.2">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-no-x11.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-88407-portable-echo-n.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-platform-fixes.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-pango-includes.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.10-remove-pangoft2-dependency.patch"
-             strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="enchant"/>
-      <dep package="icu"/>
-      <dep package="libsoup"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="meta-gstreamer-1.0"/>
-      <dep package="meta-gtk-osx-gtk3"/>
-    </after>
-  </autotools>
-
-  <!--WebKit 1.10 doesn't build with the 10.5 SDK, so use this older version for
-  old builds.-->
-  <autotools id="WebKit1.6" autogen-sh="configure"
-             autogenargs="--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=2.0">
-    <branch repo="webkit.org" module="webkit-1.6.1.tar.gz" version="1.6.1">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-no-x11.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-pango-includes.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-utf8-include.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-enable-blob.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-gnome-3.6-fixup.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-clang-fixup.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-out-of-source-fixup.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-remove-pangoft2-dependency.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/bug-92264-webkit-bison-2.6.patch"
-             strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="enchant"/>
-      <dep package="icu"/>
-      <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-core"/>
-      <dep package="meta-gstreamer-1.0"/>
-      <dep package="meta-gtk-osx-gtk3"/>
-    </after>
-  </autotools>
-
-  <!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
-    disable-webkit2: Requires both GTK2 and 3. Currently not supported.
-    disable-credential-storage: Requires libsecret. No module for this yet.
-    disable-geolocation: Requires geoclue 1 or 2. No module for this yet.
-    disable-video, disable-web-audio: Requires gstreamer. If you want video and
-      audio, add this to your .jhbuildrc:
-      append_autogenargs('WebKit', '&#45;-enable-video')
-      append_autogenargs('WebKit', '&#45;-enable-web-audio')
-    -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
-  -->
-  <autotools id="webkit1gtk3" autogen-sh="autoreconf"
-             autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 --disable-credential-storage --disable-geolocation --disable-video --disable-web-audio CXXFLAGS='-std=gnu++11'">
-    <branch repo="webkit.org" module="webkitgtk-2.4.9.tar.xz" version="2.4.9">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch"
-             strip="1"/>
-      <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
-      it's left in -->
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch"
-             strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libwebp"/>
-      <dep package="enchant"/>
-      <dep package="icu"/>
-      <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gstreamer-1.0"/>
-    </after>
-  </autotools>
-
-  <!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
-      the WebKit2 API (most applications do.)
-    ENABLE_MINIBROWSER: This is enabled because it's an easy test of whether the
-      library is working correctly: run "jhbuild run MiniBrowser".
-    ENABLE_PLUGIN_PROCESS_GTK2: Requires both GTK 2.x and 3.x. Currently not
-      supported.
-    ENABLE_VIDEO, ENABLE_WEB_AUDIO: Requires gstreamer. If you want video and
-      audio, fix this in your .jhbuildrc-custom. You may need some extra
-      patches, this is untested.
-    ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this yet.
-    ENABLE_GEOLOCATION: Requires geoclue. No module for this yet.
-    ENABLE_OPENGL: Untested.
-    USE_LIBNOTIFY: Requires libnotify. No module for this yet.
-    USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
-  -->
-  <cmake id="webkit2gtk3"
-         cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON -DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF -DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'">
-    <branch repo="webkit.org" module="webkitgtk-2.10.2.tar.xz" version="2.10.2">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144561-quartz-backend.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144560-platform-fixes.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-144785-link-injected-bundle.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148606-build-texture-mapper-gl-separately.patch"
-             strip="1"/>
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-148607-include-stub-for-plugin-permission-request.patch"
-             strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libwebp"/>
-      <dep package="enchant"/>
-      <dep package="icu"/>
-      <dep package="libsoup"/>
-      <dep package="meta-gtk-osx-freetype"/>
-    </dependencies>
-    <after>
-      <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gstreamer-1.0"/>
-    </after>
-  </cmake>
-</moduleset>
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+  <repository name="ftp.gnome.org" type="tarball" default="yes"
+              href="http://ftp.gnome.org/pub/GNOME/sources/"/>
+  <repository name="openssl" type="tarball"
+              href="https://www.openssl.org/source/"/>
+  <repository name="ftp.gnu.org" type="tarball" href="ftp://ftp.gnu.org/gnu/"/>
+  <repository name="sourceforge" type="tarball"
+              href="http://downloads.sourceforge.net/sourceforge/"/>
+  <repository name="gnutls" type="tarball" href="ftp://ftp.gnutls.org/"/>
+  <repository name="webm" type="tarball"
+              href="http://downloads.webmproject.org/releases/"/>
+  <repository name="webkit.org" type="tarball"
+              href="http://www.webkitgtk.org/releases/"/>
+  <repository type="tarball" name="icu"
+              href="http://download.icu-project.org/files/"/>
+
+  <!-- Builds last version of WebKitGTK that supported GTK 2.x -->
+  <metamodule id="meta-gtk-osx-webkit">
+    <dependencies>
+      <dep package="meta-gtk-osx-core"/>
+      <dep package="webkit"/>
+    </dependencies>
+  </metamodule>
+
+  <!-- Builds latest stable version of WebKitGTK for GTK 3.x -->
+  <metamodule id="meta-gtk-osx-webkit-gtk3">
+    <dependencies>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="webkit2gtk3"/>
+    </dependencies>
+  </metamodule>
+
+  <!-- of the many arguments such as prefix and libdir that jhbuild might pass
+  to configure, openssl only understands prefix, and only with =. -->
+  <!-- Unfortunately Python2 hasn't been fixed up to use the 1.1 API
+       so we're stuck at 1.0. -->
+  <autotools id="openssl" autogen-sh="Configure" autogenargs="shared "
+             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl %(autogenargs)s"
+             makeinstallargs="install_sw" supports-non-srcdir-builds="no">
+    <branch module="openssl-1.0.2k.tar.gz" version="1.0.2k" repo="openssl"
+            hash="sha256:6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"/>
+  </autotools>
+
+  <!-- Rudely demands TeX to build documentation -->
+  <!-- Assembler files are missing md5-compress.asm for x86_64 -->
+  <autotools id="libnettle" autogen-sh="configure"
+             autogenargs="--disable-documentation --disable-assembler">
+    <branch repo="ftp.gnu.org" version="3.3"
+            module="nettle/nettle-3.3.tar.gz">
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/libnettle-cc-for-build-needs-cflags.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="gmp"/>
+      <dep package="openssl"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libtasn1" supports-non-srcdir-builds="no"
+             autogen-sh="configure">
+    <branch repo="ftp.gnu.org" version="4.12"
+            module="/libtasn1/libtasn1-4.12.tar.gz"/>
+  </autotools>
+
+  <autotools id="zlib" autogen-sh="configure" skip-autogen="never"
+             supports-non-srcdir-builds="no">
+    <branch repo="sourceforge" version="1.2.11"
+            module="libpng/zlib-1.2.11.tar.xz"/>
+  </autotools>
+
+  <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
+  <autotools id="gnutls" autogen-sh="configure"
+             autogenargs="--disable-gtk-doc-html --without-p11-kit">
+    <branch repo="gnutls" version="3.5.9"
+            module="gcrypt/gnutls/v3.5/gnutls-3.5.9.tar.xz"/>
+    <dependencies>
+      <dep package="libunistring"/>
+      <dep package="libnettle"/>
+      <dep package="libtasn1"/>
+      <dep package="zlib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libgcrypt" autogen-sh="configure">
+    <branch repo="gnutls" version="1.7.6"
+            module="gcrypt/libgcrypt/libgcrypt-1.7.6.tar.gz"/>
+  </autotools>
+
+  <autotools id="glib-networking" autogen-sh="configure"
+             autogenargs="--without-ca-certificates set_more_warnings=no">
+    <branch module="glib-networking/2.50/glib-networking-2.50.0.tar.xz"
+            hash="sha256:3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"
+            version="2.50.0"/>
+    <dependencies>
+      <dep package="gnutls"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libsoup" autogen-sh="configure"
+             autogenargs="set_more_warnings=no">
+    <branch module="libsoup/2.57/libsoup-2.57.1.tar.xz" version="2.57.1"
+            hash="sha256:ca1ca037e89e8bc7b782559f3ec5d89c9d0b836f505b2f95e008ed517fd6658f"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="glib-networking"/>
+      <dep package="sqlite"/>
+      <dep package="vala"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="libwebp" autogen-sh="configure">
+    <branch repo="webm" module="webp/libwebp-0.6.0.tar.gz" version="0.6.0"/>
+  </autotools>
+
+  <autotools id="icu55" autogen-sh="source/configure"
+             autogenargs="--enable-rpath"
+             makeargs='CFLAGS="$CFLAGS -DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0"'>
+    <branch repo="icu" version="55.1" checkoutdir="icu"
+            module="icu4c/55.1/icu4c-55_1-src.tgz"/>
+  </autotools>
+
+  <!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
+    disable-webkit2: Requires both GTK2 and 3. Currently not supported.
+    disable-credential-storage: Requires libsecret. No module for this yet.
+    disable-geolocation: Requires geoclue 1 or 2. No module for this yet.
+    disable-video, disable-web-audio: Requires gstreamer. If you want video and
+      audio, add this to your .jhbuildrc:
+      append_autogenargs('WebKit', '&#45;-enable-video')
+      append_autogenargs('WebKit', '&#45;-enable-web-audio')
+      -j1: Workaround for https://bugs.webkit.org/show_bug.cgi?id=140171
+
+   It has some issues with ICU 58 so we keep it on ICU55. Note that
+   you can't install both, so if you need to build this webkit add icu
+   to your skip-list.
+  -->
+  <autotools id="webkit" autogen-sh="autoreconf"
+             autogenargs="--enable-quartz-target --with-gtk=2.0 --disable-webkit2 --disable-credential-storage --disable-geolocation --disable-video --disable-web-audio CXXFLAGS='-stdlib=libc++'"
+             makeargs="-j1">
+
+    <branch repo="webkit.org" module="webkitgtk-2.4.11.tar.xz" version="2.4.11">
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch" strip="1"/>
+      <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
+      it's left in -->
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch" strip="1"/>
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/WebKit-2.4.11-fixups.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="libwebp"/>
+      <dep package="enchant"/>
+      <dep package="icu55"/>
+      <dep package="libsoup"/>
+      <dep package="meta-gtk-osx-freetype"/>
+    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-gtk"/>
+      <dep package="meta-gstreamer"/>
+    </after>
+  </autotools>
+
+  <!-- This is WebKitGTK 2.4.x as above, but for gtk3.  -->
+  <autotools id="webkit1gtk3" autogen-sh="autoreconf"
+             autogenargs="--enable-quartz-target --with-gtk=3.0 --disable-webkit2 --disable-credential-storage --disable-geolocation --disable-video --disable-web-audio CXXFLAGS='-stdlib=libc++'"
+             makeargs="-j1" >
+    <branch repo="webkit.org" module="webkitgtk-2.4.11.tar.xz" version="2.4.11">
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-140167-disable-netscape-api.patch" strip="1"/>
+      <!-- This patch can be commented out for XCode >= 6.3, but does no harm if
+      it's left in -->
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-133293-cfi-clang-failure.patch" strip="1"/>
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/WebKit-2.4.11-fixups.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="libwebp"/>
+      <dep package="enchant"/>
+      <dep package="icu55"/>
+      <dep package="libsoup"/>
+      <dep package="meta-gtk-osx-freetype"/>
+    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="meta-gstreamer"/>
+    </after>
+  </autotools>
+
+  <!-- This is the stable release of WebKitGTK, for GTK 3.x. Use it if you need
+      the WebKit2 API (most applications do.)
+    ENABLE_MINIBROWSER: This is enabled because it's an easy test of whether the
+      library is working correctly: run "jhbuild run MiniBrowser".
+    ENABLE_PLUGIN_PROCESS_GTK2: Requires both GTK 2.x and 3.x. Currently not
+      supported.
+    ENABLE_VIDEO, ENABLE_WEB_AUDIO: Requires gstreamer. If you want video and
+      audio, fix this in your .jhbuildrc-custom. You may need some extra
+      patches, this is untested.
+    ENABLE_CREDENTIAL_STORAGE: Requires libsecret. No module for this yet.
+    ENABLE_GEOLOCATION: Requires geoclue. No module for this yet.
+    ENABLE_OPENGL: Untested.
+    USE_LIBNOTIFY: Requires libnotify. No module for this yet.
+    USE_LIBHYPHEN: Requires libhyphen. No module for this yet.
+  -->
+  <cmake id="webkit2gtk3"
+         cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_INTROSPECTION=OFF  -DENABLE_OPENGL=OFF -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF -DENABLE_GEOLOCATION=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DUSE_LIBSECRET=OFF -DENABLE_TOUCH_EVENTS=OFF -DCMAKE_CXX_FLAGS="-stdlib=libc++"'>
+    <branch repo="webkit.org" module="webkitgtk-2.16.6.tar.xz" version="2.16.6">
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/Webkit-2.16-build-without-OpenGL.patch" strip="1"/>
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/Webkit-2.16-Fix-some-includes.patch" strip="1"/>
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-2.16-No-stringview-lifetime.patch" strip="1"/>
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-2.16-main-thread.patch" strip="1"/>
+
+    </branch>
+    <dependencies>
+      <dep package="libwebp"/>
+      <dep package="enchant"/>
+      <dep package="icu"/>
+      <dep package="libsoup"/>
+      <dep package="libgcrypt"/>
+      <dep package="meta-gtk-osx-freetype"/>
+    </dependencies>
+    <after>
+      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="meta-gstreamer"/>
+    </after>
+  </cmake>
+</moduleset>
diff --git a/osx/jhbuild/modulesets-stable/gtk-osx-python.modules b/osx/jhbuild/modulesets-stable/gtk-osx-python.modules
index cbd3c04567..41dab975fd 100644
--- a/osx/jhbuild/modulesets-stable/gtk-osx-python.modules
+++ b/osx/jhbuild/modulesets-stable/gtk-osx-python.modules
@@ -8,15 +8,17 @@
   <repository type="tarball" name="cairographics.org"
               href="http://cairographics.org/releases/"/>
   <repository type="tarball" name="python"
-	      href="https://www.python.org/ftp/python/"/>
+              href="https://www.python.org/ftp/python/"/>
   <repository type="tarball" name="oracle"
 	      href="http://download.oracle.com/"/>
   <repository type="tarball" name="pymodules"
-	      href="http://pypi.python.org/packages/source/"/>
+              href="http://pypi.python.org/packages/"/>
+  <repository type="tarball" name="github-tarball"
+              href="https://github.com"/>
 
   <metamodule id="meta-gtk-osx-python">
     <dependencies>
-      <dep package="py2cairo"/>
+      <dep package="pycairo"/>
       <dep package="pygobject"/>
       <dep package="pygtk"/>
       <dep package="gtk-mac-integration-python"/>
@@ -26,7 +28,7 @@
   <metamodule id="meta-gtk-osx-python-gtk3">
     <dependencies>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="py2cairo"/>
+      <dep package="pycairo"/>
       <dep package="pygobject3"/>
       <dep package="gtk-mac-integration-python"/>
     </dependencies>
@@ -88,6 +90,7 @@
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
     <branch repo="python" module="3.6.4/Python-3.6.4.tar.xz" version="3.6.4">
+      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/Python3.4-stack_size-flag.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="gettext-runtime"/>
@@ -96,9 +99,9 @@
   </autotools>
 
   <distutils id="pybsddb">
-	<branch module="8d/9b/c3b01ff14e19254b2e031d8ae5ebe472e5523a47acc6f7d49300960d406d/bsddb3-6.2.4.tar.gz"
-  	    hash="md5:eec77d104c5981366701c6b0de585504" repo="pymodules"
-  	    version="6.2.4"/>
+    <branch module="8d/9b/c3b01ff14e19254b2e031d8ae5ebe472e5523a47acc6f7d49300960d406d/bsddb3-6.2.4.tar.gz"
+	    hash="md5:eec77d104c5981366701c6b0de585504" repo="pymodules"
+	    version="6.2.4"/>
     <dependencies>
       <dep package="python3"/>
     </dependencies>
@@ -108,36 +111,20 @@
     </after>
   </distutils>
 
-<!-- Cairographics have changed the name to py2cairo for python 2 holdouts. -->
-  <waf id="py2cairo">
-    <branch module="py2cairo-1.10.0.tar.bz2" repo="cairographics.org"
-            version="1.10.0"
-	    hash="sha1:2efa8dfafbd6b8e492adaab07231556fec52d6eb">
-      <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/py2cairo-python2.6-Dont-try-to-guess-arch.patch"
-             strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="cairo"/>
-    </dependencies>
-    <after>
-      <dep package="python"/>
-      <dep package="meta-gtk-osx-core"/>
-    </after>
-  </waf>
-
-<!-- Pycairo is for those who've made the leap. -->
-  <waf id="pycairo" autogen-sh="configure" python-command="python3">
-    <branch module="pycairo-1.10.0.tar.bz2" repo="cairographics.org"
-            version="1.10.0"
-	    hash="sha1:b4283aa1cc9aafd12fd72ad371303a486da1d014"/>
+  <distutils id="pycairo" autogen-sh="configure" python-command="python3">
+    <branch module="/pygobject/pycairo/releases/download/v1.12.0/pycairo-1.12.0.tar.gz" repo="github-tarball"
+            version="1.12.0"
+	    hash="sha256:243c351d7abcef41ac1fa984d2c753f3d065336a0fcf4c20fafb191b23423095"/>
     <dependencies>
       <dep package="cairo"/>
     </dependencies>
     <after>
       <dep package="python3"/>
+      <dep package="python"/>
       <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="meta-gtk-osx-core"/>
     </after>
-  </waf>
+  </distutils>
 
 <!-- PyGObject 2.28 is the last series for Gtk+-2; for co-installation
      with later versions it installs as pygobject2 and PyGObject 3
@@ -147,9 +134,7 @@
 	     autogenargs="--disable-introspection"
 	     supports-non-srcdir-builds="no">
     <branch version="2.28.6" module="pygobject/2.28/pygobject-2.28.6.tar.bz2"
-            hash="sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee">
-		<patch file="http://xpra.org/svn/Xpra/trunk/osx/jhbuild/patches/pygobject-gflags-fix.patch" strip="1"/>
-	</branch>
+            hash="sha256:e4bfe017fa845940184c82a4d8949db3414cb29dfc84815fb763697dc85bdcee"/>
     <dependencies>
       <dep package="meta-gtk-osx-core"/>
     </dependencies>
@@ -160,17 +145,13 @@
 
    <autotools id="pygobject3" autogen-sh="configure" >
     <branch version="3.24.1" module="pygobject/3.24/pygobject-3.24.1.tar.xz"
-	    hash="sha256:a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd">
-        <!-- patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/pygi-cache-double-typedef.patch" strip="1" -->
-    </branch>
+	    hash="sha256:a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd"/>
     <dependencies>
-      <dep package="meta-gtk-osx-gtk3"/>
+      <dep package="pycairo"/>
     </dependencies>
     <after>
       <dep package="python"/>
       <dep package="python3"/>
-      <dep package="pycairo"/>
-      <dep package="py2cairo"/>
     </after>
   </autotools>
 
@@ -184,7 +165,7 @@
     <dependencies>
       <dep package="pygobject"/>
       <dep package="meta-gtk-osx-core"/>
-      <dep package="py2cairo"/>
+      <dep package="pycairo"/>
     </dependencies>
     <after>
       <dep package="libglade"/>