Drop glib requrirement to 2.28

This lets it build on more currently-released systems like Fedora 15.
This commit is contained in:
Colin Walters 2011-10-26 14:10:20 -04:00
parent 37bea9f29d
commit 03943c659f
7 changed files with 7 additions and 8 deletions

View File

@ -31,7 +31,7 @@ LT_INIT
PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0 >= 2.30])
PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0 >= 2.28])
AM_PATH_PYTHON

View File

@ -268,7 +268,7 @@ check_trigger (OstreeCheckout *self,
goto out;
datain = g_data_input_stream_new (instream);
while ((line = g_data_input_stream_read_line_utf8 (datain, &len, NULL, &temp_error)) != NULL)
while ((line = g_data_input_stream_read_line (datain, &len, NULL, &temp_error)) != NULL)
{
if (g_str_has_prefix (line, "# IfExecutable: "))
{

View File

@ -19,6 +19,8 @@
* Author: Colin Walters <walters@verbum.org>
*/
#define _GNU_SOURCE
#include "config.h"
#include "ostree.h"
@ -265,7 +267,7 @@ import_gvariant_object (OstreeRepo *self,
serialized = g_variant_new ("(uv)", (guint32)type, variant);
tmp_name = g_build_filename (priv->objects_path, "variant-tmp-XXXXXX", NULL);
fd = mkstemp (tmp_name);
fd = g_mkstemp (tmp_name);
if (fd < 0)
{
ot_util_set_error_from_errno (error, errno);

View File

@ -21,7 +21,6 @@
#include "config.h"
#include <glib-unix.h>
#include <gio/gio.h>
#include <gio/gunixinputstream.h>

View File

@ -23,7 +23,6 @@
#include "ot-unix-utils.h"
#include <glib-unix.h>
#include <gio/gio.h>
#include <gio/gunixoutputstream.h>
@ -205,7 +204,7 @@ ot_util_set_error_from_errno (GError **error,
gint saved_errno)
{
g_set_error_literal (error,
G_UNIX_ERROR,
G_IO_ERROR,
0,
g_strerror (saved_errno));
errno = saved_errno;

View File

@ -23,10 +23,10 @@
#define __OSTREE_UNIX_UTILS_H__
#include <gio/gio.h>
#include <glib-unix.h>
/* I just put all this shit here. Sue me. */
#include <sys/types.h>
#include <errno.h>
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>

View File

@ -21,7 +21,6 @@
#include "config.h"
#include <glib-unix.h>
#include <gio/gio.h>
#include <string.h>