[gtk-osx] Freeze jhbuild at 3.36.0.

[John Ralls <jralls src gnome org>]

commit 1c260af88a568482af298aa4ca1779f71ecfdbd8
Author: John Ralls <jralls ceridwen us>
Date:   Tue Jul 14 11:25:08 2020 -0700

    Freeze jhbuild at 3.36.0.
    
    As a temporary workaround to master being converted to python3.

 gtk-osx-setup.sh                            |  4 ++--
 modulesets-unstable/gtk-osx-network.modules | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/gtk-osx-setup.sh b/gtk-osx-setup.sh
index f761f78..0fe7cd3 100755
--- a/gtk-osx-setup.sh
+++ b/gtk-osx-setup.sh
@@ -115,11 +115,11 @@ PIPENV="$PYTHONUSERBASE/bin/pipenv"
 
 # Install jhbuild
 if test ! -d "$DEV_SRC_ROOT/jhbuild/.git" ; then
-    git clone $GITLAB/jhbuild.git "$DEV_SRC_ROOT/jhbuild"
+    git clone -b 3.36.0 $GITLAB/jhbuild.git "$DEV_SRC_ROOT/jhbuild"
     cd "$DEV_SRC_ROOT/jhbuild"
 else #Get the latest if it's already installed
     cd "$DEV_SRC_ROOT/jhbuild"
-    git pull origin master
+    git reset --hard 3.36.0
 fi
 
 # Install Ninja
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index 868df9a..e7013a7 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -13,7 +13,7 @@
   <repository name="sourceforge" type="tarball"
               href="http://downloads.sourceforge.net/sourceforge/"/>
   <!--repository name="gitlab" type="git" href="https://gitlab.com/"/-->
-  <repository name="gnutls" type="tarball" href="ftp://ftp.gnutls.org/"/>
+  <repository name="gnutls" type="tarball" href="https://www.gnupg.org/ftp/"/>
   <repository name="chromium" type="git"
               href="https://chromium.googlesource.com/"/>
   <repository name="webkit.org" type="tarball"
@@ -75,14 +75,13 @@
 
   <!-- Building from git does not work because they have checked in a bunch of
   files (build-aux/, po/Makefile.in.in) that they're not supposed to.-->
-  <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
-  <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
+  <!-- Building with p11-kit support breaks g-ir-scanner for some weird reason. -->
   <autotools id="gnutls" autogen-sh="autoreconf"
              autogenargs="--disable-gtk-doc-html --without-p11-kit">
-    <branch repo="gnutls" version="3.6.12"
-            hash="sha256:bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b"
-            module="gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gnutls-yes-weak-imports.patch"; 
strip="1"/>
+    <branch repo="gnutls" version="3.6.14"
+            hash="sha256:5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63"
+            module="gcrypt/gnutls/v3.6/gnutls-3.6.14.tar.xz">
+      <!--patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gnutls-yes-weak-imports.patch"; strip="1"/-->
     </branch>
     <dependencies>
       <dep package="libunistring"/>
@@ -93,8 +92,8 @@
   </autotools>
 
   <autotools id="libgcrypt" autogen-sh="configure">
-    <branch repo="gnutls" version="1.7.6"
-            module="gcrypt/libgcrypt/libgcrypt-1.7.6.tar.gz"/>
+    <branch repo="gnutls" version="1.8.6"
+            module="gcrypt/libgcrypt/libgcrypt-1.8.6.tar.bz2"/>
   </autotools>
 
   <autotools id="glib-networking"