[gtk-osx] Consolidate crypto modules in gtk-osx-networking.modules

[John Ralls <jralls src gnome org>]

commit c0387eb0f37eb671b7d173351d8c0069eb048df7
Author: John Ralls <jralls ceridwen us>
Date:   Mon Apr 5 12:04:58 2021 -0700

    Consolidate crypto modules in gtk-osx-networking.modules

 modulesets-stable/gtk-osx-network.modules | 44 ++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 82c7b18f..464bee13 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -85,6 +85,49 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gpg" autogen-sh='configure'>
+    <branch repo="gnupg.org" version="2.2.27"
+            module="gcrypt/gnupg/gnupg-2.2.27.tar.bz2"
+            />
+    <dependencies>
+      <dep package="libgpg-error"/>
+      <dep package="libgcrypt"/>
+    </dependencies>
+  </autotools>
+  
+  <meson id="libsecret" mesonargs="-Dvapi=disabled -Dgtk_doc=disabled">
+    <branch version="0.20.4"
+            module="libsecret/0.20/libsecret-0.20.4.tar.xz"
+            />
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="libgcrypt"/>
+    </dependencies>
+  </meson>
+
+  <meson id="gcr">
+    <branch version="3.38"
+            module="gcr/3.38/gcr-3.38.1.tar.xz"
+            />
+    <dependencies>
+      <dep package="p11-kit"/>
+      <dep package="gpg"/>
+      <dep package="libsecret"/>
+      <dep package="glib"/>
+    </dependencies>
+  </meson>
+  
+  <autotools id="gnome-keyring"
+             autogenargs="--disable-pam --without-root-certs">
+    <branch module="gnome-keyring/40/gnome-keyring-40.0.tar.xz"
+            version="40.0"
+            />
+    <dependencies>
+      <dep package="libgcrypt"/>
+      <dep package="gcr"/>
+    </dependencies>
+  </autotools>
+
   <meson id="glib-networking" mesonargs="-Dopenssl=enabled">
          <branch module="glib-networking/2.65/glib-networking-2.65.1.tar.xz"
             hash="sha256:45a4a22651f0268b45c26ab4a16282f06f2995fdaf5aa8d221e535099cdd7783"
@@ -179,7 +222,6 @@
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-gtk3"/>
-      <dep package="meta-gtk-osx-gtk3.14"/>
       <dep package="meta-gstreamer"/>
     </after>
   </cmake>