[gtk-vnc] build: bump min versions of dependancies to RHEL8 vintage

[Daniel P. Berrange <dberrange src gnome org>]

commit f79a54e8b6922c3387e0f27deb543fe7b4a2cdc6
Author: Daniel P. Berrangé <dan berrange com>
Date:   Thu Jan 7 15:39:08 2021 +0000

    build: bump min versions of dependancies to RHEL8 vintage
    
    Signed-off-by: Daniel P. Berrangé <berrange redhat com>

 meson.build         | 21 ++++++++++-----------
 src/vncconnection.c | 51 ---------------------------------------------------
 2 files changed, 10 insertions(+), 62 deletions(-)
---
diff --git a/meson.build b/meson.build
index 70b9494..a6cbe3f 100644
--- a/meson.build
+++ b/meson.build
@@ -54,21 +54,20 @@ elif coroutine != 'gthread'
 endif
 
 # gvnc
-glib_min_version = '2.42.0'
-gdk_pixbuf_min_version = '2.12.0'
-gcrypt_min_version = '1.5.0'
-gnutls_min_version = '3.1.18'
-# Should be newer, but fedora mingw pkgconfig is fubar
-zlib_min_version = '1.2.5'
-libsasl_min_version = '2.1.26'
+glib_min_version = '2.56.0'
+gdk_pixbuf_min_version = '2.36.0'
+gcrypt_min_version = '1.8.0'
+gnutls_min_version = '3.6.0'
+zlib_min_version = '1.2.11'
+libsasl_min_version = '2.1.27'
 
 # gtk-vnc
-gtk_min_version = '3.0.0'
-cairo_min_version = '1.2.0'
-x11_min_version = '1.6.0'
+gtk_min_version = '3.22.0'
+cairo_min_version = '1.15.0'
+x11_min_version = '1.6.5'
 
 # gvncpule
-libpulse_min_version = '10.0'
+libpulse_min_version = '11.0'
 
 # common
 gobject_introspection_min_version = '1.56.0'
diff --git a/src/vncconnection.c b/src/vncconnection.c
index 9c0f2d4..8feb32b 100644
--- a/src/vncconnection.c
+++ b/src/vncconnection.c
@@ -57,13 +57,6 @@
 
 #include "dh.h"
 
-#if GCRYPT_VERSION_NUMBER < 0x010600
-#define VNC_INIT_GCRYPT_THREADING
-#else
-#undef VNC_INIT_GCRYPT_THREADING
-#endif
-
-
 #define GTK_VNC_ERROR g_quark_from_static_string("gtk-vnc")
 
 struct wait_queue
@@ -1255,47 +1248,6 @@ static void vnc_connection_debug_gnutls_log(int level, const char* str) {
 }
 #endif
 
-#ifdef VNC_INIT_GCRYPT_THREADING
-static int gvnc_tls_mutex_init (void **priv)
-{                                                                             \
-    GMutex *lock = NULL;
-    lock = g_new0(GMutex, 1);
-    *priv = lock;
-    return 0;
-}
-
-static int gvnc_tls_mutex_destroy(void **priv)
-{
-    GMutex *lock = *priv;
-    g_free(lock);
-    return 0;
-}
-
-static int gvnc_tls_mutex_lock(void **priv)
-{
-    GMutex *lock = *priv;
-    g_mutex_lock(lock);
-    return 0;
-}
-
-static int gvnc_tls_mutex_unlock(void **priv)
-{
-    GMutex *lock = *priv;
-    g_mutex_unlock(lock);
-    return 0;
-}
-
-static struct gcry_thread_cbs gvnc_thread_impl = {
-    (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
-    NULL,
-    gvnc_tls_mutex_init,
-    gvnc_tls_mutex_destroy,
-    gvnc_tls_mutex_lock,
-    gvnc_tls_mutex_unlock,
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-};
-#endif /* VNC_INIT_GCRYPT_THREADING */
-
 
 static gboolean vnc_connection_tls_initialize(void)
 {
@@ -1304,9 +1256,6 @@ static gboolean vnc_connection_tls_initialize(void)
     if (tlsinitialized)
         return TRUE;
 
-#ifdef VNC_INIT_GCRYPT_THREADING
-    gcry_control(GCRYCTL_SET_THREAD_CBS, &gvnc_thread_impl);
-#endif /* VNC_INIT_GCRYPT_THREADING */
     gcry_check_version(NULL);
 
     if (gnutls_global_init () < 0)