[gtk-osx: 1/7] Add p11-kit to gnutls

[John Ralls <jralls src gnome org>]

commit 302b4b32c81592cac6b8201a8edc986c2dfb6979
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Jan 21 21:19:13 2015 -0800

    Add p11-kit to gnutls
    
    It built fine on modulesets-unstable, so we may as well do the same thing
    on all modulesets.

 modulesets-stable/gtk-osx-unsupported.modules |   13 ++++++++++++-
 modulesets/gtk-osx-unsupported.modules        |   12 +++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 116b905..75fd09b 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -23,6 +23,8 @@
               href="http://www.webkitgtk.org/releases/"/>
   <repository type='tarball' name='icu'
              href='http://download.icu-project.org/files/'/>
+  <repository type="tarball" name="p11-glue"
+              href="http://p11-glue.freedesktop.org/releases/"/>
 
   <metamodule id="meta-gtk-osx-unsupported">
     <dependencies>
@@ -65,13 +67,22 @@
             module="libpng/zlib-1.2.8.tar.xz"/>
   </autotools>
 
+  <autotools id="p11-kit" autogen-sh="configure"
+             autogenargs="--without-trust-paths">
+    <branch repo="p11-glue" version="0.22.1" module="p11-kit-0.22.1.tar.gz"/>
+    <dependencies>
+      <dep package="libtasn1"/>
+    </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 --without-p11-kit">
+             autogenargs="--with-libgcrypt">
     <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="zlib"/>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index b341dad..30be38f 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -22,6 +22,8 @@
               href="http://www.webkitgtk.org/releases/"/>
   <repository type='tarball' name='icu'
              href='http://download.icu-project.org/files/'/>
+  <repository type="git" name="freedesktop"
+              href="git://anongit.freedesktop.org"/>
 
   <metamodule id="meta-gtk-osx-unsupported">
     <dependencies>
@@ -64,8 +66,15 @@
            module="libpng/zlib-1.2.8.tar.gz"/>
   </autotools>
 
+  <autotools id="p11-kit" autogenargs="--without-trust-paths">
+    <branch repo="freedesktop" module="p11-glue/p11-kit" revision="stable"/>
+    <dependencies>
+      <dep package="libtasn1"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnutls" autogen-sh="configure"
-            autogenargs="--with-libgcrypt --without-p11-kit">
+             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.-->
@@ -73,6 +82,7 @@
     <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="zlib"/>