[91791] trunk/dports/devel/glib2

[Ryan Schmidt]

On Apr 10, 2012, at 12:48, jeremyhu at macports.org wrote:

> Revision: 91791
>          https://trac.macports.org/changeset/91791
> Author:   jeremyhu at macports.org
> Date:     2012-04-10 10:48:05 -0700 (Tue, 10 Apr 2012)
> Log Message:
> -----------
> glib2: Fix missing links in libgio and Tiger-compatible ObjC

I guess this fixes https://trac.macports.org/ticket/33934?

And I should probably add these fixes to glib2-devel too.


> Modified Paths:
> --------------
>    trunk/dports/devel/glib2/Portfile
> 
> Added Paths:
> -----------
>    trunk/dports/devel/glib2/files/patch-gio_Makefile.am.diff
>    trunk/dports/devel/glib2/files/patch-gio_gnextstepsettingsbackend.c.diff
> 
> Modified: trunk/dports/devel/glib2/Portfile
> ===================================================================
> --- trunk/dports/devel/glib2/Portfile	2012-04-10 16:45:50 UTC (rev 91790)
> +++ trunk/dports/devel/glib2/Portfile	2012-04-10 17:48:05 UTC (rev 91791)
> @@ -8,6 +8,7 @@
> conflicts                   glib2-devel
> set my_name                 glib
> version                     2.32.0
> +revision                    1
> set branch                  [join [lrange [split ${version} .] 0 1] .]
> categories                  devel
> maintainers                 ryandesign openmaintainer
> @@ -38,7 +39,9 @@
>                             patch-glib_gunicollate.c.diff \
>                             patch-gi18n.h.diff \
>                             patch-gio_xdgmime_xdgmime.c.diff \
> -                            patch-gio_gdbusprivate.c.diff
> +                            patch-gio_gdbusprivate.c.diff \
> +                            patch-gio_gnextstepsettingsbackend.c.diff \
> +                            patch-gio_Makefile.am.diff
> 
> depends_lib                 port:gettext \
>                             port:libiconv \
> 
> Added: trunk/dports/devel/glib2/files/patch-gio_Makefile.am.diff
> ===================================================================
> --- trunk/dports/devel/glib2/files/patch-gio_Makefile.am.diff	                        (rev 0)
> +++ trunk/dports/devel/glib2/files/patch-gio_Makefile.am.diff	2012-04-10 17:48:05 UTC (rev 91791)
> @@ -0,0 +1,27 @@
> +--- 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
> 
> Added: trunk/dports/devel/glib2/files/patch-gio_gnextstepsettingsbackend.c.diff
> ===================================================================
> --- trunk/dports/devel/glib2/files/patch-gio_gnextstepsettingsbackend.c.diff	                        (rev 0)
> +++ trunk/dports/devel/glib2/files/patch-gio_gnextstepsettingsbackend.c.diff	2012-04-10 17:48:05 UTC (rev 91791)
> @@ -0,0 +1,30 @@
> +--- 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);
> +