[gtk-osx: 4/7] Upgrade gnutls

[John Ralls <jralls src gnome org>]

commit 98287cd967a8a7bfc8af715c31daed874178b535
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Jan 21 21:31:59 2015 -0800

    Upgrade gnutls
    
    Needed for glib-networking 2.42.x and master.

 modulesets-stable/gtk-osx-unsupported.modules   |   11 +++++------
 modulesets-unstable/gtk-osx-unsupported.modules |   19 ++++++++++---------
 modulesets/gtk-osx-unsupported.modules          |   17 +++++++++--------
 3 files changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 2f41d8f..4c2cc20 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -25,6 +25,7 @@
              href='http://download.icu-project.org/files/'/>
   <repository type="tarball" name="p11-glue"
               href="http://p11-glue.freedesktop.org/releases/"/>
+  <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
 
   <metamodule id="meta-gtk-osx-unsupported">
     <dependencies>
@@ -87,15 +88,13 @@
     </dependencies>
   </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">
-    <branch repo='ftp.gnu.org' version='2.12.20'
-            module="gnutls/gnutls-2.12.20.tar.bz2"/>
+             autogenargs="--disable-gtk-doc-html">
+    <branch repo="gnutls" version="3.3.12"
+            module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
     <dependencies>
       <dep package="p11-kit"/>
-      <dep package="libgcrypt" />
+      <dep package="libnettle"/>
       <dep package="libtasn1" />
       <dep package="zlib"/>
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index eac7dab..d1ff845 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -32,7 +32,9 @@
              href="https://git.lysator.liu.se/"/>
   <repository type="tarball" name="icu"
              href="http://download.icu-project.org/files/"/>
- 
+  <repository type="git" name="gitorious" href="git://gitorious.org/"/>
+  <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
+
   <metamodule id="meta-gtk-osx-unsupported">
     <dependencies>
       <dep package="gnome-mime-data"/>
@@ -78,17 +80,16 @@
     </dependencies>
   </autotools>
 
+  <!-- Building from git does not work because they have checked in a bunch of
+  files (build-aux/, po/Makefile.in.in) that they're not supposed to.-->
   <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"/>
+             autogenargs="--disable-gtk-doc-html">
+    <!--branch repo="gitorious" module="gnutls/gnutls"/-->
+    <branch repo="gnutls" version="3.3.12"
+            module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
     <dependencies>
       <dep package="p11-kit"/>
-      <dep package="libgcrypt" />
+      <dep package="libnettle"/>
       <dep package="libtasn1" />
       <dep package="zlib"/>
     </dependencies>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index f8be0e5..6680067 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -26,6 +26,8 @@
               href="git://anongit.freedesktop.org"/>
   <repository type="git" name="lysator"
               href="https://git.lysator.liu.se/"/>
+  <repository type="git" name="gitorious" href="git://gitorious.org/"/>
+  <repository type="tarball" name="gnutls" href="ftp://ftp.gnutls.org/"/>
 
   <metamodule id="meta-gtk-osx-unsupported">
     <dependencies>
@@ -88,17 +90,16 @@
     </dependencies>
   </autotools>
 
+  <!-- Building from git does not work because they have checked in a bunch of
+  files (build-aux/, po/Makefile.in.in) that they're not supposed to.-->
   <autotools id="gnutls" autogen-sh="configure"
-             autogenargs="--with-libgcrypt">
-    <!-- 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"/>
+             autogenargs="--disable-gtk-doc-html">
+    <!--branch repo="gitorious" module="gnutls/gnutls"/-->
+    <branch repo="gnutls" version="3.3.12"
+            module="gcrypt/gnutls/v3.3/gnutls-3.3.12.tar.xz"/>
     <dependencies>
       <dep package="p11-kit"/>
-      <dep package="libgcrypt" />
+      <dep package="libnettle"/>
       <dep package="libtasn1" />
       <dep package="zlib"/>
     </dependencies>