[ostree] Hard require GLib 2.34

[Colin Walters <walters src gnome org>]

commit da43fb6db596b0ecad637e68220ce8e6670b4277
Author: Colin Walters <walters verbum org>
Date:   Sun Jul 15 18:22:41 2012 -0400

    Hard require GLib 2.34
    
    Anyone wanting to build against an earlier version can use the
    embedded-dependencies system.

 Makefile-otutil.am             |    2 -
 Makefile.am                    |    2 +-
 configure.ac                   |    2 +-
 src/libostree/ostree-repo.c    |   16 ++--
 src/libotutil/ot-glib-compat.c |  160 ----------------------------------------
 src/libotutil/ot-glib-compat.h |   64 ----------------
 src/libotutil/otutil.h         |    1 -
 7 files changed, 10 insertions(+), 237 deletions(-)
---
diff --git a/Makefile-otutil.am b/Makefile-otutil.am
index 5d88716..4855e5e 100644
--- a/Makefile-otutil.am
+++ b/Makefile-otutil.am
@@ -33,8 +33,6 @@ libotutil_la_SOURCES = \
 	src/libotutil/ot-variant-utils.h \
 	src/libotutil/ot-gio-utils.c \
 	src/libotutil/ot-gio-utils.h \
-	src/libotutil/ot-glib-compat.c \
-	src/libotutil/ot-glib-compat.h \
 	src/libotutil/otutil.c \
 	src/libotutil/otutil.h \
 	$(NULL)
diff --git a/Makefile.am b/Makefile.am
index 101dec6..9e2fdee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_CPPFLAGS = -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
-	-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_28 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_28
+	-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_34
 AM_CFLAGS = $(WARN_CFLAGS)
 
 if BUILD_EMBEDDED_DEPENDENCIES
diff --git a/configure.ac b/configure.ac
index c4f7d5e..61bd2b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ if test x$enable_embedded_dependencies = xyes; then
   echo "NOTICE: Embedded dependencies (GLib and libsoup) enabled"
   with_soup=yes
 else
-  GIO_DEPENDENCY="gio-unix-2.0 >= 2.28"
+  GIO_DEPENDENCY="gio-unix-2.0 >= 2.33.4"
   PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
 
   SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1"
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index c62614e..e95b9dd 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -120,7 +120,7 @@ ostree_repo_finalize (GObject *object)
   ot_clear_ptrarray (&self->cached_content_indexes);
   g_hash_table_destroy (self->cached_pack_index_mappings);
   g_hash_table_destroy (self->cached_pack_data_mappings);
-  ot_mutex_free (self->cache_lock);
+  g_mutex_clear (&self->cache_lock);
 
   G_OBJECT_CLASS (ostree_repo_parent_class)->finalize (object);
 }
@@ -214,7 +214,7 @@ ostree_repo_class_init (OstreeRepoClass *klass)
 static void
 ostree_repo_init (OstreeRepo *self)
 {
-  ot_mutex_init (self->cache_lock);
+  g_mutex_init (&self->cache_lock);
   self->cached_pack_index_mappings = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                             g_free,
                                                             (GDestroyNotify)g_variant_unref);
@@ -1924,7 +1924,7 @@ ostree_repo_list_pack_indexes (OstreeRepo              *self,
   ot_lptrarray GPtrArray *ret_meta_indexes = NULL;
   ot_lptrarray GPtrArray *ret_data_indexes = NULL;
 
-  ot_mutex_lock (self->cache_lock);
+  g_mutex_lock (&self->cache_lock);
   if (self->cached_meta_indexes)
     {
       ret_meta_indexes = g_ptr_array_ref (self->cached_meta_indexes);
@@ -1955,7 +1955,7 @@ ostree_repo_list_pack_indexes (OstreeRepo              *self,
   ot_transfer_out_value (out_meta_indexes, &ret_meta_indexes);
   ot_transfer_out_value (out_data_indexes, &ret_data_indexes);
  out:
-  ot_mutex_unlock (self->cache_lock);
+  g_mutex_unlock (&self->cache_lock);
   return ret;
 }
 
@@ -3392,7 +3392,7 @@ ostree_repo_load_pack_index (OstreeRepo    *self,
   ot_lvariant GVariant *ret_variant = NULL;
   ot_lobj GFile *path = NULL;
   
-  ot_mutex_lock (self->cache_lock);
+  g_mutex_lock (&self->cache_lock);
 
   ret_variant = g_hash_table_lookup (self->cached_pack_index_mappings, pack_checksum);
   if (ret_variant)
@@ -3415,7 +3415,7 @@ ostree_repo_load_pack_index (OstreeRepo    *self,
   ret = TRUE;
   ot_transfer_out_value (out_variant, &ret_variant);
  out:
-  ot_mutex_unlock (self->cache_lock);
+  g_mutex_unlock (&self->cache_lock);
   return ret;
 }
 
@@ -3441,7 +3441,7 @@ ostree_repo_map_pack_file (OstreeRepo    *self,
   GMappedFile *map = NULL;
   ot_lobj GFile *path = NULL;
 
-  ot_mutex_lock (self->cache_lock);
+  g_mutex_lock (&self->cache_lock);
 
   map = g_hash_table_lookup (self->cached_pack_data_mappings, pack_checksum);
   if (map == NULL)
@@ -3465,7 +3465,7 @@ ostree_repo_map_pack_file (OstreeRepo    *self,
   if (out_len)
     *out_len = ret_len;
  out:
-  ot_mutex_unlock (self->cache_lock);
+  g_mutex_unlock (&self->cache_lock);
   return ret;
 }
 
diff --git a/src/libotutil/otutil.h b/src/libotutil/otutil.h
index 532cca8..dfae5dc 100644
--- a/src/libotutil/otutil.h
+++ b/src/libotutil/otutil.h
@@ -45,7 +45,6 @@
 
 #include <ot-local-alloc.h>
 #include <ot-gio-utils.h>
-#include <ot-glib-compat.h>
 #include <ot-opt-utils.h>
 #include <ot-unix-utils.h>
 #include <ot-variant-utils.h>