cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add interface-after-init exception for glibmm and gtk# ; from upstream.

Browse Source
This commit is contained in:
ajacoutot 2013-04-05 06:33:21 +00:00
parent 07281374f8
commit 067ffc0dab
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/glib2/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.201 2013/03/27 17:49:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.202 2013/04/05 06:33:21 ajacoutot Exp $
COMMENT= general-purpose utility library
GNOME_PROJECT= glib
GNOME_VERSION= 2.36.0
PKGNAME= ${DISTNAME:S/glib/glib2/}
REVISION= 0
CATEGORIES= devel

28
devel/glib2/patches/patch-gobject_gtype_c Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-gobject_gtype_c,v 1.1 2013/04/05 06:33:21 ajacoutot Exp $
From 9982e183725efd798eb4374f4ae0dce2935adf2a Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Thu, 04 Apr 2013 13:31:11 +0000
Subject: gtype: interface-after-init exception for glibmm
From cf1285a4a473ec0f9b51b298b4ea9c4717cb1243 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Thu, 04 Apr 2013 15:12:42 +0000
Subject: gtype: interface-after-init exception for gtk#
--- gobject/gtype.c.orig Mon Mar 25 18:02:43 2013
+++ gobject/gtype.c Fri Apr 5 08:21:01 2013
@@ -1006,7 +1006,12 @@ check_add_interface_L (GType instance_type,
{
g_warning ("attempting to add an interface (%s) to class (%s) after class_init",
NODE_NAME (iface), NODE_NAME (node));
- return FALSE;
+
+ /* See https://bugzilla.gnome.org/show_bug.cgi?id=697229,
+ * https://bugzilla.gnome.org/show_bug.cgi?id=687659
+ */
+ if (!g_str_has_prefix (NODE_NAME (node), "gtkmm__CustomObject_") && !strstr (NODE_NAME (node), "_gtksharp_"))
+ return FALSE;
}
tnode = lookup_type_node_I (NODE_PARENT_TYPE (iface));
if (NODE_PARENT_TYPE (tnode) && !type_lookup_iface_entry_L (node, tnode))