[gtk-osx] Update and consolidate libgcrypt to gtk-osx-network.modules

[John Ralls <jralls src gnome org>]

commit 024b162f50e060a173126255a2ba373e16aa6dff
Author: John Ralls <jralls ceridwen us>
Date:   Mon Nov 16 21:33:53 2020 -0800

    Update and consolidate libgcrypt to gtk-osx-network.modules
    
    And convert to git from tarball for unstable.

 modulesets-stable/gtk-osx-network.modules       |  6 +++---
 modulesets-stable/gtk-osx-unsupported.modules   | 13 -------------
 modulesets-unstable/gtk-osx-network.modules     | 19 ++++++++-----------
 modulesets-unstable/gtk-osx-unsupported.modules |  9 ---------
 modulesets/gtk-osx-network.modules              |  6 +++---
 modulesets/gtk-osx-unsupported.modules          | 15 ---------------
 6 files changed, 14 insertions(+), 54 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 3b0ed3f..0d08c6e 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -85,9 +85,9 @@
   </autotools>
 
   <autotools id="libgcrypt" autogen-sh="configure">
-    <branch repo="gnutls" version="1.8.6"
-            hash="sha256:626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc"
-            module="gcrypt/libgcrypt/libgcrypt-1.8.6.tar.bz2"/>
+    <branch repo="gnutls" version="1.8.7"
+            hash="sha256:03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748"
+            module="gcrypt/libgcrypt/libgcrypt-1.8.7.tar.bz2"/>
   </autotools>
 
   <meson id="glib-networking" mesonargs="-Dopenssl=enabled">
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 24b938e..d5837c0 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -77,19 +77,6 @@
     </branch>
   </autotools>
 
-  <autotools id="libgcrypt" autogen-sh="configure"
-             autogenargs="--disable-asm --disable-doc"
-             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
 %(autogenargs)s">
-    <branch repo="gnupg.org" version="1.7.6"
-            module="gcrypt/libgcrypt/libgcrypt-1.7.6.tar.bz2">
-            <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libgcrypt-cflags-for-cc-for-build.patch";
-       strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libgpg-error" />
-    </dependencies>
-  </autotools>
-
    <autotools id="gnome-keyring"
              autogenargs="--disable-pam --without-root-certs">
      <branch module="gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz"
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index c24bd35..2c9e953 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -8,12 +8,10 @@
               href="https://www.openssl.org/source/"/>
   <repository name="lysator" type="git"
               href="https://git.lysator.liu.se/"/>
-  <!--repository name="git.gnu.org" type="git" href="git://git.savannah.gnu.org/"/-->
   <repository name="ftp.gnu.org" type="tarball" href="https://ftp.gnu.org/gnu/"/>
   <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="https://www.gnupg.org/ftp/"/>
+  <repository type='git' name='git.gnupg.org' href="git://git.gnupg.org/" />  
   <repository name="chromium" type="git"
               href="https://chromium.googlesource.com/"/>
   <repository name="webkit.org" type="tarball"
@@ -77,10 +75,7 @@
   <!-- 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.14"
-            hash="sha256:5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63"
-            module="gcrypt/gnutls/v3.6/gnutls-3.6.14.tar.xz">
-    </branch>
+    <branch repo="git.gnupg.org"/>
     <dependencies>
       <dep package="libunistring"/>
       <dep package="libnettle"/>
@@ -89,10 +84,12 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgcrypt" autogen-sh="configure">
-    <branch repo="gnutls" version="1.8.6"
-            hash="sha256:626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc"
-            module="gcrypt/libgcrypt/libgcrypt-1.8.6.tar.bz2"/>
+  <autotools id="libgcrypt" autogen-sh="autoreconf"
+             autogenargs="--disable-asm --disable-doc">
+    <branch repo="git.gnupg.org" module="libgcrypt"/>
+    <dependencies>
+      <dep package="libgpg-error" />
+    </dependencies>
   </autotools>
 
   <meson id="glib-networking" mesonargs="-Dopenssl=enabled">
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index a2982de..84ca845 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -66,15 +66,6 @@
     <branch repo='git.gnupg.org' module="libgpg-error" />
   </autotools>
 
-  <autotools id="libgcrypt" autogenargs="--disable-asm --disable-doc"
-            autogen-template="./autogen.sh &amp;&amp; ./configure --prefix %(prefix)s  %(autogenargs)s">
-    <branch repo="git.gnupg.org" module="libgcrypt"/>
-    <dependencies>
-      <dep package="libgpg-error" />
-    </dependencies>
-  </autotools>
-
-
    <autotools id="gnome-keyring"
              autogenargs="--disable-pam --without-root-certs">
     <branch/>
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index 45d537b..a5b2fab 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -92,9 +92,9 @@
   </autotools>
 
   <autotools id="libgcrypt" autogen-sh="configure">
-    <branch repo="gnutls" version="1.8.6"
-            hash="sha256:626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc"
-            module="gcrypt/libgcrypt/libgcrypt-1.8.6.tar.bz2"/>
+    <branch repo="gnutls" version="1.8.7"
+            hash="sha256:03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748"
+            module="gcrypt/libgcrypt/libgcrypt-1.8.7.tar.bz2"/>
   </autotools>
 
   <meson id="glib-networking" mesonargs="-Dopenssl=enabled">
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index ced50d2..5d03eff 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -67,21 +67,6 @@
     <branch repo="git.gnupg.org" module="libgpg-error"/>
   </autotools>
 
-  <autotools id="libgcrypt" autogen-sh="configure" autogenargs="--disable-asm">
-    <!-- Git version requires fig2dev, an X11 utility, until disable-doc option
-    is available, currently only on master.
-    <branch repo="git.gnupg.org" revision="LIBGCRYPT_1_6_BRANCH"
-            module="libgcrypt"/> -->
-    <branch repo="ftp.gnupg.org" version="1.7.6"
-            module="gcrypt/libgcrypt/libgcrypt-1.7.6.tar.bz2">
-            <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/libgcrypt-cflags-for-build.patch";
-       strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libgpg-error" />
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-keyring" autogenargs="--disable-pam --without-root-certs">
     <branch revision="gnome-3-20"/>
     <dependencies>