[gtk-osx: 5/14] Update libgpg-error and libgcrypt

[John Ralls <jralls src gnome org>]

commit 387a382d949008e3b4af02051aaebc650442c92f
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Dec 26 13:50:52 2014 -0700

    Update libgpg-error and libgcrypt
    
    This allows getting rid of a patch. The --disable-doc option is only
    present on master on both of these packages, so it's not added in the
    modulesets-stable module.

 modulesets-stable/gtk-osx-unsupported.modules   |   10 +--
 modulesets-unstable/gtk-osx-unsupported.modules |   16 ++--
 modulesets/gtk-osx-unsupported.modules          |   23 +++---
 patches/libgcrypt-build-clang.patch             |   97 -----------------------
 4 files changed, 23 insertions(+), 123 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 0a0d1b2..6301b86 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -131,15 +131,13 @@
 
    <autotools id="libgpg-error" autogen-sh="configure"
              supports-non-srdir-builds="no">
-    <branch repo='ftp.gnupg.org' version='1.10'
-           module="gcrypt/libgpg-error/libgpg-error-1.10.tar.bz2"/>
+    <branch repo="ftp.gnupg.org" version="1.17"
+            module="gcrypt/libgpg-error/libgpg-error-1.17.tar.bz2"/>
   </autotools>
 
   <autotools id="libgcrypt" autogen-sh="configure" autogenargs="--disable-asm">
-    <branch repo='ftp.gnupg.org' version='1.5.3'
-           module='gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2'>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libgcrypt-build-clang.patch"; strip="1"/>
-    </branch>
+    <branch repo="ftp.gnupg.org" version="1.5.4"
+            module="gcrypt/libgcrypt/libgcrypt-1.5.4.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 c197798..828df1a 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -84,18 +84,18 @@
   </autotools>
 
   <autotools id="libgpg-error" autogen-sh="autogen.sh"
-             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
 %(autogenargs)s"
-            supports-non-srcdir-builds='no'>
+             autogenargs="--disable-doc"
+             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
 %(autogenargs)s">
     <branch repo='git.gnupg.org' module="libgpg-error" />
   </autotools>
 
   <autotools id="libgcrypt" autogen-sh="configure" autogenargs="--disable-asm">
-<!-- CVS version requires fig2dev, an X11 utility.
-     <branch repo='cvs.gnupg.org'  module='libgcrypt'/> -->
-    <branch repo='ftp.gnupg.org' version='1.5.3'
-           module='gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2'>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libgcrypt-build-clang.patch"; strip="1"/>
-    </branch>
+    <!-- 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"/>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 8855b69..c248d2a 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -118,20 +118,19 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgpg-error"
-             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
 %(autogenargs)s">
-    <branch repo='git.gnupg.org' module="libgpg-error"
-            tag="libgpg-error-1.10"/>
+  <!-- libgpg-error releases from master -->
+  <autotools id="libgpg-error" autogenargs="--disable-doc"
+             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; autoreconf -if &amp;&amp; 
%(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s">
+    <branch repo="git.gnupg.org" module="libgpg-error"/>
   </autotools>
 
-  <autotools id="libgcrypt"     autogen-sh="configure">
-
-<!-- CVS version requires fig2dev, an X11 utility.
-     <branch repo='git.gnupg.org' tag="libgcrypt-1.4.4" module='libgcrypt'/> -->
-    <branch repo='ftp.gnupg.org' version='1.5.3'
-           module='gcrypt/libgcrypt/libgcrypt-1.5.3.tar.bz2'>
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/libgcrypt-build-clang.patch"; strip="1"/>
-    </branch>
+  <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"/>
     <dependencies>
       <dep package="libgpg-error" />
     </dependencies>