[phodav: 1/14] build: require GIO version 2.38



commit 692f5d6dd62c2a6cdc1629ece82de341193308c1
Author: Jakub Janků <jjanku redhat com>
Date:   Fri May 24 19:52:14 2019 +0200

    build: require GIO version 2.38
    
    GTask, which requires 2.36, is already being used in the code.
    
    While we're at it, let's move to 2.38 and remove some checks.
    Also get rid of G_SOURCE_{REMOVE,CONTINUE} redefinitions.
    
    Signed-off-by: Jakub Janků <jjanku redhat com>

 libphodav/chezdav.c                | 3 ---
 libphodav/phodav-method-propfind.c | 4 ----
 meson.build                        | 4 ++--
 spice/spice-webdavd.c              | 7 -------
 4 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/libphodav/chezdav.c b/libphodav/chezdav.c
index 1cdaeea..f9301f2 100644
--- a/libphodav/chezdav.c
+++ b/libphodav/chezdav.c
@@ -216,9 +216,6 @@ main (int argc, char *argv[])
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-#if !GLIB_CHECK_VERSION (2, 35, 1)
-  g_type_init ();
-#endif
   g_set_prgname ("chezdav");
 
   context = g_option_context_new (_ ("- simple WebDAV server"));
diff --git a/libphodav/phodav-method-propfind.c b/libphodav/phodav-method-propfind.c
index 4031074..c9676e6 100644
--- a/libphodav/phodav-method-propfind.c
+++ b/libphodav/phodav-method-propfind.c
@@ -361,7 +361,6 @@ end:
   return node;
 }
 
-#if GLIB_CHECK_VERSION (2, 38, 0)
 static xmlNodePtr
 prop_quota_used (PathHandler *handler, PropFind *pf,
                  const gchar *path, GFileInfo *info, xmlNsPtr ns)
@@ -396,7 +395,6 @@ end:
   PROP_SET_STATUS (node, status);
   return node;
 }
-#endif
 
 static gint
 node_compare_int (xmlNodePtr a,
@@ -431,9 +429,7 @@ static const struct _PropList
   PROP (supportedlock, 0),
   PROP (lockdiscovery, 0),
   { "quota-available-bytes", prop_quota_available, },
-#if GLIB_CHECK_VERSION (2, 38, 0)
   { "quota-used-bytes", prop_quota_used, FALSE, TRUE, }
-#endif
 };
 
 static xmlNodePtr
diff --git a/meson.build b/meson.build
index f002194..c67f64a 100644
--- a/meson.build
+++ b/meson.build
@@ -29,9 +29,9 @@ conf = configuration_data()
 
 deps = []
 if host_machine.system() == 'windows'
-  deps += dependency('gio-windows-2.0')
+  deps += dependency('gio-windows-2.0', version : '>= 2.38')
 else
-  deps += dependency('gio-unix-2.0')
+  deps += dependency('gio-unix-2.0', version : '>= 2.38')
 endif
 
 deps += dependency('libsoup-2.4', version : '>= 2.48.0')
diff --git a/spice/spice-webdavd.c b/spice/spice-webdavd.c
index cd0029b..81fe6be 100644
--- a/spice/spice-webdavd.c
+++ b/spice/spice-webdavd.c
@@ -665,13 +665,6 @@ mdns_state_changed (GaClient *client, GaClientState state, gpointer user_data)
 }
 #endif
 
-#ifndef G_SOURCE_REMOVE
-#define G_SOURCE_REMOVE FALSE
-#endif
-#ifndef G_SOURCE_CONTINUE
-#define G_SOURCE_CONTINUE TRUE
-#endif
-
 #ifdef G_OS_UNIX
 static void
 wait_for_virtio_host (gint fd)


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