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

[ryandesign at macports.org]

Revision: 64477
          http://trac.macports.org/changeset/64477
Author:   ryandesign at macports.org
Date:     2010-03-06 16:16:31 -0800 (Sat, 06 Mar 2010)
Log Message:
-----------
glib2-devel: merge r64476 from glib2: don't use carbon for collation since carbon is not available on 64-bit, causing collation to be wrong on e.g. Snow Leopard; see #23959

Revision Links:
--------------
    http://trac.macports.org/changeset/64476

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

Added Paths:
-----------
    trunk/dports/devel/glib2-devel/files/patch-glib_gunicollate.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
   + /trunk/dports/devel/glib2:52045-52046,62644,64476

Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile	2010-03-07 00:07:34 UTC (rev 64476)
+++ trunk/dports/devel/glib2-devel/Portfile	2010-03-07 00:16:31 UTC (rev 64477)
@@ -6,6 +6,7 @@
 conflicts               glib2
 set my_name             glib
 version                 2.23.4
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              devel
 maintainers             ryandesign
@@ -38,6 +39,7 @@
 # See http://trac.macports.org/changeset/27148
 patchfiles \
     patch-glib-2.0.pc.in.diff \
+    patch-glib_gunicollate.c.diff \
     patch-gi18n.h.diff \
     patch-gio_xdgmime_xdgmime.c.diff
 

Copied: trunk/dports/devel/glib2-devel/files/patch-glib_gunicollate.c.diff (from rev 64476, trunk/dports/devel/glib2/files/patch-glib_gunicollate.c.diff)
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-glib_gunicollate.c.diff	                        (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-glib_gunicollate.c.diff	2010-03-07 00:16:31 UTC (rev 64477)
@@ -0,0 +1,12 @@
+--- glib/gunicollate.c.orig	2009-03-31 18:04:20.000000000 -0500
++++ glib/gunicollate.c	2010-03-06 17:59:08.000000000 -0600
+@@ -26,6 +26,9 @@
+ #include <wchar.h>
+ #endif
+ 
++/* Carbon is not available on 64-bit */
++#undef HAVE_CARBON
++
+ #ifdef HAVE_CARBON
+ #include <CoreServices/CoreServices.h>
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100306/b6364c43/attachment.html>