From owner-svn-ports-head@FreeBSD.ORG  Fri Mar  8 12:23:44 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 06C7EB5D;
 Fri,  8 Mar 2013 12:23:44 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EC743DAB;
 Fri,  8 Mar 2013 12:23:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r28CNhjR000725;
 Fri, 8 Mar 2013 12:23:43 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r28CNhWY000724;
 Fri, 8 Mar 2013 12:23:43 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201303081223.r28CNhWY000724@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Fri, 8 Mar 2013 12:23:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313639 - head/devel/glib20/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Mar 2013 12:23:44 -0000

Author: kwm
Date: Fri Mar  8 12:23:43 2013
New Revision: 313639
URL: http://svnweb.freebsd.org/changeset/ports/313639

Log:
  Fix the build when the COLLATION_FIX option is enabled.
  
  Reported by:	ajtiM <lumiwa@gmail.com>

Modified:
  head/devel/glib20/files/extra-patch-glib_gunicollate.c

Modified: head/devel/glib20/files/extra-patch-glib_gunicollate.c
==============================================================================
--- head/devel/glib20/files/extra-patch-glib_gunicollate.c	Fri Mar  8 12:21:07 2013	(r313638)
+++ head/devel/glib20/files/extra-patch-glib_gunicollate.c	Fri Mar  8 12:23:43 2013	(r313639)
@@ -1,5 +1,5 @@
---- glib/gunicollate.c.orig	2012-03-12 00:42:42.000000000 +0000
-+++ glib/gunicollate.c	2012-09-27 15:11:08.000000000 +0000
+--- glib/gunicollate.c.orig	2012-11-24 20:50:39.000000000 +0000
++++ glib/gunicollate.c	2013-03-08 12:16:59.000000000 +0000
 @@ -26,6 +26,10 @@
  #include <wchar.h>
  #endif
@@ -11,7 +11,13 @@
  #ifdef HAVE_CARBON
  #include <CoreServices/CoreServices.h>
  #endif
-@@ -41,6 +45,48 @@
+@@ -36,11 +40,54 @@
+ #include "gstring.h"
+ #include "gstrfuncs.h"
+ #include "gtestutils.h"
++#include "gthread.h"
+ #include "gcharset.h"
+ #ifndef __STDC_ISO_10646__
  #include "gconvert.h"
  #endif
  
@@ -60,7 +66,7 @@
  
  #ifdef _MSC_VER
  /* Workaround for bug in MSVCR80.DLL */
-@@ -128,6 +174,28 @@
+@@ -128,6 +175,28 @@
    g_return_val_if_fail (str1 != NULL, 0);
    g_return_val_if_fail (str2 != NULL, 0);
  
@@ -89,7 +95,7 @@
    str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
    str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
  
-@@ -420,6 +488,26 @@
+@@ -419,6 +488,26 @@
  
    g_return_val_if_fail (str != NULL, NULL);