[gimp/osx-build: 12/31] OS X build: update and fix libgcrypt and libgpg-error dependencies

[Sven Claussner <sclaussner src gnome org>]

commit 3a88f3ad9d74977dfa0250647a01839e1fbbce05
Author: Sven Claussner <sclaussner src gnome org>
Date:   Wed May 7 06:19:05 2014 +0200

    OS X build: update and fix libgcrypt and libgpg-error dependencies
    
    Update dependency versions. Fix build errors. Exclude libgcrypt's doc
    directory from build, because it introduces new dependencies and we
    don't need it.

 build/osx/gimp.modules                             |   12 ++++---
 .../0001-libgcrypt-build-without-docs.patch        |   35 ++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)
---
diff --git a/build/osx/gimp.modules b/build/osx/gimp.modules
index 09fc4e5..90a7a46 100755
--- a/build/osx/gimp.modules
+++ b/build/osx/gimp.modules
@@ -574,17 +574,19 @@
                </dependencies>
        </autotools>
 
-       <autotools id="libgcrypt" autogen-sh="configure" autogenargs="">
-               <branch module="gcrypt/libgcrypt/libgcrypt-1.5.3.tar.gz"
-                       version="1.5.3" repo="gnupg" />
+       <autotools id="libgcrypt" autogen-sh="configure" autogenargs="--disable-asm">
+               <branch module="gcrypt/libgcrypt/libgcrypt-1.6.1.tar.gz"
+                       version="" repo="gnupg" />
                <dependencies>
+                       <dep package="libgpg-error" />
                </dependencies>
+               <patch file="0001-libgcrypt-build-without-docs.patch" strip="1"/>
        </autotools>
 
        <autotools id="libgpg-error" autogen-sh="configure"
                autogenargs="">
-               <branch module="libgpg-error/libgpg-error-1.12.tar.bz2"
-                       version="1.12" repo="gnutls" />
+               <branch module="libgpg-error/libgpg-error-1.13.tar.bz2"
+                       version="1.13" repo="gnutls" />
                <dependencies>
                </dependencies>
        </autotools>
diff --git a/build/osx/patches/0001-libgcrypt-build-without-docs.patch 
b/build/osx/patches/0001-libgcrypt-build-without-docs.patch
new file mode 100755
index 0000000..d236814
--- /dev/null
+++ b/build/osx/patches/0001-libgcrypt-build-without-docs.patch
@@ -0,0 +1,35 @@
+diff -u a/Makefile.am b/Makefile.am
+--- a/Makefile.am      2014-01-12 12:19:50.000000000 +0100
++++ b/Makefile.am      2014-05-07 19:21:19.883687387 +0200
+@@ -25,11 +25,11 @@
+ # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
+ GITLOG_TO_CHANGELOG=gitlog-to-changelog
+ 
+-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
+-SUBDIRS =         compat mpi cipher random src doc tests
++DIST_SUBDIRS = m4 compat mpi cipher random src tests
++SUBDIRS =         compat mpi cipher random src tests
+ 
+ EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES                   \
+-             ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \
++             ChangeLog-2011 build-aux/ChangeLog-2011 \
+              m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011    \
+              random/ChangeLog-2011 tests/ChangeLog-2011 mpi/ChangeLog-2011 \
+              build-aux/git-log-footer build-aux/git-log-fix
+diff -u a/Makefile.in b/Makefile.in
+--- a/Makefile.in      2014-01-29 11:41:24.000000000 +0100
++++ b/Makefile.in      2014-05-07 19:21:19.903686743 +0200
+@@ -331,10 +331,10 @@
+ 
+ # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
+ GITLOG_TO_CHANGELOG = gitlog-to-changelog
+-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
+-SUBDIRS = compat mpi cipher random src doc tests
++DIST_SUBDIRS = m4 compat mpi cipher random src tests
++SUBDIRS = compat mpi cipher random src tests
+ EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES                   \
+-             ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \
++             ChangeLog-2011 build-aux/ChangeLog-2011 \
+              m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011    \
+              random/ChangeLog-2011 tests/ChangeLog-2011 mpi/ChangeLog-2011 \
+              build-aux/git-log-footer build-aux/git-log-fix