[gtk-osx: 7/14] Synchronize versions of gnutls

[John Ralls <jralls src gnome org>]

commit ec5ea43890331c1563137cf545eb8c19fc2400b6
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Dec 26 14:00:53 2014 -0700

    Synchronize versions of gnutls
    
    2.12.20 is the last version that will build with libgcrypt; subsequent
    versions require libnettle and gmp. Currently gmp does not build.
    
    Also, build from tarballs on all modulesets, because this version does
    not build from Git when we are using Automake >1.12.

 modulesets-stable/gtk-osx-unsupported.modules   |    2 ++
 modulesets-unstable/gtk-osx-unsupported.modules |   16 ++++++++--------
 modulesets/gtk-osx-unsupported.modules          |    9 ++++++---
 3 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 6301b86..da62c26 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -65,6 +65,8 @@
             module="libpng/zlib-1.2.8.tar.xz"/>
   </autotools>
 
+  <!-- This is the last version of gnutls that will support libgcrypt;
+  subsequent ones require nettle and gmp -->
   <autotools id="gnutls" autogen-sh="configure"
             autogenargs="--with-libgcrypt --without-p11-kit">
     <branch repo='ftp.gnu.org' version='2.12.20'
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index f5e2fdd..ba4f7bd 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -67,19 +67,19 @@
     <branch repo="lysator" module="nettle/nettle.git"/>
   </autotools>
 
-  <autotools id="gnutls" autogen-sh="autoreconf"
-            autogenargs="--disable-gtk-doc-html"
-            autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  
%(autogenargs)s">
-    <branch repo='git.gnu.org' tag='gnutls_2_12_20' module="gnutls"/>
-    <!--<branch repo='ftp.gnu.org' version='2.8.1'
-            module="gnutls/gnutls-2.8.1.tar.bz2"/ -->
+  <autotools id="gnutls" autogen-sh="configure"
+             autogenargs="--with-libgcrypt --disable-gtk-doc-html">
+    <!-- This is the last version of gnutls that will support libgcrypt;
+    subsequent ones require nettle and gmp. Building from git does not work with
+    Automake >1.12. -->
+    <!--branch repo="git.gnu.org" module="gnutls"/-->
+    <branch repo="ftp.gnu.org" version="2.12.20"
+            module="gnutls/gnutls-2.12.20.tar.bz2"/>
     <dependencies>
       <dep package="p11-kit"/>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />
-      <dep package="libnettle" />
       <dep package="zlib"/>
-      <dep package="gmp"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 774ed21..0314d85 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -64,9 +64,12 @@
 
   <autotools id="gnutls" autogen-sh="configure"
             autogenargs="--with-libgcrypt --without-p11-kit">
-    <branch repo='git.gnu.org' tag='gnutls_2_12_x'/>
-    <!--branch repo='ftp.gnu.org' version='2.12.11'
-            module="gnutls/gnutls-2.12.11.tar.bz2"/-->
+    <!-- This is the last version of gnutls that will support libgcrypt;
+    subsequent ones require nettle and gmp. Building from git does not work with
+    Autoamke >1.12.-->
+    <!--branch repo='git.gnu.org' revision='gnutls_2_12_20'/-->
+    <branch repo='ftp.gnu.org' version='2.12.20'
+            module="gnutls/gnutls-2.12.20.tar.bz2"/>
     <dependencies>
       <dep package="libgcrypt" />
       <dep package="libtasn1" />