[92606] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Wed May 2 00:15:16 PDT 2012
Revision: 92606
https://trac.macports.org/changeset/92606
Author: ryandesign at macports.org
Date: 2012-05-02 00:15:15 -0700 (Wed, 02 May 2012)
Log Message:
-----------
glib2-devel: update to 2.33.1
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
trunk/dports/devel/glib2-devel/files/patch-configure.diff
trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
Removed Paths:
-------------
trunk/dports/devel/glib2-devel/files/patch-gio_Makefile.am.diff
trunk/dports/devel/glib2-devel/files/patch-gio_gnextstepsettingsbackend.c.diff
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2012-05-02 07:08:23 UTC (rev 92605)
+++ trunk/dports/devel/glib2-devel/Portfile 2012-05-02 07:15:15 UTC (rev 92606)
@@ -7,8 +7,7 @@
name glib2-devel
conflicts glib2
set my_name glib
-version 2.31.22
-revision 1
+version 2.33.1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign openmaintainer
@@ -29,8 +28,8 @@
master_sites gnome:sources/${my_name}/${branch}/ \
ftp://ftp.gtk.org/pub/${my_name}/${branch}/
-checksums rmd160 ccff45e3499469aea022f1926e69245c0e8645cd \
- sha256 0f7dd3f13f23192d78c131bac3fcd8c5e9fe38fd415faa7bfc1d1f178de556d4
+checksums rmd160 d5b49783c70b60b04eba64ff6b1d86c5110c4c01 \
+ sha256 54fd1653c5ad129549ec42970253ff6b2e6e26c8a08351d92f0841a83f1b6d46
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See http://trac.macports.org/changeset/27148
@@ -39,9 +38,7 @@
patch-glib_gunicollate.c.diff \
patch-gi18n.h.diff \
patch-gio_xdgmime_xdgmime.c.diff \
- patch-gio_gdbusprivate.c.diff \
- patch-gio_gnextstepsettingsbackend.c.diff \
- patch-gio_Makefile.am.diff
+ patch-gio_gdbusprivate.c.diff
depends_lib port:gettext \
port:libiconv \
Modified: trunk/dports/devel/glib2-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.diff 2012-05-02 07:08:23 UTC (rev 92605)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.diff 2012-05-02 07:15:15 UTC (rev 92606)
@@ -1,6 +1,6 @@
---- configure.orig 2012-03-19 12:45:13.000000000 -0500
-+++ configure 2012-03-20 20:56:05.000000000 -0500
-@@ -30074,10 +30074,10 @@
+--- configure.orig 2012-05-01 17:16:39.000000000 -0500
++++ configure 2012-05-02 01:55:56.000000000 -0500
+@@ -30438,10 +30438,10 @@
*) glib_vacopy=''
esac
@@ -14,7 +14,7 @@
if test x$glib_cv_hasinline = xyes; then
glib_inline='#define G_HAVE_INLINE 1'
-@@ -31828,18 +31828,32 @@
+@@ -32202,18 +32202,32 @@
cat >>$outfile <<_______EOF
#define G_HAVE_GINT64 1 /* deprecated, always true */
@@ -54,7 +54,7 @@
_______EOF
else
cat >>$outfile <<_______EOF
-@@ -31851,9 +31865,15 @@
+@@ -32225,9 +32239,15 @@
cat >>$outfile <<_______EOF
@@ -73,7 +73,7 @@
_______EOF
-@@ -31881,18 +31901,33 @@
+@@ -32255,18 +32275,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
-@@ -32005,7 +32040,9 @@
+@@ -32379,7 +32414,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
-@@ -32015,27 +32052,52 @@
+@@ -32389,27 +32426,52 @@
g_bit_sizes="16 32 64"
for bits in $g_bit_sizes; do
cat >>$outfile <<_______EOF
Deleted: trunk/dports/devel/glib2-devel/files/patch-gio_Makefile.am.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_Makefile.am.diff 2012-05-02 07:08:23 UTC (rev 92605)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_Makefile.am.diff 2012-05-02 07:15:15 UTC (rev 92606)
@@ -1,27 +0,0 @@
---- gio/Makefile.am.orig 2012-04-10 10:20:25.000000000 -0700
-+++ gio/Makefile.am 2012-04-10 10:27:22.000000000 -0700
-@@ -455,10 +455,6 @@ libgio_2_0_la_LIBADD = \
-
- libgio_2_0_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
-
--if OS_CARBON
--libgio_2_0_la_CFLAGS = -xobjective-c
--endif
--
- if PLATFORM_WIN32
- no_undefined = -no-undefined
- endif
-@@ -492,6 +488,13 @@ libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAG
- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -export-dynamic $(no_undefined) $(export_symbols)
-
-+# This condition is misnamed. It's really checking for Cocoa, not Carbon
-+if OS_CARBON
-+# This is dumb. The ObjC source file should be properly named .m
-+libgio_2_0_la_CFLAGS = -xobjective-c
-+libgio_2_0_la_LDFLAGS += -framework Foundation
-+endif
-+
- libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
-
- gio-win32-res.o: gio.rc
Modified: trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff 2012-05-02 07:08:23 UTC (rev 92605)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_gdbusprivate.c.diff 2012-05-02 07:15:15 UTC (rev 92606)
@@ -1,6 +1,6 @@
---- gio/gdbusprivate.c.orig 2012-03-17 21:35:25.000000000 -0500
-+++ gio/gdbusprivate.c 2012-03-20 20:56:05.000000000 -0500
-@@ -2053,7 +2053,7 @@
+--- gio/gdbusprivate.c.orig 2012-04-30 11:24:02.000000000 -0500
++++ gio/gdbusprivate.c 2012-05-02 01:55:56.000000000 -0500
+@@ -2094,7 +2094,7 @@
/* TODO: use PACKAGE_LOCALSTATEDIR ? */
ret = NULL;
first_error = NULL;
@@ -9,7 +9,7 @@
&ret,
NULL,
&first_error) &&
-@@ -2063,7 +2063,7 @@
+@@ -2104,7 +2104,7 @@
NULL))
{
g_propagate_prefixed_error (error, first_error,
Deleted: trunk/dports/devel/glib2-devel/files/patch-gio_gnextstepsettingsbackend.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_gnextstepsettingsbackend.c.diff 2012-05-02 07:08:23 UTC (rev 92605)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_gnextstepsettingsbackend.c.diff 2012-05-02 07:15:15 UTC (rev 92606)
@@ -1,30 +0,0 @@
---- gio/gnextstepsettingsbackend.c.orig 2012-04-10 10:00:16.000000000 -0700
-+++ gio/gnextstepsettingsbackend.c 2012-04-10 10:11:15.000000000 -0700
-@@ -340,7 +340,12 @@ g_nextstep_settings_backend_get_g_varian
-
- g_variant_builder_init (&builder, type);
-
-- for (key in object)
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-+ for(key in object)
-+#else
-+ NSEnumerator *enumerator = [object objectEnumerator];
-+ while((key = [enumerator nextObject]))
-+#endif
- {
- GVariant *name;
- id value;
-@@ -376,7 +381,12 @@ g_nextstep_settings_backend_get_g_varian
- value_type = g_variant_type_element (type);
- g_variant_builder_init (&builder, type);
-
-- for (value in object)
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-+ for(value in object)
-+#else
-+ NSEnumerator *enumerator = [object objectEnumerator];
-+ while((value = [enumerator nextObject]))
-+#endif
- {
- GVariant *variant = g_nextstep_settings_backend_get_g_variant (value, value_type);
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120502/aca26401/attachment.html>
More information about the macports-changes
mailing list