[89308] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Tue Jan 24 08:42:13 PST 2012
Revision: 89308
http://trac.macports.org/changeset/89308
Author: ryandesign at macports.org
Date: 2012-01-24 08:42:10 -0800 (Tue, 24 Jan 2012)
Log Message:
-----------
glib2-devel: update to 2.31.12
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
trunk/dports/devel/glib2-devel/files/patch-configure.diff
trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff
Added 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-24 15:16:03 UTC (rev 89307)
+++ trunk/dports/devel/glib2-devel/Portfile 2012-01-24 16:42:10 UTC (rev 89308)
@@ -7,7 +7,7 @@
name glib2-devel
conflicts glib2
set my_name glib
-version 2.31.8
+version 2.31.12
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 74fe75abc1ac6c6a9a5936b272eb122dfccb6727 \
- sha256 1ce3d275189000e1c50e92efcdb6447bc260b1e5c41699b7a1959e3e1928fbaa
+checksums rmd160 2b728addaf66d934d4581edc0137db6872134c69 \
+ sha256 d5018f1f579e38f94a2c09235071e00f6c88110a5e939cb5a9f2ab7db15a60ad
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See http://trac.macports.org/changeset/27148
@@ -37,6 +37,7 @@
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
Modified: trunk/dports/devel/glib2-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.diff 2012-01-24 15:16:03 UTC (rev 89307)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.diff 2012-01-24 16:42:10 UTC (rev 89308)
@@ -1,6 +1,6 @@
---- configure.orig 2012-01-09 22:24:16.000000000 -0600
-+++ configure 2012-01-10 02:58:04.000000000 -0600
-@@ -29846,10 +29846,10 @@
+--- configure.orig 2012-01-20 14:10:58.000000000 -0600
++++ configure 2012-01-22 03:03:03.000000000 -0600
+@@ -29924,10 +29924,10 @@
*) glib_vacopy=''
esac
@@ -14,7 +14,7 @@
if test x$glib_cv_hasinline = xyes; then
glib_inline='#define G_HAVE_INLINE 1'
-@@ -31600,18 +31600,32 @@
+@@ -31678,18 +31678,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -54,7 +54,7 @@
_______EOF
else
cat >>$outfile <<_______EOF
-@@ -31623,9 +31637,15 @@
+@@ -31701,9 +31715,15 @@
cat >>$outfile <<_______EOF
@@ -73,7 +73,7 @@
_______EOF
-@@ -31653,18 +31673,33 @@
+@@ -31731,18 +31751,33 @@
if test -z "$glib_unknown_void_p"; then
cat >>$outfile <<_______EOF
@@ -116,7 +116,7 @@
_______EOF
else
echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile
-@@ -31777,7 +31812,9 @@
+@@ -31855,7 +31890,9 @@
if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile
@@ -126,7 +126,7 @@
fi
if test x"$g_atomic_lock_free" = xyes; then
echo >>$outfile
-@@ -31787,27 +31824,52 @@
+@@ -31865,27 +31902,52 @@
g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
Added: trunk/dports/devel/glib2-devel/files/patch-gio_gsocket.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_gsocket.c.diff (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_gsocket.c.diff 2012-01-24 16:42:10 UTC (rev 89308)
@@ -0,0 +1,23 @@
+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,
Modified: trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff 2012-01-24 15:16:03 UTC (rev 89307)
+++ trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff 2012-01-24 16:42:10 UTC (rev 89308)
@@ -1,8 +1,8 @@
---- glib-2.0.pc.in.orig 2011-12-07 19:10:26.000000000 -0600
-+++ glib-2.0.pc.in 2011-12-12 23:42:14.000000000 -0600
+--- glib-2.0.pc.in.orig 2012-01-15 21:12:06.000000000 -0600
++++ glib-2.0.pc.in 2012-01-19 22:29:43.000000000 -0600
@@ -13,4 +13,4 @@
Requires.private: @PCRE_REQUIRES@
Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
- Libs.private: @ICONV_LIBS@ @GLIB_RT_LIBS@
+ Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir} @GLIB_EXTRA_CFLAGS@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120124/f086b7ad/attachment.html>
More information about the macports-changes
mailing list