walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ship UCDN and use it by default 

So we are not relying on version of Unicode data in glib...

Fixes https://github.com/behdad/harfbuzz/issues/386
Fixes https://github.com/behdad/harfbuzz/issues/388
This commit is contained in:
Behdad Esfahbod 2017-01-05 20:12:32 -08:00
parent f339706947
commit 53543f8b3e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -289,9 +289,13 @@ AM_CONDITIONAL(HAVE_ICU_BUILTIN, $have_icu && test "x$with_icu" = "xbuiltin")
dnl =========================================================================== dnl ===========================================================================
have_ucdn=true AC_ARG_WITH(ucdn,
if $have_glib || test \( $have_icu -a "x$with_icu" = "xbuiltin" \); then [AS_HELP_STRING([--with-ucdn=@<:@yes/no@:>@],
have_ucdn=false [Use builtin UCDN library @<:@default=yes@:>@])],,
[with_ucdn=yes])
have_ucdn=false
if test "x$with_ucdn" = "xyes"; then
have_ucdn=true
fi fi
if $have_ucdn; then if $have_ucdn; then
AC_DEFINE(HAVE_UCDN, 1, [Have UCDN Unicode functions]) AC_DEFINE(HAVE_UCDN, 1, [Have UCDN Unicode functions])
@ -501,9 +505,9 @@ AC_MSG_NOTICE([
Build configuration: Build configuration:
Unicode callbacks (you want at least one): Unicode callbacks (you want at least one):
Builtin (UCDN): ${have_ucdn}
Glib: ${have_glib} Glib: ${have_glib}
ICU: ${have_icu} ICU: ${have_icu}
UCDN: ${have_ucdn}
Font callbacks (the more the better): Font callbacks (the more the better):
FreeType: ${have_freetype} FreeType: ${have_freetype}

6
src/hb-unicode.cc
View File

@ -131,12 +131,12 @@ hb_unicode_funcs_get_default (void)
#define HB_UNICODE_FUNCS_IMPLEMENT(set) \ #define HB_UNICODE_FUNCS_IMPLEMENT(set) \
return hb_##set##_get_unicode_funcs (); return hb_##set##_get_unicode_funcs ();
#ifdef HAVE_GLIB #if defined(HAVE_UCDN)
HB_UNICODE_FUNCS_IMPLEMENT(ucdn)
#elif defined(HAVE_GLIB)
HB_UNICODE_FUNCS_IMPLEMENT(glib) HB_UNICODE_FUNCS_IMPLEMENT(glib)
#elif defined(HAVE_ICU) && defined(HAVE_ICU_BUILTIN) #elif defined(HAVE_ICU) && defined(HAVE_ICU_BUILTIN)
HB_UNICODE_FUNCS_IMPLEMENT(icu) HB_UNICODE_FUNCS_IMPLEMENT(icu)
#elif defined(HAVE_UCDN)
HB_UNICODE_FUNCS_IMPLEMENT(ucdn)
#else #else
#define HB_UNICODE_FUNCS_NIL 1 #define HB_UNICODE_FUNCS_NIL 1
HB_UNICODE_FUNCS_IMPLEMENT(nil) HB_UNICODE_FUNCS_IMPLEMENT(nil)