diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2013-03-08 12:23:43 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2013-03-08 12:23:43 +0000 |
| commit | 448b94e715b2ccd5261a50d60b463bee03f291ec (patch) | |
| tree | 331253c04c687198e570eb7280d1485322ed3004 /devel/glib20 | |
| parent | f54e0753a04bd761a7d59e56c731cd74da69f0f7 (diff) | |
| download | ports-448b94e715b2ccd5261a50d60b463bee03f291ec.tar.gz ports-448b94e715b2ccd5261a50d60b463bee03f291ec.zip | |
Notes
Diffstat (limited to 'devel/glib20')
| -rw-r--r-- | devel/glib20/files/extra-patch-glib_gunicollate.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c index e2493d133990..1d9af5fa72ca 100644 --- a/devel/glib20/files/extra-patch-glib_gunicollate.c +++ b/devel/glib20/files/extra-patch-glib_gunicollate.c @@ -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); |