here's the upstream patch to get beast
to compile properly against glib-2.10.
future beast versions will automatically include this.
---
ciaoTJ
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/beast/sfi/ChangeLog,v
retrieving revision 1.286
diff -u -p -r1.286 ChangeLog
--- ChangeLog 9 Mar 2006 00:53:39 -0000 1.286
+++ ChangeLog 27 Mar 2006 16:39:17 -0000
@@ -1,3 +1,8 @@
+Mon Mar 27 18:22:18 2006 Stefan Westerfeld <[EMAIL PROTECTED]>
+
+ * glib-extra.[hc]: g_intern_(static)_string only needs to be provided
+ for old glib versions (< glib-2.9.0).
+
Thu Mar 9 00:55:39 2006 Tim Janik <[EMAIL PROTECTED]>
* Makefile.am: get rid of sficonfig.h. generate partial library
libsfi.o.
Index: glib-extra.c
===================================================================
RCS file: /cvs/gnome/beast/sfi/glib-extra.c,v
retrieving revision 1.30
diff -u -p -r1.30 glib-extra.c
--- glib-extra.c 9 Mar 2006 00:53:39 -0000 1.30
+++ glib-extra.c 27 Mar 2006 16:39:17 -0000
@@ -170,6 +170,7 @@ g_strdup_lstrip (const gchar *string)
return NULL;
}
+#if !GLIB_CHECK_VERSION (2, 9, 0)
const gchar*
g_intern_string (const gchar *string)
{
@@ -181,6 +182,7 @@ g_intern_static_string (const gchar *s
{
return string ? g_quark_to_string (g_quark_from_static_string (string)) :
NULL;
}
+#endif
static gchar*
delim_concat_varargs (const gchar *first_string,
Index: glib-extra.h
===================================================================
RCS file: /cvs/gnome/beast/sfi/glib-extra.h,v
retrieving revision 1.36
diff -u -p -r1.36 glib-extra.h
--- glib-extra.h 9 Mar 2006 00:53:39 -0000 1.36
+++ glib-extra.h 27 Mar 2006 16:39:17 -0000
@@ -89,8 +89,11 @@ gchar* g_strdup_stripped (const gchar
gchar* g_strdup_rstrip (const gchar *string);
gchar* g_strdup_lstrip (const gchar *string);
+#if !GLIB_CHECK_VERSION (2, 9, 0)
const gchar* g_intern_string (const gchar *string);
const gchar* g_intern_static_string (const gchar *string);
+#endif
+
const gchar* g_intern_strconcat (const gchar *first_string,
...);
const gchar* g_intern_printf (const gchar *format,
