[gtk-osx] Don't try to build gnutls with Xcode older than 10.0

[John Ralls <jralls src gnome org>]

commit a8eba236527691e35f2c9d659ef067b7cb90dd74
Author: John Ralls <jralls ceridwen us>
Date:   Sun Jul 4 16:44:01 2021 -0700

    Don't try to build gnutls with Xcode older than 10.0
    
    gnutls built with p11-kit support has a weird side effect of breaking
    g-ir-scanner when using an older Xcode. glib-networking requires
    gnutls to be built with p11-kit, so if Xcode is older than 10.0
    don't build gnutls at all. We always build openssl and glib-networking
    with openssl support which should be sufficient.

 jhbuildrc-gtk-osx                         |  7 ++++--
 modulesets-stable/gtk-osx-network.modules | 38 +++++++++++++++++--------------
 2 files changed, 26 insertions(+), 19 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 215864bd..e498cf52 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -132,6 +132,7 @@ def osx_ver():
 
 # Determine the XCode Version:
 def xcode_ver():
+   global conditions
    devdir = _popen("xcode-select -p")
    if devdir != "/Library/Developer/CommandLineTools":
        ver = _popen("xcodebuild -version")
@@ -141,6 +142,8 @@ def xcode_ver():
            _xcode_ver = float(vernum.group(1))
            if _xcode_ver < 5.0:
                raise EnvironmentError("Xcode Version %f is not supported; if you want to build with Xcode 
versions earlier than 5.0 checkout tag Last-Lion." % _xcode_ver)
+           if _xcode_ver < 10.0:
+               conditions.add('pre-Mavericks')
            return _xcode_ver
        else:
            raise EnvironmentError("No suitable Xcode found. Xcode 5.0 or later is required.")
@@ -236,11 +239,11 @@ osx_ver()
 
 def setup_sdk(target=_target, sdk_version=None, architectures=[_default_arch]):
 
-    global use_local_modulesets
+    global use_local_modulesets, conditions
     os.environ["MACOSX_DEPLOYMENT_TARGET"] = target
     sdkdir = None
     xcodepath = None
-    xcodeversion = None
+    xcodeversion = xcode_ver()
 
     sdkdir = _popen("xcrun --show-sdk-path")
 
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 295897aa..2bd9dc85 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -72,19 +72,21 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnutls" autogen-sh="autoreconf"
-             autogenargs="--disable-gtk-doc-html --with-included-unistring">
-    <branch repo="gnupg.org" version="3.7.1"
-            module="gcrypt/gnutls/v3.7/gnutls-3.7.1.tar.xz"
-            hash="sha256:3777d7963eca5e06eb315686163b7b3f5045e2baac5e54e038ace9835e5cac6f">
-    </branch>
-    <dependencies>
-      <dep package="libnettle"/>
-      <dep package="libtasn1"/>
-      <dep package="zlib"/>
-      <dep package="p11-kit"/>
-    </dependencies>
-  </autotools>
+  <if condition-unset="pre-Mavericks">
+    <autotools id="gnutls" autogen-sh="autoreconf"
+               autogenargs="--disable-gtk-doc-html --with-included-unistring">
+      <branch repo="gnupg.org" version="3.7.1"
+              module="gcrypt/gnutls/v3.7/gnutls-3.7.1.tar.xz"
+              hash="sha256:3777d7963eca5e06eb315686163b7b3f5045e2baac5e54e038ace9835e5cac6f">
+      </branch>
+      <dependencies>
+        <dep package="libnettle"/>
+        <dep package="libtasn1"/>
+        <dep package="zlib"/>
+        <dep package="p11-kit"/>
+      </dependencies>
+    </autotools>
+  </if>
 
   <autotools id="libgpg-error" autogen-sh="autoreconf"
              autogenargs="--disable-doc">
@@ -147,11 +149,13 @@
   </autotools>
 
   <meson id="glib-networking" mesonargs="-Dopenssl=enabled">
-         <branch module="glib-networking/2.68/glib-networking-2.68.0.tar.xz"
-                 version="2.68.0"
-                 hash="sha256:0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e"/>
+    <branch module="glib-networking/2.68/glib-networking-2.68.0.tar.xz"
+            version="2.68.0"
+            hash="sha256:0b235e85ad26b3c0d12255d0963c460e5a639c4722f78e2a03e969e224b29f6e"/>
     <dependencies>
-      <dep package="gnutls"/>
+      <if condition-unset="pre-Mavericks">
+        <dep package="gnutls"/>
+      </if>
       <dep package="glib"/>
     </dependencies>
   </meson>