[gtk-osx: 6/7] Upgrade libgcrypt

[John Ralls <jralls src gnome org>]

commit 941314490deef779f8a8b7f3196a70ec18cd175d
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Jan 21 21:34:51 2015 -0800

    Upgrade libgcrypt
    
    This was previously limited to 1.5.4 due to our version of gnutls.

 modulesets-stable/gtk-osx-unsupported.modules   |    4 ++--
 modulesets-unstable/gtk-osx-unsupported.modules |   11 +++--------
 modulesets/gtk-osx-unsupported.modules          |   10 +++++-----
 3 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 0702437..da7d82a 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -159,8 +159,8 @@
   </autotools>
 
   <autotools id="libgcrypt" autogen-sh="configure" autogenargs="--disable-asm">
-    <branch repo="ftp.gnupg.org" version="1.5.4"
-            module="gcrypt/libgcrypt/libgcrypt-1.5.4.tar.bz2"/>
+    <branch repo="ftp.gnupg.org" version="1.6.2"
+            module="gcrypt/libgcrypt/libgcrypt-1.6.2.tar.bz2"/>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 8d123ac..757fc01 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -7,7 +7,6 @@
   <repository type='git' name='git.gnu.org' 
               href="git://git.savannah.gnu.org/"/>
   <repository type='git' name='git.gnupg.org' href="git://git.gnupg.org/" />
-  <repository type='tarball' name='ftp.gnupg.org' href="ftp://ftp.gnupg.org/"; />
   <repository type='tarball' name='ftp.gnu.org' href="ftp://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="sourceforge" 
               href="http://downloads.sourceforge.net/sourceforge/"/>
@@ -101,13 +100,9 @@
     <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. Master does not work with the
-    version of gnutls used, 2.12.20.
-    <branch repo="git.gnupg.org" module="libgcrypt"/> -->
-    <branch repo="ftp.gnupg.org" version="1.5.4"
-            module="gcrypt/libgcrypt/libgcrypt-1.5.4.tar.bz2"/>
+  <autotools id="libgcrypt" autogen-sh="configure"
+             autogenargs="--disable-asm --disable-doc">
+    <branch repo="git.gnupg.org" module="libgcrypt"/>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 4858588..a3fa7df 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -155,11 +155,11 @@
 
   <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. Master does not work with the
-    version of gnutls used, 2.12.20.
-    <branch repo="git.gnupg.org" tag="libgcrypt-1.5.4" module="libgcrypt"/> -->
-    <branch repo="ftp.gnupg.org" version="1.5.4"
-            module="gcrypt/libgcrypt/libgcrypt-1.5.4.tar.bz2"/>
+    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.6.2"
+            module="gcrypt/libgcrypt/libgcrypt-1.6.2.tar.bz2"/>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>