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

Update to glib2-2.36.1.

Browse Source
This commit is contained in:
ajacoutot 2013-04-16 06:01:54 +00:00
parent 54f6347ba5
commit 413541e414
4 changed files with 12 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devel/glib2/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.203 2013/04/05 19:20:26 jturner Exp $
# $OpenBSD: Makefile,v 1.204 2013/04/16 06:01:54 ajacoutot Exp $
COMMENT= general-purpose utility library
GNOME_PROJECT= glib
GNOME_VERSION= 2.36.0
GNOME_VERSION= 2.36.1
PKGNAME= ${DISTNAME:S/glib/glib2/}
REVISION= 1
CATEGORIES= devel
@ -13,11 +12,11 @@ HOMEPAGE= http://www.gtk.org/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
SHARED_LIBS += glib-2.0 3600.0 # 3600.0
SHARED_LIBS += gmodule-2.0 3600.0 # 3600.0
SHARED_LIBS += gthread-2.0 3600.0 # 3600.0
SHARED_LIBS += gobject-2.0 3600.0 # 3600.0
SHARED_LIBS += gio-2.0 3600.0 # 3600.0
SHARED_LIBS += glib-2.0 3600.1 # 3600.1
SHARED_LIBS += gmodule-2.0 3600.1 # 3600.1
SHARED_LIBS += gthread-2.0 3600.1 # 3600.1
SHARED_LIBS += gobject-2.0 3600.1 # 3600.1
SHARED_LIBS += gio-2.0 3600.1 # 3600.1
# LGPLv2
PERMIT_PACKAGE_CDROM= Yes

4
devel/glib2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (glib-2.36.0.tar.xz) = RVqKvoaSxRdLzH/6FblqdSGi8vn7R1lEBZJ8Ncubsic=
SIZE (glib-2.36.0.tar.xz) = 6508276
SHA256 (glib-2.36.1.tar.xz) = feN1hnlOksAk/uvl0wa/XyRf70gDw2Zq8a6NrG7hCyQ=
SIZE (glib-2.36.1.tar.xz) = 6524408

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

@ -1,28 +0,0 @@
$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))

6
devel/glib2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.26 2013/03/27 17:49:34 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.27 2013/04/16 06:01:54 ajacoutot Exp $
@conflict glib2-docs-*
@conflict glib2-fam-*
@pkgpath devel/glib2,-docs
@ -325,8 +325,8 @@ share/bash-completion/completions/gsettings
share/doc/pkg-readmes/${FULLPKGNAME}
share/gdb/
share/gdb/auto-load/
share/gdb/auto-load/libglib-2.0.so.0.3600.0-gdb.py
share/gdb/auto-load/libgobject-2.0.so.0.3600.0-gdb.py
share/gdb/auto-load/libglib-2.0.so.0.3600.1-gdb.py
share/gdb/auto-load/libgobject-2.0.so.0.3600.1-gdb.py
share/glib-2.0/
share/glib-2.0/codegen/
share/glib-2.0/codegen/__init__.py