[91812] trunk/dports/devel/glib2-devel

ryandesign at macports.org ryandesign at macports.org
Tue Apr 10 23:59:03 PDT 2012


Revision: 91812
          https://trac.macports.org/changeset/91812
Author:   ryandesign at macports.org
Date:     2012-04-10 23:59:02 -0700 (Tue, 10 Apr 2012)
Log Message:
-----------
glib2-devel: merge r91791 from glib2: Fix missing links in libgio and Tiger-compatible ObjC (#33934)

Revision Links:
--------------
    https://trac.macports.org/changeset/91791

Modified Paths:
--------------
    trunk/dports/devel/glib2-devel/Portfile

Added Paths:
-----------
    trunk/dports/devel/glib2-devel/files/patch-gio_Makefile.am.diff
    trunk/dports/devel/glib2-devel/files/patch-gio_gnextstepsettingsbackend.c.diff

Property Changed:
----------------
    trunk/dports/devel/glib2-devel/


Property changes on: trunk/dports/devel/glib2-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/devel/glib2:52045-52046,62644,64476,72697
   + /trunk/dports/devel/glib2:52045-52046,62644,64476,72697,91791

Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile	2012-04-11 06:52:59 UTC (rev 91811)
+++ trunk/dports/devel/glib2-devel/Portfile	2012-04-11 06:59:02 UTC (rev 91812)
@@ -8,6 +8,7 @@
 conflicts                   glib2
 set my_name                 glib
 version                     2.31.22
+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 \

Copied: trunk/dports/devel/glib2-devel/files/patch-gio_Makefile.am.diff (from rev 91791, trunk/dports/devel/glib2/files/patch-gio_Makefile.am.diff)
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_Makefile.am.diff	                        (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_Makefile.am.diff	2012-04-11 06:59:02 UTC (rev 91812)
@@ -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

Copied: trunk/dports/devel/glib2-devel/files/patch-gio_gnextstepsettingsbackend.c.diff (from rev 91791, trunk/dports/devel/glib2/files/patch-gio_gnextstepsettingsbackend.c.diff)
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-gio_gnextstepsettingsbackend.c.diff	                        (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-gio_gnextstepsettingsbackend.c.diff	2012-04-11 06:59:02 UTC (rev 91812)
@@ -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);
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120410/344f2cbc/attachment-0001.html>


More information about the macports-changes mailing list