[glib-networking/wip/tingping/pkcs11] Depend on GLib 2.67.0

[Patrick Griffis <pgriffis src gnome org>]

commit d17f4e13618db404a87472bf13360f5aec709e70
Author: Patrick Griffis <tingping tingping se>
Date:   Tue Oct 6 15:03:44 2020 -0500

    Depend on GLib 2.67.0

 meson.build                         | 2 +-
 tls/gnutls/gtlscertificate-gnutls.c | 6 ------
 tls/tests/certificate.c             | 4 +---
 tls/tests/connection.c              | 4 +---
 4 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/meson.build b/meson.build
index 6a3bb3ef..34e86f57 100644
--- a/meson.build
+++ b/meson.build
@@ -48,7 +48,7 @@ if host_system.contains('linux')
 endif
 
 # *** Check GLib GIO        ***
-glib_dep = dependency('glib-2.0', version: '>= 2.65.1',
+glib_dep = dependency('glib-2.0', version: '>= 2.67.0',
   fallback: ['glib', 'libglib_dep'])
 gio_dep = dependency('gio-2.0',
   fallback: ['glib', 'libgio_dep'])
diff --git a/tls/gnutls/gtlscertificate-gnutls.c b/tls/gnutls/gtlscertificate-gnutls.c
index 66f2a895..9d81cceb 100644
--- a/tls/gnutls/gtlscertificate-gnutls.c
+++ b/tls/gnutls/gtlscertificate-gnutls.c
@@ -149,7 +149,6 @@ g_tls_certificate_gnutls_get_property (GObject    *object,
       g_value_set_object (value, gnutls->issuer);
       break;
 
-#if GLIB_CHECK_VERSION (2, 67, 0)
     case PROP_PKCS11_URI:
       g_value_set_string (value, gnutls->pkcs11_uri);
       break;
@@ -157,7 +156,6 @@ g_tls_certificate_gnutls_get_property (GObject    *object,
     case PROP_PRIVATE_KEY_PKCS11_URI:
       g_value_set_string (value, gnutls->private_key_pkcs11_uri);
       break;
-#endif
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -269,7 +267,6 @@ g_tls_certificate_gnutls_set_property (GObject      *object,
       gnutls->issuer = g_value_dup_object (value);
       break;
 
-#if GLIB_CHECK_VERSION (2, 67, 0)
     case PROP_PKCS11_URI:
       string = g_value_get_string (value);
       if (!string)
@@ -302,7 +299,6 @@ g_tls_certificate_gnutls_set_property (GObject      *object,
 
       gnutls->private_key_pkcs11_uri = g_strdup (string);
       break;
-#endif
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -413,10 +409,8 @@ g_tls_certificate_gnutls_class_init (GTlsCertificateGnutlsClass *klass)
   g_object_class_override_property (gobject_class, PROP_PRIVATE_KEY, "private-key");
   g_object_class_override_property (gobject_class, PROP_PRIVATE_KEY_PEM, "private-key-pem");
   g_object_class_override_property (gobject_class, PROP_ISSUER, "issuer");
-#if GLIB_CHECK_VERSION (2, 67, 0)
   g_object_class_override_property (gobject_class, PROP_PKCS11_URI, "pkcs11-uri");
   g_object_class_override_property (gobject_class, PROP_PRIVATE_KEY_PKCS11_URI, "private-key-pkcs11-uri");
-#endif
 }
 
 static void
diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c
index d0afc312..921f29ef 100644
--- a/tls/tests/certificate.c
+++ b/tls/tests/certificate.c
@@ -252,9 +252,7 @@ static void
 test_create_certificate_pkcs11 (TestCertificate *test,
                                 gconstpointer data)
 {
-#if !GLIB_CHECK_VERSION (2, 67, 0)
-  g_test_skip ("glib-networking built against too old GLib");
-#elif !defined (BACKEND_IS_GNUTLS)
+#if !defined (BACKEND_IS_GNUTLS)
   g_test_skip ("This backend does not support PKCS #11");
 #else
   GTlsCertificate *cert;
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 852f8268..548c1925 100644
--- a/tls/tests/connection.c
+++ b/tls/tests/connection.c
@@ -1071,9 +1071,7 @@ static void
 test_client_auth_pkcs11_connection (TestConnection *test,
                                     gconstpointer   data)
 {
-#if !GLIB_CHECK_VERSION (2, 67, 0)
-  g_test_skip ("glib-networking built against too old GLib");
-#elif !defined (BACKEND_IS_GNUTLS)
+#if !defined (BACKEND_IS_GNUTLS)
   g_test_skip ("This backend does not support PKCS #11");
 #else
   GIOStream *connection;