diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-10-10 07:00:01 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-10-10 07:00:01 +0800 |
| commit | 2694c6483445020631a58c34e56240e4d4190dda (patch) | |
| tree | 76a43f4dac3ce4b8b7f8e59480fcc86468c8ac79 | |
| parent | 59525642a03b6002ed6abb4f13569962321c501a (diff) | |
| download | marcuscom-ports-2694c6483445020631a58c34e56240e4d4190dda.tar marcuscom-ports-2694c6483445020631a58c34e56240e4d4190dda.tar.gz marcuscom-ports-2694c6483445020631a58c34e56240e4d4190dda.tar.bz2 marcuscom-ports-2694c6483445020631a58c34e56240e4d4190dda.tar.lz marcuscom-ports-2694c6483445020631a58c34e56240e4d4190dda.tar.xz marcuscom-ports-2694c6483445020631a58c34e56240e4d4190dda.tar.zst marcuscom-ports-2694c6483445020631a58c34e56240e4d4190dda.zip | |
Fix collate patch.
Submitted by: romain
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14801 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/glib20/files/extra-patch-glib_gunicollate.c | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c index dfcb99209..e2edc6938 100644 --- a/devel/glib20/files/extra-patch-glib_gunicollate.c +++ b/devel/glib20/files/extra-patch-glib_gunicollate.c @@ -1,6 +1,6 @@ ---- glib/gunicollate.c.orig Thu Jun 8 17:24:10 2006 -+++ glib/gunicollate.c Thu Oct 19 20:12:50 2006 -@@ -26,10 +26,57 @@ +--- glib/gunicollate.c.orig ++++ glib/gunicollate.c +@@ -26,6 +26,10 @@ #include <wchar.h> #endif @@ -8,9 +8,17 @@ +#include <unicode/ustring.h> +#include <unicode/ucol.h> + - #include "glib.h" - #include "gunicodeprivate.h" - #include "galias.h" + #ifdef HAVE_CARBON + #include <CoreServices/CoreServices.h> + #endif +@@ -36,10 +40,53 @@ + #include "gstring.h" + #include "gstrfuncs.h" + #include "gtestutils.h" ++#include "gthread.h" + #ifndef __STDC_ISO_10646__ + #include "gconvert.h" + #endif +static gboolean icu_collator_initialized = FALSE; +static UCollator *icu_collator = NULL; @@ -54,11 +62,10 @@ + + return result; +} -+ + #ifdef _MSC_VER /* Workaround for bug in MSVCR80.DLL */ - static size_t -@@ -94,6 +141,28 @@ +@@ -127,6 +174,28 @@ g_return_val_if_fail (str1 != NULL, 0); g_return_val_if_fail (str2 != NULL, 0); @@ -87,11 +94,10 @@ str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE); str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE); -@@ -235,6 +304,26 @@ - gchar *str_norm; +@@ -419,6 +488,26 @@ g_return_val_if_fail (str != NULL, NULL); -+ + + init_icu_collator(); + if (icu_collator != NULL) + { @@ -111,6 +117,7 @@ + return result; + } + } - ++ str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE); + result = NULL; |