[pygi] Depend on GLib 2.20 rather than 2.22
- From: Simon van der Linden <svdlinden src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pygi] Depend on GLib 2.20 rather than 2.22
- Date: Mon, 30 Nov 2009 21:03:21 +0000 (UTC)
commit e955b931b07113c7432f7a85f882f69f12d263ad
Author: Anderson Lizardo <anderson lizardo openbossa org>
Date: Mon Nov 30 22:01:25 2009 +0100
Depend on GLib 2.20 rather than 2.22
Backport g_array_get_element_size.
https://bugzilla.gnome.org/show_bug.cgi?id=603411
configure.ac | 2 +-
gi/pygi-private.h | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6658869..33f30e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ CPPFLAGS="${save_CPPFLAGS}"
# GNOME
PKG_CHECK_MODULES(GNOME,
- glib-2.0 >= 2.22
+ glib-2.0 >= 2.20
gobject-introspection-1.0 >= 0.6.4
pygobject-2.0 >= 2.20
)
diff --git a/gi/pygi-private.h b/gi/pygi-private.h
index 4e2615f..562c8ab 100644
--- a/gi/pygi-private.h
+++ b/gi/pygi-private.h
@@ -43,6 +43,25 @@ G_BEGIN_DECLS
} \
} G_STMT_END
+#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION == 20
+/* Private stuff copied from glib-2.20.x sources */
+struct _GRealArray
+{
+ guint8 *data;
+ guint len;
+ guint alloc;
+ guint elt_size;
+ guint zero_terminated : 1;
+ guint clear : 1;
+};
+
+static inline guint
+g_array_get_element_size (GArray *array)
+{
+ struct _GRealArray *rarray = (struct _GRealArray*) array;
+ return rarray->elt_size;
+}
+#endif
/* Redefine g_array_index because we want it to return the i-th element, casted
* to the type t, of the array a, and not the i-th element of the array a
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]