[gtk-osx: 6/7] Build gnutls without p11-kit



commit 8acfb5e14de11c609a7c7d8355a503cc44b87c77
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Apr 18 18:36:27 2015 -0700

    Build gnutls without p11-kit
    
    For some bizarre reason, gnutls with p11-kit support causes g-ir-scanner
    to crash, if you have installed glib-networking.

 modulesets-stable/gtk-osx-unsupported.modules   |    4 ++--
 modulesets-unstable/gtk-osx-unsupported.modules |    4 ++--
 modulesets/gtk-osx-unsupported.modules          |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 5713f80..10979a9 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -115,12 +115,12 @@
     </dependencies>
   </autotools>
 
+  <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
   <autotools id="gnutls" autogen-sh="configure"
-             autogenargs="--disable-gtk-doc-html">
+             autogenargs="--disable-gtk-doc-html --without-p11-kit">
     <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="libnettle"/>
       <dep package="libtasn1" />
       <dep package="zlib"/>
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index a0f8993..a1a9520 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -79,13 +79,13 @@
 
   <!-- 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.-->
+  <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
   <autotools id="gnutls" autogen-sh="configure"
-             autogenargs="--disable-gtk-doc-html">
+             autogenargs="--disable-gtk-doc-html --without-p11-kit">
     <!--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="libnettle"/>
       <dep package="libtasn1" />
       <dep package="zlib"/>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 115646e..075cf96 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -94,13 +94,13 @@
 
   <!-- 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.-->
+  <!-- Building with p11-kit support breaks g-ir-scanner, for some weird reason. -->
   <autotools id="gnutls" autogen-sh="configure"
-             autogenargs="--disable-gtk-doc-html">
+             autogenargs="--disable-gtk-doc-html --without-p11-kit">
     <!--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="libnettle"/>
       <dep package="libtasn1" />
       <dep package="zlib"/>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]