Revision: 89495 http://trac.macports.org/changeset/89495 Author: ryandesign@macports.org Date: 2012-01-31 16:03:38 -0800 (Tue, 31 Jan 2012) Log Message: ----------- glib2-devel: update to 2.31.14 Modified Paths: -------------- trunk/dports/devel/glib2-devel/Portfile Removed Paths: ------------- trunk/dports/devel/glib2-devel/files/patch-gio_gsocket.c.diff Modified: trunk/dports/devel/glib2-devel/Portfile =================================================================== --- trunk/dports/devel/glib2-devel/Portfile 2012-01-31 23:53:41 UTC (rev 89494) +++ trunk/dports/devel/glib2-devel/Portfile 2012-02-01 00:03:38 UTC (rev 89495) @@ -7,7 +7,7 @@ name glib2-devel conflicts glib2 set my_name glib -version 2.31.12 +version 2.31.14 set branch [join [lrange [split ${version} .] 0 1] .] categories devel maintainers ryandesign openmaintainer @@ -28,8 +28,8 @@ master_sites gnome:sources/${my_name}/${branch}/ \ ftp://ftp.gtk.org/pub/${my_name}/${branch}/ -checksums rmd160 2b728addaf66d934d4581edc0137db6872134c69 \ - sha256 d5018f1f579e38f94a2c09235071e00f6c88110a5e939cb5a9f2ab7db15a60ad +checksums rmd160 9af7a3674c2c415f0bee3ab0bd5d8aae35aca308 \ + sha256 888b3839e4a9d198a14aef3d2b98d085a1337ce5922f5eed70f19b34a1cb6194 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h # See http://trac.macports.org/changeset/27148 @@ -37,7 +37,6 @@ patch-glib-2.0.pc.in.diff \ patch-glib_gunicollate.c.diff \ patch-gi18n.h.diff \ - patch-gio_gsocket.c.diff \ patch-gio_xdgmime_xdgmime.c.diff \ patch-gio_gdbusprivate.c.diff Deleted: trunk/dports/devel/glib2-devel/files/patch-gio_gsocket.c.diff =================================================================== --- trunk/dports/devel/glib2-devel/files/patch-gio_gsocket.c.diff 2012-01-31 23:53:41 UTC (rev 89494) +++ trunk/dports/devel/glib2-devel/files/patch-gio_gsocket.c.diff 2012-02-01 00:03:38 UTC (rev 89495) @@ -1,23 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=668468 ---- gio/gsocket.c.orig -+++ gio/gsocket.c -@@ -1934,7 +1934,18 @@ g_socket_multicast_group_operation (GSocket *socket, - #endif - - if (source_specific) -- optname = join_group ? IP_ADD_SOURCE_MEMBERSHIP : IP_DROP_SOURCE_MEMBERSHIP; -+ { -+#ifdef IP_ADD_SOURCE_MEMBERSHIP -+ optname = join_group ? IP_ADD_SOURCE_MEMBERSHIP : IP_DROP_SOURCE_MEMBERSHIP; -+#else -+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, -+ join_group ? -+ _("Error joining multicast group: %s") : -+ _("Error leaving multicast group: %s"), -+ _("No support for source-specific multicast")); -+ return FALSE; -+#endif -+ } - else - optname = join_group ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP; - result = setsockopt (socket->priv->fd, IPPROTO_IP, optname,