sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix string collation by using the icu library, since the FreeBSD libc

Browse source 
does not support UTF-8 collation.
This commit is contained in:
Jean-Yves Lefort 2006-08-23 05:11:32 +00:00
parent 8cd734a75a
commit d0775b423f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=171239
3 changed files with 135 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
devel/glib20/Makefile
View file

@ -42,12 +42,20 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
OPTIONS= COLLATION_FIX "fix string collation" off
.include <bsd.port.pre.mk>
.if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) )
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gthread_gthread-posix.c
.endif
.if defined(WITH_COLLATION_FIX)
LIB_DEPENDS+= icui18n:${PORTSDIR}/devel/icu
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \
${FILESDIR}/extra-patch-glib_gunicollate.c
.endif
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g' \

11
devel/glib20/files/extra-patch-glib_Makefile.in Normal file
View file

@ -0,0 +1,11 @@
--- glib/Makefile.in.orig Wed Jul 19 01:08:13 2006
+++ glib/Makefile.in Wed Jul 19 01:09:10 2006
@@ -130,7 +130,7 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -licui18n
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@

116
devel/glib20/files/extra-patch-glib_gunicollate.c Normal file
View file

@ -0,0 +1,116 @@
--- glib/gunicollate.c.orig Sun Nov 27 21:15:41 2005
+++ glib/gunicollate.c Wed Jul 19 01:06:32 2006
@@ -26,10 +26,57 @@
#include <wchar.h>
#endif
+#include <unicode/umachine.h>
+#include <unicode/ustring.h>
+#include <unicode/ucol.h>
+
#include "glib.h"
#include "gunicodeprivate.h"
#include "galias.h"
+static gboolean icu_collator_initialized = FALSE;
+static UCollator *icu_collator = NULL;
+G_LOCK_DEFINE_STATIC(icu_collator);
+
+static void
+init_icu_collator (void)
+{
+ G_LOCK(icu_collator);
+ if (! icu_collator_initialized)
+ {
+ UErrorCode error = U_ZERO_ERROR;
+
+ icu_collator = ucol_open(NULL, &error);
+ if (icu_collator == NULL)
+ g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error));
+
+ icu_collator_initialized = TRUE;
+ }
+ G_UNLOCK(icu_collator);
+}
+
+static UChar *
+utf8_to_uchar (const char *str, int32_t len, int32_t *result_len)
+{
+ UErrorCode error = U_ZERO_ERROR;
+ UChar *result = NULL;
+
+ u_strFromUTF8(NULL, 0, result_len, str, len, &error);
+ if (error <= U_ZERO_ERROR || error == U_BUFFER_OVERFLOW_ERROR)
+ {
+ error = U_ZERO_ERROR;
+ result = g_new(UChar, *result_len);
+ u_strFromUTF8(result, *result_len, NULL, str, len, &error);
+ if (error > U_ZERO_ERROR)
+ {
+ g_free(result);
+ result = NULL;
+ }
+ }
+
+ return result;
+}
+
/**
* g_utf8_collate:
* @str1: a UTF-8 encoded string
@@ -76,6 +123,28 @@
g_return_val_if_fail (str1 != NULL, 0);
g_return_val_if_fail (str2 != NULL, 0);
+ init_icu_collator();
+ if (icu_collator != NULL)
+ {
+ int32_t wstr1_len;
+ UChar *wstr1 = utf8_to_uchar(str1, -1, &wstr1_len);
+ if (wstr1 != NULL)
+ {
+ int32_t wstr2_len;
+ UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len);
+ if (wstr2 != NULL)
+ {
+ result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len);
+
+ g_free(wstr1);
+ g_free(wstr2);
+
+ return result;
+ }
+ g_free(wstr1);
+ }
+ }
+
str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
@@ -217,6 +286,26 @@
gchar *str_norm;
g_return_val_if_fail (str != NULL, NULL);
+
+ init_icu_collator();
+ if (icu_collator != NULL)
+ {
+ int32_t wstr_len;
+ UChar *wstr = utf8_to_uchar(str, len, &wstr_len);
+ if (wstr != NULL)
+ {
+ uint8_t dummy;
+ int32_t result_len;
+
+ /* get size of result */
+ result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, &dummy, 1);
+
+ result = g_new(char, result_len);
+ ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len);
+
+ return result;
+ }
+ }
str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE);