mirror of
https://github.com/ostreedev/ostree.git
synced 2025-01-09 01:18:35 +03:00
configure.ac: Bump GLib requirement to 2.40
Mainly for GVariantDict, useful for metadata.
This commit is contained in:
parent
0bae648977
commit
85933c7cca
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user