[ostree] configure.ac: Bump GLib requirement to 2.40
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] configure.ac: Bump GLib requirement to 2.40
- Date: Tue, 3 Mar 2015 00:20:01 +0000 (UTC)
commit 85933c7cca4351ab6c182383f0720384ad9af713
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Mar 2 14:05:16 2015 -0500
configure.ac: Bump GLib requirement to 2.40
Mainly for GVariantDict, useful for metadata.
Makefile.am | 2 +-
configure.ac | 2 +-
src/libotutil/ot-variant-utils.c | 8 --------
3 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c2190c9..b5b43d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
-DLOCALEDIR=\"$(datadir)/locale\" -DSYSCONFDIR=\"$(sysconfdir)\" \
-DGPGVPATH=\"$(GPGVPATH)\" \
-DOSTREE_FEATURES='"$(OSTREE_FEATURES)"' \
- -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36 \
+ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40 \
-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_48
AM_CFLAGS += $(WARN_CFLAGS)
DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode
diff --git a/configure.ac b/configure.ac
index f6aeb01..180950f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AC_CHECK_HEADER([attr/xattr.h],,[AC_MSG_ERROR([You must have attr/xattr.h from l
PKG_PROG_PKG_CONFIG
-GIO_DEPENDENCY="gio-unix-2.0 >= 2.36.0 libgsystem >= 2015.1"
+GIO_DEPENDENCY="gio-unix-2.0 >= 2.40.0 libgsystem >= 2015.1"
PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
dnl 5.1.0 is an arbitrary version here
diff --git a/src/libotutil/ot-variant-utils.c b/src/libotutil/ot-variant-utils.c
index 7aa4274..fab893e 100644
--- a/src/libotutil/ot-variant-utils.c
+++ b/src/libotutil/ot-variant-utils.c
@@ -280,15 +280,7 @@ ot_variant_new_from_bytes (const GVariantType *type,
GBytes *bytes,
gboolean trusted)
{
-#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_36
return g_variant_new_from_bytes (type, bytes, trusted);
-#else
- gsize size;
- gconstpointer data = g_bytes_get_data (bytes, &size);
- g_bytes_ref (bytes);
- return g_variant_new_from_data (type, data, size, trusted,
- (GDestroyNotify)g_bytes_unref, bytes);
-#endif
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]