Fix build with gcc-2.95, and bump revision

OK ajacoutot@ (MAINTAINER)
This commit is contained in:
sebastia 2010-12-29 09:58:45 +00:00
parent d050660782
commit ec3c5449eb
3 changed files with 43 additions and 1 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.102 2010/11/26 07:19:00 espie Exp $
# $OpenBSD: Makefile,v 1.103 2010/12/29 09:58:45 sebastia Exp $
COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation
VERSION= 2.26.1
REVISION = 0
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-gio_gdbusmessage_c,v 1.1 2010/12/29 09:58:45 sebastia Exp $
fix for gcc-2.95
--- gio/gdbusmessage.c.orig Wed Dec 29 09:10:01 2010
+++ gio/gdbusmessage.c Wed Dec 29 09:16:01 2010
@@ -1186,7 +1186,9 @@ parse_value_from_blob (GMemoryInputStream *mis,
v = g_data_input_stream_read_uint64 (dis, NULL, &local_error);
if (local_error != NULL)
goto fail;
- G_STATIC_ASSERT (sizeof (gdouble) == sizeof (guint64));
+ {
+ G_STATIC_ASSERT (sizeof (gdouble) == sizeof (guint64));
+ }
encoded = (gdouble *) &v;
ret = g_variant_new_double (*encoded);
}

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-gio_tests_gdbus-connection_c,v 1.1 2010/12/29 09:58:45 sebastia Exp $
Fix for gcc-2.95
--- gio/tests/gdbus-connection.c.orig Wed Dec 29 09:41:16 2010
+++ gio/tests/gdbus-connection.c Wed Dec 29 09:48:35 2010
@@ -529,6 +529,8 @@ test_connection_signals (void)
GError *error;
gboolean ret;
GVariant *result;
+ gboolean quit_mainloop_fired;
+ guint quit_mainloop_id;
error = NULL;
@@ -686,8 +688,6 @@ test_connection_signals (void)
* Also to check the total amount of NameOwnerChanged signals - use a 5 second ceiling
* to avoid spinning forever
*/
- gboolean quit_mainloop_fired;
- guint quit_mainloop_id;
quit_mainloop_fired = FALSE;
quit_mainloop_id = g_timeout_add (30000, test_connection_quit_mainloop, &quit_mainloop_fired);
while (count_name_owner_changed < 2 && !quit_mainloop_fired)