diff --git a/CMakeLists.txt b/CMakeLists.txt index 19508c8e..fce1c2fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,9 +116,9 @@ set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS "${FFMPEG_L if(CORE_SYSTEM_NAME STREQUAL windowsstore) # fix linking - set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LTCG /defaultlib:vccorlib.lib /defaultlib:msvcrt.lib") - set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_RELEASE "/LTCG /defaultlib:vccorlib.lib /defaultlib:msvcrt.lib") - set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_DEBUG "/LTCG /defaultlib:vccorlibd.lib /defaultlib:msvcrtd.lib") + set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LTCG /defaultlib:vccorlib.lib /defaultlib:msvcrt.lib /defaultlib:onecore.lib") + set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_RELEASE "/LTCG /defaultlib:vccorlib.lib /defaultlib:msvcrt.lib /defaultlib:onecore.lib") + set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_DEBUG "/LTCG /defaultlib:vccorlibd.lib /defaultlib:msvcrtd.lib /defaultlib:onecore.lib") endif() include(CPack) diff --git a/depends/android/gmp/CMakeLists.txt b/depends/android/gmp/CMakeLists.txt deleted file mode 100644 index 24a88f5e..00000000 --- a/depends/android/gmp/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -project(gmp) - -cmake_minimum_required(VERSION 3.5) - -list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) - -include(ExternalProject) -externalproject_add(gmp - SOURCE_DIR ${CMAKE_SOURCE_DIR} - CONFIGURE_COMMAND /configure - ${COMPILER_WITH_LIBTOOL_SYSROOT_APPLE} - --prefix=${CMAKE_INSTALL_PREFIX} - --disable-shared - --with-pic - ${gmp_conf}) - -install(CODE "Message(Done)") diff --git a/depends/android/gmp/gmp.sha256 b/depends/android/gmp/gmp.sha256 deleted file mode 100644 index 5753de38..00000000 --- a/depends/android/gmp/gmp.sha256 +++ /dev/null @@ -1 +0,0 @@ -258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526 diff --git a/depends/android/gmp/gmp.txt b/depends/android/gmp/gmp.txt deleted file mode 100644 index 625c12b6..00000000 --- a/depends/android/gmp/gmp.txt +++ /dev/null @@ -1 +0,0 @@ -gmp https://gmplib.org/download/gmp/gmp-6.2.0.tar.xz diff --git a/depends/android/iconv/CMakeLists.txt b/depends/android/iconv/CMakeLists.txt deleted file mode 100644 index 20ba2fe6..00000000 --- a/depends/android/iconv/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(iconv) - -include(ExternalProject) -externalproject_add(iconv - SOURCE_DIR ${CMAKE_SOURCE_DIR} - CONFIGURE_COMMAND ./configure --disable-shared --prefix=${OUTPUT_DIR} --enable-extra-encodings --with-pic - BUILD_COMMAND make - INSTALL_COMMAND "" - BUILD_IN_SOURCE 1) - -install(CODE "execute_process(COMMAND make install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") diff --git a/depends/android/iconv/iconv.sha256 b/depends/android/iconv/iconv.sha256 deleted file mode 100644 index 7165e7c5..00000000 --- a/depends/android/iconv/iconv.sha256 +++ /dev/null @@ -1 +0,0 @@ -e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04 diff --git a/depends/android/iconv/iconv.txt b/depends/android/iconv/iconv.txt deleted file mode 100644 index 72f1324b..00000000 --- a/depends/android/iconv/iconv.txt +++ /dev/null @@ -1 +0,0 @@ -iconv http://mirrors.kodi.tv/build-deps/sources/libiconv-1.16.tar.gz diff --git a/depends/common/gmp/darwin_embedded-deps.txt b/depends/common/gmp/darwin_embedded-deps.txt new file mode 100644 index 00000000..e69de29b diff --git a/depends/android/gmp/deps.txt b/depends/common/gmp/deps.txt similarity index 100% rename from depends/android/gmp/deps.txt rename to depends/common/gmp/deps.txt diff --git a/depends/common/gmp/osx-deps.txt b/depends/common/gmp/osx-deps.txt new file mode 100644 index 00000000..e69de29b diff --git a/depends/common/gnutls/0001-android-hackfix-fpending_c.patch b/depends/common/gnutls/0001-android-hackfix-fpending_c.patch new file mode 100644 index 00000000..9244e25a --- /dev/null +++ b/depends/common/gnutls/0001-android-hackfix-fpending_c.patch @@ -0,0 +1,17 @@ +--- a/src/gl/fpending.c ++++ b/src/gl/fpending.c +@@ -40,8 +40,14 @@ __fpending (FILE *fp) + /* GNU libc, BeOS, Haiku, Linux libc5 */ + return fp->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ ++#if defined ANDROID && __ANDROID_API__ < 23 ++ /* Hack fix for Kodi as it still use Android API 21 */ ++ #warning "ANDROID API to low, no __fpending usable" ++ return 1; ++#else + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */ + return fp->_p - fp->_bf._base; ++#endif + #elif defined __EMX__ /* emx+gcc */ + return fp->_ptr - fp->_buffer; + #elif defined __minix /* Minix */ diff --git a/depends/common/gnutls/01-size-max.patch b/depends/common/gnutls/01-size-max.patch deleted file mode 100644 index c9a30cbe..00000000 --- a/depends/common/gnutls/01-size-max.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/gl/read-file.c -+++ b/gl/read-file.c -@@ -27,6 +27,7 @@ - - /* Get PTRDIFF_MAX. */ - #include -+#include - - /* Get malloc, realloc, free. */ - #include ---- a/src/gl/read-file.c -+++ b/src/gl/read-file.c -@@ -27,6 +27,7 @@ - - /* Get PTRDIFF_MAX. */ - #include -+#include - - /* Get malloc, realloc, free. */ - #include diff --git a/depends/common/gnutls/02-include-libdl-if-available.patch b/depends/common/gnutls/02-include-libdl-if-available.patch deleted file mode 100644 index 454ce0c0..00000000 --- a/depends/common/gnutls/02-include-libdl-if-available.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur gnutls/configure.ac gnutls-patched/configure.ac ---- gnutls/configure.ac 2020-09-04 07:37:27.000000000 +0100 -+++ gnutls-patched/configure.ac 2020-09-10 09:26:43.000000000 +0100 -@@ -552,6 +552,9 @@ - - - AC_LIB_HAVE_LINKFLAGS(dl,, [#include ], [dladdr (0, 0);]) -+if test "x$HAVE_LIBDL" = "xyes"; then -+ AC_SUBST([LIBDL], [-ldl]) -+fi - - AC_ARG_ENABLE(fips140-mode, - AS_HELP_STRING([--enable-fips140-mode], [enable FIPS140-2 mode]), -diff -ur gnutls/lib/gnutls.pc.in gnutls-patched/lib/gnutls.pc.in ---- gnutls/lib/gnutls.pc.in 2020-08-30 14:58:51.000000000 +0100 -+++ gnutls-patched/lib/gnutls.pc.in 2020-09-10 09:27:56.000000000 +0100 -@@ -19,6 +19,6 @@ - URL: https://www.gnutls.org/ - Version: @VERSION@ - Libs: -L${libdir} -lgnutls --Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ -+Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ @LIBDL@ - @GNUTLS_REQUIRES_PRIVATE@ - Cflags: -I${includedir} diff --git a/depends/common/gnutls/03-undo-libtasn1-cisdigit.patch b/depends/common/gnutls/03-undo-libtasn1-cisdigit.patch deleted file mode 100644 index 8ca9e53b..00000000 --- a/depends/common/gnutls/03-undo-libtasn1-cisdigit.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- a/lib/minitasn1/decoding.c -+++ b/lib/minitasn1/decoding.c -@@ -32,7 +32,6 @@ - #include - #include - #include --#include - - #ifdef DEBUG - # define warn() fprintf(stderr, "%s: %d\n", __func__, __LINE__) -@@ -353,7 +352,7 @@ - p = &der[len_len]; - for (i=0;i<(unsigned)(str_len-1);i++) - { -- if (c_isdigit(p[i]) == 0) -+ if (isdigit(p[i]) == 0) - { - if (type == ASN1_ETYPE_GENERALIZED_TIME) - { ---- a/lib/minitasn1/element.c -+++ b/lib/minitasn1/element.c -@@ -30,7 +30,6 @@ - #include "parser_aux.h" - #include - #include "structure.h" --#include "c-ctype.h" - #include "element.h" - - void -@@ -380,7 +379,7 @@ - case ASN1_ETYPE_ENUMERATED: - if (len == 0) - { -- if ((c_isdigit (value[0])) || (value[0] == '-')) -+ if ((isdigit (value[0])) || (value[0] == '-')) - { - value_temp = malloc (SIZEOF_UNSIGNED_LONG_INT); - if (value_temp == NULL) -@@ -453,7 +452,7 @@ - p = node->down; - while (type_field (p->type) != ASN1_ETYPE_DEFAULT) - p = p->right; -- if ((c_isdigit (p->value[0])) || (p->value[0] == '-')) -+ if ((isdigit (p->value[0])) || (p->value[0] == '-')) - { - default_temp = malloc (SIZEOF_UNSIGNED_LONG_INT); - if (default_temp == NULL) -@@ -519,7 +518,7 @@ - break; - case ASN1_ETYPE_OBJECT_ID: - for (i = 0; i < _asn1_strlen (value); i++) -- if ((!c_isdigit (value[i])) && (value[i] != '.') && (value[i] != '+')) -+ if ((!isdigit (value[i])) && (value[i] != '.') && (value[i] != '+')) - return ASN1_VALUE_NOT_VALID; - if (node->type & CONST_DEFAULT) - { -@@ -540,7 +539,7 @@ - if (len < 11) - return ASN1_VALUE_NOT_VALID; - for (k = 0; k < 10; k++) -- if (!c_isdigit (value[k])) -+ if (!isdigit (value[k])) - return ASN1_VALUE_NOT_VALID; - switch (len) - { -@@ -549,7 +548,7 @@ - return ASN1_VALUE_NOT_VALID; - break; - case 13: -- if ((!c_isdigit (value[10])) || (!c_isdigit (value[11])) || -+ if ((!isdigit (value[10])) || (!isdigit (value[11])) || - (value[12] != 'Z')) - return ASN1_VALUE_NOT_VALID; - break; -@@ -557,16 +556,16 @@ - if ((value[10] != '+') && (value[10] != '-')) - return ASN1_VALUE_NOT_VALID; - for (k = 11; k < 15; k++) -- if (!c_isdigit (value[k])) -+ if (!isdigit (value[k])) - return ASN1_VALUE_NOT_VALID; - break; - case 17: -- if ((!c_isdigit (value[10])) || (!c_isdigit (value[11]))) -+ if ((!isdigit (value[10])) || (!isdigit (value[11]))) - return ASN1_VALUE_NOT_VALID; - if ((value[12] != '+') && (value[12] != '-')) - return ASN1_VALUE_NOT_VALID; - for (k = 13; k < 17; k++) -- if (!c_isdigit (value[k])) -+ if (!isdigit (value[k])) - return ASN1_VALUE_NOT_VALID; - break; - default: -@@ -890,7 +889,7 @@ - p = node->down; - while (type_field (p->type) != ASN1_ETYPE_DEFAULT) - p = p->right; -- if ((c_isdigit (p->value[0])) || (p->value[0] == '-') -+ if ((isdigit (p->value[0])) || (p->value[0] == '-') - || (p->value[0] == '+')) - { - result = _asn1_convert_integer - ---- a/lib/minitasn1/int.h -+++ b/lib/minitasn1/int.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #ifdef HAVE_SYS_TYPES_H ---- a/lib/minitasn1/parser_aux.c -+++ b/lib/minitasn1/parser_aux.c -@@ -26,7 +26,6 @@ - #include "gstr.h" - #include "structure.h" - #include "element.h" --#include "c-ctype.h" - - char _asn1_identifierMissing[ASN1_MAX_NAME_SIZE + 1]; /* identifier name not found */ - -@@ -755,7 +754,7 @@ - p2 = p->down; - if (p2 && (type_field (p2->type) == ASN1_ETYPE_CONSTANT)) - { -- if (p2->value && !c_isdigit (p2->value[0])) -+ if (p2->value && !isdigit (p2->value[0])) - { - _asn1_str_cpy (name2, sizeof (name2), name_root); - _asn1_str_cat (name2, sizeof (name2), "."); -@@ -1067,7 +1066,7 @@ - p2 = p->down; - if (p2 && (type_field (p2->type) == ASN1_ETYPE_CONSTANT)) - { -- if (p2->value && !c_isdigit (p2->value[0])) -+ if (p2->value && !isdigit (p2->value[0])) - { - _asn1_str_cpy (name2, sizeof (name2), node->name); - _asn1_str_cat (name2, sizeof (name2), "."); diff --git a/depends/common/gnutls/04-fix-arm-clang-build.patch b/depends/common/gnutls/04-fix-arm-clang-build.patch deleted file mode 100644 index cf9647e9..00000000 --- a/depends/common/gnutls/04-fix-arm-clang-build.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/lib/accelerated/aarch64/Makefile.am -+++ b/lib/accelerated/aarch64/Makefile.am -@@ -34,7 +34,7 @@ - endif - - #ensure that we have all aarch64 instruction sets enabled for the assembler --AM_CCASFLAGS = -Wa,-march=all -+#AM_CCASFLAGS = -Wa,-march=all - - EXTRA_DIST = README - ---- a/lib/accelerated/aarch64/Makefile.in -+++ b/lib/accelerated/aarch64/Makefile.in -@@ -1634,7 +1634,7 @@ - -I$(srcdir)/../../ -I$(srcdir)/../ $(am__append_1) - - #ensure that we have all aarch64 instruction sets enabled for the assembler --AM_CCASFLAGS = -Wa,-march=all -+#AM_CCASFLAGS = -Wa,-march=all - EXTRA_DIST = README - noinst_LTLIBRARIES = libaarch64.la - libaarch64_la_SOURCES = aarch64-common.c aarch64-common.h \ diff --git a/depends/common/gnutls/gnutls.sha256 b/depends/common/gnutls/gnutls.sha256 index 837e7559..2575b5e0 100644 --- a/depends/common/gnutls/gnutls.sha256 +++ b/depends/common/gnutls/gnutls.sha256 @@ -1 +1 @@ -1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3 +0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 diff --git a/depends/common/gnutls/gnutls.txt b/depends/common/gnutls/gnutls.txt index 099c44a9..70528558 100644 --- a/depends/common/gnutls/gnutls.txt +++ b/depends/common/gnutls/gnutls.txt @@ -1 +1 @@ -gnutls http://mirrors.kodi.tv/build-deps/sources/gnutls-3.6.16.tar.xz +gnutls https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz diff --git a/depends/common/iconv/0001-patch-utf8mac.patch b/depends/common/iconv/0001-patch-utf8mac.patch new file mode 100644 index 00000000..3b034975 --- /dev/null +++ b/depends/common/iconv/0001-patch-utf8mac.patch @@ -0,0 +1,1662 @@ +From 8c3ac8e3fffa51dc1f8b1e49619fb33cb91e889f Mon Sep 17 00:00:00 2001 +From: Alwin Esch +Date: Sun, 28 May 2023 23:42:48 +0200 +Subject: [PATCH 1/2] patch-utf8mac + +--- + lib/converters.h | 3 + + lib/encodings.def | 8 + + lib/utf8mac.h | 1608 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 1619 insertions(+) + create mode 100644 lib/utf8mac.h + +diff --git a/lib/converters.h b/lib/converters.h +index e2e2227..73ea374 100644 +--- a/lib/converters.h ++++ b/lib/converters.h +@@ -122,6 +122,9 @@ struct conv_struct { + /* General multi-byte encodings */ + #include "utf8.h" + #include "ucs2.h" ++#ifdef TARGET_DARWIN ++#include "utf8mac.h" ++#endif + #include "ucs2be.h" + #include "ucs2le.h" + #include "ucs4.h" +diff --git a/lib/encodings.def b/lib/encodings.def +index 41d8063..1eae590 100644 +--- a/lib/encodings.def ++++ b/lib/encodings.def +@@ -68,6 +68,14 @@ DEFALIAS( "UTF8", /* HP-UX */ + utf8) + #endif + ++#ifdef TARGET_DARWIN ++DEFENCODING(( "UTF-8-MAC", /* utf8-nfd */ ++ "UTF8-MAC", /* label from samba 2.2jp */ ++ ), ++ utf8mac, ++ { utf8mac_mbtowc, NULL }, { utf8mac_wctomb, NULL }) ++#endif ++ + DEFENCODING(( "UCS-2", /* glibc */ + "ISO-10646-UCS-2", /* IANA */ + "csUnicode", /* IANA */ +diff --git a/lib/utf8mac.h b/lib/utf8mac.h +new file mode 100644 +index 0000000..35cc41f +--- /dev/null ++++ b/lib/utf8mac.h +@@ -0,0 +1,1608 @@ ++/* ++ * Copyright (C) 2003 Apple Computer, Inc. All rights reserved. ++ * ++ * This file is part of the GNU LIBICONV Library. ++ * ++ * The GNU LIBICONV Library is free software; you can redistribute it ++ * and/or modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * The GNU LIBICONV Library is distributed in the hope that it will be ++ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with the GNU LIBICONV Library; see the file COPYING.LIB. ++ * If not, write to the Free Software Foundation, Inc., 59 Temple Place - ++ * Suite 330, Boston, MA 02111-1307, USA. ++ */ ++ ++/* ++ * UTF-8-MAC ++ */ ++ ++ /* ++ Includes Unicode 3.2 decomposition code derived from Core Foundation ++ */ ++ ++#include ++#include ++#include /* bzero() */ ++ ++#define UTF_REVERSE_ENDIAN 0x01 /* reverse UCS-2 byte order */ ++#define UTF_NO_NULL_TERM 0x02 /* do not add null termination */ ++#define UTF_DECOMPOSED 0x04 /* generate fully decomposed UCS-2 */ ++#define UTF_PRECOMPOSED 0x08 /* generate precomposed UCS-2 */ ++ ++int utf8_encodestr (const u_int16_t *, size_t, u_int8_t *, size_t *, ++ size_t, u_int16_t, int); ++ ++int utf8_decodestr (const u_int8_t *, size_t, u_int16_t *,size_t *, ++ size_t, u_int16_t, int, size_t *); ++ ++/* ++ Derived from Core Foundation headers: ++ ++ CFUniCharDecompData.h ++ CFUniCharPrecompData.h ++ CFUniCharNonBaseData.h ++*/ ++ ++static const u_int16_t ++__CFUniCharDecompositionTable[] = { ++ 0x00C0, 0x2000, 0x00C1, 0x2002, 0x00C2, 0x2004, 0x00C3, 0x2006, ++ 0x00C4, 0x2008, 0x00C5, 0x200A, 0x00C7, 0x200C, 0x00C8, 0x200E, ++ 0x00C9, 0x2010, 0x00CA, 0x2012, 0x00CB, 0x2014, 0x00CC, 0x2016, ++ 0x00CD, 0x2018, 0x00CE, 0x201A, 0x00CF, 0x201C, 0x00D1, 0x201E, ++ 0x00D2, 0x2020, 0x00D3, 0x2022, 0x00D4, 0x2024, 0x00D5, 0x2026, ++ 0x00D6, 0x2028, 0x00D9, 0x202A, 0x00DA, 0x202C, 0x00DB, 0x202E, ++ 0x00DC, 0x2030, 0x00DD, 0x2032, 0x00E0, 0x2034, 0x00E1, 0x2036, ++ 0x00E2, 0x2038, 0x00E3, 0x203A, 0x00E4, 0x203C, 0x00E5, 0x203E, ++ 0x00E7, 0x2040, 0x00E8, 0x2042, 0x00E9, 0x2044, 0x00EA, 0x2046, ++ 0x00EB, 0x2048, 0x00EC, 0x204A, 0x00ED, 0x204C, 0x00EE, 0x204E, ++ 0x00EF, 0x2050, 0x00F1, 0x2052, 0x00F2, 0x2054, 0x00F3, 0x2056, ++ 0x00F4, 0x2058, 0x00F5, 0x205A, 0x00F6, 0x205C, 0x00F9, 0x205E, ++ 0x00FA, 0x2060, 0x00FB, 0x2062, 0x00FC, 0x2064, 0x00FD, 0x2066, ++ 0x00FF, 0x2068, 0x0100, 0x206A, 0x0101, 0x206C, 0x0102, 0x206E, ++ 0x0103, 0x2070, 0x0104, 0x2072, 0x0105, 0x2074, 0x0106, 0x2076, ++ 0x0107, 0x2078, 0x0108, 0x207A, 0x0109, 0x207C, 0x010A, 0x207E, ++ 0x010B, 0x2080, 0x010C, 0x2082, 0x010D, 0x2084, 0x010E, 0x2086, ++ 0x010F, 0x2088, 0x0112, 0x208A, 0x0113, 0x208C, 0x0114, 0x208E, ++ 0x0115, 0x2090, 0x0116, 0x2092, 0x0117, 0x2094, 0x0118, 0x2096, ++ 0x0119, 0x2098, 0x011A, 0x209A, 0x011B, 0x209C, 0x011C, 0x209E, ++ 0x011D, 0x20A0, 0x011E, 0x20A2, 0x011F, 0x20A4, 0x0120, 0x20A6, ++ 0x0121, 0x20A8, 0x0122, 0x20AA, 0x0123, 0x20AC, 0x0124, 0x20AE, ++ 0x0125, 0x20B0, 0x0128, 0x20B2, 0x0129, 0x20B4, 0x012A, 0x20B6, ++ 0x012B, 0x20B8, 0x012C, 0x20BA, 0x012D, 0x20BC, 0x012E, 0x20BE, ++ 0x012F, 0x20C0, 0x0130, 0x20C2, 0x0134, 0x20C4, 0x0135, 0x20C6, ++ 0x0136, 0x20C8, 0x0137, 0x20CA, 0x0139, 0x20CC, 0x013A, 0x20CE, ++ 0x013B, 0x20D0, 0x013C, 0x20D2, 0x013D, 0x20D4, 0x013E, 0x20D6, ++ 0x0143, 0x20D8, 0x0144, 0x20DA, 0x0145, 0x20DC, 0x0146, 0x20DE, ++ 0x0147, 0x20E0, 0x0148, 0x20E2, 0x014C, 0x20E4, 0x014D, 0x20E6, ++ 0x014E, 0x20E8, 0x014F, 0x20EA, 0x0150, 0x20EC, 0x0151, 0x20EE, ++ 0x0154, 0x20F0, 0x0155, 0x20F2, 0x0156, 0x20F4, 0x0157, 0x20F6, ++ 0x0158, 0x20F8, 0x0159, 0x20FA, 0x015A, 0x20FC, 0x015B, 0x20FE, ++ 0x015C, 0x2100, 0x015D, 0x2102, 0x015E, 0x2104, 0x015F, 0x2106, ++ 0x0160, 0x2108, 0x0161, 0x210A, 0x0162, 0x210C, 0x0163, 0x210E, ++ 0x0164, 0x2110, 0x0165, 0x2112, 0x0168, 0x2114, 0x0169, 0x2116, ++ 0x016A, 0x2118, 0x016B, 0x211A, 0x016C, 0x211C, 0x016D, 0x211E, ++ 0x016E, 0x2120, 0x016F, 0x2122, 0x0170, 0x2124, 0x0171, 0x2126, ++ 0x0172, 0x2128, 0x0173, 0x212A, 0x0174, 0x212C, 0x0175, 0x212E, ++ 0x0176, 0x2130, 0x0177, 0x2132, 0x0178, 0x2134, 0x0179, 0x2136, ++ 0x017A, 0x2138, 0x017B, 0x213A, 0x017C, 0x213C, 0x017D, 0x213E, ++ 0x017E, 0x2140, 0x01A0, 0x2142, 0x01A1, 0x2144, 0x01AF, 0x2146, ++ 0x01B0, 0x2148, 0x01CD, 0x214A, 0x01CE, 0x214C, 0x01CF, 0x214E, ++ 0x01D0, 0x2150, 0x01D1, 0x2152, 0x01D2, 0x2154, 0x01D3, 0x2156, ++ 0x01D4, 0x2158, 0x01D5, 0xA15A, 0x01D6, 0xA15C, 0x01D7, 0xA15E, ++ 0x01D8, 0xA160, 0x01D9, 0xA162, 0x01DA, 0xA164, 0x01DB, 0xA166, ++ 0x01DC, 0xA168, 0x01DE, 0xA16A, 0x01DF, 0xA16C, 0x01E0, 0xA16E, ++ 0x01E1, 0xA170, 0x01E2, 0x2172, 0x01E3, 0x2174, 0x01E6, 0x2176, ++ 0x01E7, 0x2178, 0x01E8, 0x217A, 0x01E9, 0x217C, 0x01EA, 0x217E, ++ 0x01EB, 0x2180, 0x01EC, 0xA182, 0x01ED, 0xA184, 0x01EE, 0x2186, ++ 0x01EF, 0x2188, 0x01F0, 0x218A, 0x01F4, 0x218C, 0x01F5, 0x218E, ++ 0x01F8, 0x2190, 0x01F9, 0x2192, 0x01FA, 0xA194, 0x01FB, 0xA196, ++ 0x01FC, 0x2198, 0x01FD, 0x219A, 0x01FE, 0x219C, 0x01FF, 0x219E, ++ 0x0200, 0x21A0, 0x0201, 0x21A2, 0x0202, 0x21A4, 0x0203, 0x21A6, ++ 0x0204, 0x21A8, 0x0205, 0x21AA, 0x0206, 0x21AC, 0x0207, 0x21AE, ++ 0x0208, 0x21B0, 0x0209, 0x21B2, 0x020A, 0x21B4, 0x020B, 0x21B6, ++ 0x020C, 0x21B8, 0x020D, 0x21BA, 0x020E, 0x21BC, 0x020F, 0x21BE, ++ 0x0210, 0x21C0, 0x0211, 0x21C2, 0x0212, 0x21C4, 0x0213, 0x21C6, ++ 0x0214, 0x21C8, 0x0215, 0x21CA, 0x0216, 0x21CC, 0x0217, 0x21CE, ++ 0x0218, 0x21D0, 0x0219, 0x21D2, 0x021A, 0x21D4, 0x021B, 0x21D6, ++ 0x021E, 0x21D8, 0x021F, 0x21DA, 0x0226, 0x21DC, 0x0227, 0x21DE, ++ 0x0228, 0x21E0, 0x0229, 0x21E2, 0x022A, 0xA1E4, 0x022B, 0xA1E6, ++ 0x022C, 0xA1E8, 0x022D, 0xA1EA, 0x022E, 0x21EC, 0x022F, 0x21EE, ++ 0x0230, 0xA1F0, 0x0231, 0xA1F2, 0x0232, 0x21F4, 0x0233, 0x21F6, ++ 0x0340, 0x1300, 0x0341, 0x1301, 0x0343, 0x1313, 0x0344, 0x21F8, ++ 0x0374, 0x12B9, 0x037E, 0x103B, 0x0385, 0x21FA, 0x0386, 0x21FC, ++ 0x0387, 0x10B7, 0x0388, 0x21FE, 0x0389, 0x2200, 0x038A, 0x2202, ++ 0x038C, 0x2204, 0x038E, 0x2206, 0x038F, 0x2208, 0x0390, 0xA20A, ++ 0x03AA, 0x220C, 0x03AB, 0x220E, 0x03AC, 0x2210, 0x03AD, 0x2212, ++ 0x03AE, 0x2214, 0x03AF, 0x2216, 0x03B0, 0xA218, 0x03CA, 0x221A, ++ 0x03CB, 0x221C, 0x03CC, 0x221E, 0x03CD, 0x2220, 0x03CE, 0x2222, ++ 0x03D3, 0x2224, 0x03D4, 0x2226, 0x0400, 0x2228, 0x0401, 0x222A, ++ 0x0403, 0x222C, 0x0407, 0x222E, 0x040C, 0x2230, 0x040D, 0x2232, ++ 0x040E, 0x2234, 0x0419, 0x2236, 0x0439, 0x2238, 0x0450, 0x223A, ++ 0x0451, 0x223C, 0x0453, 0x223E, 0x0457, 0x2240, 0x045C, 0x2242, ++ 0x045D, 0x2244, 0x045E, 0x2246, 0x0476, 0x2248, 0x0477, 0x224A, ++ 0x04C1, 0x224C, 0x04C2, 0x224E, 0x04D0, 0x2250, 0x04D1, 0x2252, ++ 0x04D2, 0x2254, 0x04D3, 0x2256, 0x04D6, 0x2258, 0x04D7, 0x225A, ++ 0x04DA, 0x225C, 0x04DB, 0x225E, 0x04DC, 0x2260, 0x04DD, 0x2262, ++ 0x04DE, 0x2264, 0x04DF, 0x2266, 0x04E2, 0x2268, 0x04E3, 0x226A, ++ 0x04E4, 0x226C, 0x04E5, 0x226E, 0x04E6, 0x2270, 0x04E7, 0x2272, ++ 0x04EA, 0x2274, 0x04EB, 0x2276, 0x04EC, 0x2278, 0x04ED, 0x227A, ++ 0x04EE, 0x227C, 0x04EF, 0x227E, 0x04F0, 0x2280, 0x04F1, 0x2282, ++ 0x04F2, 0x2284, 0x04F3, 0x2286, 0x04F4, 0x2288, 0x04F5, 0x228A, ++ 0x04F8, 0x228C, 0x04F9, 0x228E, 0x0622, 0x2290, 0x0623, 0x2292, ++ 0x0624, 0x2294, 0x0625, 0x2296, 0x0626, 0x2298, 0x06C0, 0x229A, ++ 0x06C2, 0x229C, 0x06D3, 0x229E, 0x0929, 0x22A0, 0x0931, 0x22A2, ++ 0x0934, 0x22A4, 0x0958, 0x22A6, 0x0959, 0x22A8, 0x095A, 0x22AA, ++ 0x095B, 0x22AC, 0x095C, 0x22AE, 0x095D, 0x22B0, 0x095E, 0x22B2, ++ 0x095F, 0x22B4, 0x09CB, 0x22B6, 0x09CC, 0x22B8, 0x09DC, 0x22BA, ++ 0x09DD, 0x22BC, 0x09DF, 0x22BE, 0x0A33, 0x22C0, 0x0A36, 0x22C2, ++ 0x0A59, 0x22C4, 0x0A5A, 0x22C6, 0x0A5B, 0x22C8, 0x0A5E, 0x22CA, ++ 0x0B48, 0x22CC, 0x0B4B, 0x22CE, 0x0B4C, 0x22D0, 0x0B5C, 0x22D2, ++ 0x0B5D, 0x22D4, 0x0B94, 0x22D6, 0x0BCA, 0x22D8, 0x0BCB, 0x22DA, ++ 0x0BCC, 0x22DC, 0x0C48, 0x22DE, 0x0CC0, 0x22E0, 0x0CC7, 0x22E2, ++ 0x0CC8, 0x22E4, 0x0CCA, 0x22E6, 0x0CCB, 0xA2E8, 0x0D4A, 0x22EA, ++ 0x0D4B, 0x22EC, 0x0D4C, 0x22EE, 0x0DDA, 0x22F0, 0x0DDC, 0x22F2, ++ 0x0DDD, 0xA2F4, 0x0DDE, 0x22F6, 0x0F43, 0x22F8, 0x0F4D, 0x22FA, ++ 0x0F52, 0x22FC, 0x0F57, 0x22FE, 0x0F5C, 0x2300, 0x0F69, 0x2302, ++ 0x0F73, 0x2304, 0x0F75, 0x2306, 0x0F76, 0x2308, 0x0F78, 0x230A, ++ 0x0F81, 0x230C, 0x0F93, 0x230E, 0x0F9D, 0x2310, 0x0FA2, 0x2312, ++ 0x0FA7, 0x2314, 0x0FAC, 0x2316, 0x0FB9, 0x2318, 0x1026, 0x231A, ++ 0x1E00, 0x231C, 0x1E01, 0x231E, 0x1E02, 0x2320, 0x1E03, 0x2322, ++ 0x1E04, 0x2324, 0x1E05, 0x2326, 0x1E06, 0x2328, 0x1E07, 0x232A, ++ 0x1E08, 0xA32C, 0x1E09, 0xA32E, 0x1E0A, 0x2330, 0x1E0B, 0x2332, ++ 0x1E0C, 0x2334, 0x1E0D, 0x2336, 0x1E0E, 0x2338, 0x1E0F, 0x233A, ++ 0x1E10, 0x233C, 0x1E11, 0x233E, 0x1E12, 0x2340, 0x1E13, 0x2342, ++ 0x1E14, 0xA344, 0x1E15, 0xA346, 0x1E16, 0xA348, 0x1E17, 0xA34A, ++ 0x1E18, 0x234C, 0x1E19, 0x234E, 0x1E1A, 0x2350, 0x1E1B, 0x2352, ++ 0x1E1C, 0xA354, 0x1E1D, 0xA356, 0x1E1E, 0x2358, 0x1E1F, 0x235A, ++ 0x1E20, 0x235C, 0x1E21, 0x235E, 0x1E22, 0x2360, 0x1E23, 0x2362, ++ 0x1E24, 0x2364, 0x1E25, 0x2366, 0x1E26, 0x2368, 0x1E27, 0x236A, ++ 0x1E28, 0x236C, 0x1E29, 0x236E, 0x1E2A, 0x2370, 0x1E2B, 0x2372, ++ 0x1E2C, 0x2374, 0x1E2D, 0x2376, 0x1E2E, 0xA378, 0x1E2F, 0xA37A, ++ 0x1E30, 0x237C, 0x1E31, 0x237E, 0x1E32, 0x2380, 0x1E33, 0x2382, ++ 0x1E34, 0x2384, 0x1E35, 0x2386, 0x1E36, 0x2388, 0x1E37, 0x238A, ++ 0x1E38, 0xA38C, 0x1E39, 0xA38E, 0x1E3A, 0x2390, 0x1E3B, 0x2392, ++ 0x1E3C, 0x2394, 0x1E3D, 0x2396, 0x1E3E, 0x2398, 0x1E3F, 0x239A, ++ 0x1E40, 0x239C, 0x1E41, 0x239E, 0x1E42, 0x23A0, 0x1E43, 0x23A2, ++ 0x1E44, 0x23A4, 0x1E45, 0x23A6, 0x1E46, 0x23A8, 0x1E47, 0x23AA, ++ 0x1E48, 0x23AC, 0x1E49, 0x23AE, 0x1E4A, 0x23B0, 0x1E4B, 0x23B2, ++ 0x1E4C, 0xA3B4, 0x1E4D, 0xA3B6, 0x1E4E, 0xA3B8, 0x1E4F, 0xA3BA, ++ 0x1E50, 0xA3BC, 0x1E51, 0xA3BE, 0x1E52, 0xA3C0, 0x1E53, 0xA3C2, ++ 0x1E54, 0x23C4, 0x1E55, 0x23C6, 0x1E56, 0x23C8, 0x1E57, 0x23CA, ++ 0x1E58, 0x23CC, 0x1E59, 0x23CE, 0x1E5A, 0x23D0, 0x1E5B, 0x23D2, ++ 0x1E5C, 0xA3D4, 0x1E5D, 0xA3D6, 0x1E5E, 0x23D8, 0x1E5F, 0x23DA, ++ 0x1E60, 0x23DC, 0x1E61, 0x23DE, 0x1E62, 0x23E0, 0x1E63, 0x23E2, ++ 0x1E64, 0xA3E4, 0x1E65, 0xA3E6, 0x1E66, 0xA3E8, 0x1E67, 0xA3EA, ++ 0x1E68, 0xA3EC, 0x1E69, 0xA3EE, 0x1E6A, 0x23F0, 0x1E6B, 0x23F2, ++ 0x1E6C, 0x23F4, 0x1E6D, 0x23F6, 0x1E6E, 0x23F8, 0x1E6F, 0x23FA, ++ 0x1E70, 0x23FC, 0x1E71, 0x23FE, 0x1E72, 0x2400, 0x1E73, 0x2402, ++ 0x1E74, 0x2404, 0x1E75, 0x2406, 0x1E76, 0x2408, 0x1E77, 0x240A, ++ 0x1E78, 0xA40C, 0x1E79, 0xA40E, 0x1E7A, 0xA410, 0x1E7B, 0xA412, ++ 0x1E7C, 0x2414, 0x1E7D, 0x2416, 0x1E7E, 0x2418, 0x1E7F, 0x241A, ++ 0x1E80, 0x241C, 0x1E81, 0x241E, 0x1E82, 0x2420, 0x1E83, 0x2422, ++ 0x1E84, 0x2424, 0x1E85, 0x2426, 0x1E86, 0x2428, 0x1E87, 0x242A, ++ 0x1E88, 0x242C, 0x1E89, 0x242E, 0x1E8A, 0x2430, 0x1E8B, 0x2432, ++ 0x1E8C, 0x2434, 0x1E8D, 0x2436, 0x1E8E, 0x2438, 0x1E8F, 0x243A, ++ 0x1E90, 0x243C, 0x1E91, 0x243E, 0x1E92, 0x2440, 0x1E93, 0x2442, ++ 0x1E94, 0x2444, 0x1E95, 0x2446, 0x1E96, 0x2448, 0x1E97, 0x244A, ++ 0x1E98, 0x244C, 0x1E99, 0x244E, 0x1E9B, 0x2450, 0x1EA0, 0x2452, ++ 0x1EA1, 0x2454, 0x1EA2, 0x2456, 0x1EA3, 0x2458, 0x1EA4, 0xA45A, ++ 0x1EA5, 0xA45C, 0x1EA6, 0xA45E, 0x1EA7, 0xA460, 0x1EA8, 0xA462, ++ 0x1EA9, 0xA464, 0x1EAA, 0xA466, 0x1EAB, 0xA468, 0x1EAC, 0xA46A, ++ 0x1EAD, 0xA46C, 0x1EAE, 0xA46E, 0x1EAF, 0xA470, 0x1EB0, 0xA472, ++ 0x1EB1, 0xA474, 0x1EB2, 0xA476, 0x1EB3, 0xA478, 0x1EB4, 0xA47A, ++ 0x1EB5, 0xA47C, 0x1EB6, 0xA47E, 0x1EB7, 0xA480, 0x1EB8, 0x2482, ++ 0x1EB9, 0x2484, 0x1EBA, 0x2486, 0x1EBB, 0x2488, 0x1EBC, 0x248A, ++ 0x1EBD, 0x248C, 0x1EBE, 0xA48E, 0x1EBF, 0xA490, 0x1EC0, 0xA492, ++ 0x1EC1, 0xA494, 0x1EC2, 0xA496, 0x1EC3, 0xA498, 0x1EC4, 0xA49A, ++ 0x1EC5, 0xA49C, 0x1EC6, 0xA49E, 0x1EC7, 0xA4A0, 0x1EC8, 0x24A2, ++ 0x1EC9, 0x24A4, 0x1ECA, 0x24A6, 0x1ECB, 0x24A8, 0x1ECC, 0x24AA, ++ 0x1ECD, 0x24AC, 0x1ECE, 0x24AE, 0x1ECF, 0x24B0, 0x1ED0, 0xA4B2, ++ 0x1ED1, 0xA4B4, 0x1ED2, 0xA4B6, 0x1ED3, 0xA4B8, 0x1ED4, 0xA4BA, ++ 0x1ED5, 0xA4BC, 0x1ED6, 0xA4BE, 0x1ED7, 0xA4C0, 0x1ED8, 0xA4C2, ++ 0x1ED9, 0xA4C4, 0x1EDA, 0xA4C6, 0x1EDB, 0xA4C8, 0x1EDC, 0xA4CA, ++ 0x1EDD, 0xA4CC, 0x1EDE, 0xA4CE, 0x1EDF, 0xA4D0, 0x1EE0, 0xA4D2, ++ 0x1EE1, 0xA4D4, 0x1EE2, 0xA4D6, 0x1EE3, 0xA4D8, 0x1EE4, 0x24DA, ++ 0x1EE5, 0x24DC, 0x1EE6, 0x24DE, 0x1EE7, 0x24E0, 0x1EE8, 0xA4E2, ++ 0x1EE9, 0xA4E4, 0x1EEA, 0xA4E6, 0x1EEB, 0xA4E8, 0x1EEC, 0xA4EA, ++ 0x1EED, 0xA4EC, 0x1EEE, 0xA4EE, 0x1EEF, 0xA4F0, 0x1EF0, 0xA4F2, ++ 0x1EF1, 0xA4F4, 0x1EF2, 0x24F6, 0x1EF3, 0x24F8, 0x1EF4, 0x24FA, ++ 0x1EF5, 0x24FC, 0x1EF6, 0x24FE, 0x1EF7, 0x2500, 0x1EF8, 0x2502, ++ 0x1EF9, 0x2504, 0x1F00, 0x2506, 0x1F01, 0x2508, 0x1F02, 0xA50A, ++ 0x1F03, 0xA50C, 0x1F04, 0xA50E, 0x1F05, 0xA510, 0x1F06, 0xA512, ++ 0x1F07, 0xA514, 0x1F08, 0x2516, 0x1F09, 0x2518, 0x1F0A, 0xA51A, ++ 0x1F0B, 0xA51C, 0x1F0C, 0xA51E, 0x1F0D, 0xA520, 0x1F0E, 0xA522, ++ 0x1F0F, 0xA524, 0x1F10, 0x2526, 0x1F11, 0x2528, 0x1F12, 0xA52A, ++ 0x1F13, 0xA52C, 0x1F14, 0xA52E, 0x1F15, 0xA530, 0x1F18, 0x2532, ++ 0x1F19, 0x2534, 0x1F1A, 0xA536, 0x1F1B, 0xA538, 0x1F1C, 0xA53A, ++ 0x1F1D, 0xA53C, 0x1F20, 0x253E, 0x1F21, 0x2540, 0x1F22, 0xA542, ++ 0x1F23, 0xA544, 0x1F24, 0xA546, 0x1F25, 0xA548, 0x1F26, 0xA54A, ++ 0x1F27, 0xA54C, 0x1F28, 0x254E, 0x1F29, 0x2550, 0x1F2A, 0xA552, ++ 0x1F2B, 0xA554, 0x1F2C, 0xA556, 0x1F2D, 0xA558, 0x1F2E, 0xA55A, ++ 0x1F2F, 0xA55C, 0x1F30, 0x255E, 0x1F31, 0x2560, 0x1F32, 0xA562, ++ 0x1F33, 0xA564, 0x1F34, 0xA566, 0x1F35, 0xA568, 0x1F36, 0xA56A, ++ 0x1F37, 0xA56C, 0x1F38, 0x256E, 0x1F39, 0x2570, 0x1F3A, 0xA572, ++ 0x1F3B, 0xA574, 0x1F3C, 0xA576, 0x1F3D, 0xA578, 0x1F3E, 0xA57A, ++ 0x1F3F, 0xA57C, 0x1F40, 0x257E, 0x1F41, 0x2580, 0x1F42, 0xA582, ++ 0x1F43, 0xA584, 0x1F44, 0xA586, 0x1F45, 0xA588, 0x1F48, 0x258A, ++ 0x1F49, 0x258C, 0x1F4A, 0xA58E, 0x1F4B, 0xA590, 0x1F4C, 0xA592, ++ 0x1F4D, 0xA594, 0x1F50, 0x2596, 0x1F51, 0x2598, 0x1F52, 0xA59A, ++ 0x1F53, 0xA59C, 0x1F54, 0xA59E, 0x1F55, 0xA5A0, 0x1F56, 0xA5A2, ++ 0x1F57, 0xA5A4, 0x1F59, 0x25A6, 0x1F5B, 0xA5A8, 0x1F5D, 0xA5AA, ++ 0x1F5F, 0xA5AC, 0x1F60, 0x25AE, 0x1F61, 0x25B0, 0x1F62, 0xA5B2, ++ 0x1F63, 0xA5B4, 0x1F64, 0xA5B6, 0x1F65, 0xA5B8, 0x1F66, 0xA5BA, ++ 0x1F67, 0xA5BC, 0x1F68, 0x25BE, 0x1F69, 0x25C0, 0x1F6A, 0xA5C2, ++ 0x1F6B, 0xA5C4, 0x1F6C, 0xA5C6, 0x1F6D, 0xA5C8, 0x1F6E, 0xA5CA, ++ 0x1F6F, 0xA5CC, 0x1F70, 0x25CE, 0x1F71, 0x93AC, 0x1F72, 0x25D0, ++ 0x1F73, 0x93AD, 0x1F74, 0x25D2, 0x1F75, 0x93AE, 0x1F76, 0x25D4, ++ 0x1F77, 0x93AF, 0x1F78, 0x25D6, 0x1F79, 0x93CC, 0x1F7A, 0x25D8, ++ 0x1F7B, 0x93CD, 0x1F7C, 0x25DA, 0x1F7D, 0x93CE, 0x1F80, 0xA5DC, ++ 0x1F81, 0xA5DE, 0x1F82, 0xA5E0, 0x1F83, 0xA5E2, 0x1F84, 0xA5E4, ++ 0x1F85, 0xA5E6, 0x1F86, 0xA5E8, 0x1F87, 0xA5EA, 0x1F88, 0xA5EC, ++ 0x1F89, 0xA5EE, 0x1F8A, 0xA5F0, 0x1F8B, 0xA5F2, 0x1F8C, 0xA5F4, ++ 0x1F8D, 0xA5F6, 0x1F8E, 0xA5F8, 0x1F8F, 0xA5FA, 0x1F90, 0xA5FC, ++ 0x1F91, 0xA5FE, 0x1F92, 0xA600, 0x1F93, 0xA602, 0x1F94, 0xA604, ++ 0x1F95, 0xA606, 0x1F96, 0xA608, 0x1F97, 0xA60A, 0x1F98, 0xA60C, ++ 0x1F99, 0xA60E, 0x1F9A, 0xA610, 0x1F9B, 0xA612, 0x1F9C, 0xA614, ++ 0x1F9D, 0xA616, 0x1F9E, 0xA618, 0x1F9F, 0xA61A, 0x1FA0, 0xA61C, ++ 0x1FA1, 0xA61E, 0x1FA2, 0xA620, 0x1FA3, 0xA622, 0x1FA4, 0xA624, ++ 0x1FA5, 0xA626, 0x1FA6, 0xA628, 0x1FA7, 0xA62A, 0x1FA8, 0xA62C, ++ 0x1FA9, 0xA62E, 0x1FAA, 0xA630, 0x1FAB, 0xA632, 0x1FAC, 0xA634, ++ 0x1FAD, 0xA636, 0x1FAE, 0xA638, 0x1FAF, 0xA63A, 0x1FB0, 0x263C, ++ 0x1FB1, 0x263E, 0x1FB2, 0xA640, 0x1FB3, 0x2642, 0x1FB4, 0xA644, ++ 0x1FB6, 0x2646, 0x1FB7, 0xA648, 0x1FB8, 0x264A, 0x1FB9, 0x264C, ++ 0x1FBA, 0x264E, 0x1FBB, 0x9386, 0x1FBC, 0x2650, 0x1FBE, 0x13B9, ++ 0x1FC1, 0x2652, 0x1FC2, 0xA654, 0x1FC3, 0x2656, 0x1FC4, 0xA658, ++ 0x1FC6, 0x265A, 0x1FC7, 0xA65C, 0x1FC8, 0x265E, 0x1FC9, 0x9388, ++ 0x1FCA, 0x2660, 0x1FCB, 0x9389, 0x1FCC, 0x2662, 0x1FCD, 0x2664, ++ 0x1FCE, 0x2666, 0x1FCF, 0x2668, 0x1FD0, 0x266A, 0x1FD1, 0x266C, ++ 0x1FD2, 0xA66E, 0x1FD3, 0x9390, 0x1FD6, 0x2670, 0x1FD7, 0xA672, ++ 0x1FD8, 0x2674, 0x1FD9, 0x2676, 0x1FDA, 0x2678, 0x1FDB, 0x938A, ++ 0x1FDD, 0x267A, 0x1FDE, 0x267C, 0x1FDF, 0x267E, 0x1FE0, 0x2680, ++ 0x1FE1, 0x2682, 0x1FE2, 0xA684, 0x1FE3, 0x93B0, 0x1FE4, 0x2686, ++ 0x1FE5, 0x2688, 0x1FE6, 0x268A, 0x1FE7, 0xA68C, 0x1FE8, 0x268E, ++ 0x1FE9, 0x2690, 0x1FEA, 0x2692, 0x1FEB, 0x938E, 0x1FEC, 0x2694, ++ 0x1FED, 0x2696, 0x1FEE, 0x9385, 0x1FEF, 0x1060, 0x1FF2, 0xA698, ++ 0x1FF3, 0x269A, 0x1FF4, 0xA69C, 0x1FF6, 0x269E, 0x1FF7, 0xA6A0, ++ 0x1FF8, 0x26A2, 0x1FF9, 0x938C, 0x1FFA, 0x26A4, 0x1FFB, 0x938F, ++ 0x1FFC, 0x26A6, 0x1FFD, 0x10B4, 0x304C, 0x26A8, 0x304E, 0x26AA, ++ 0x3050, 0x26AC, 0x3052, 0x26AE, 0x3054, 0x26B0, 0x3056, 0x26B2, ++ 0x3058, 0x26B4, 0x305A, 0x26B6, 0x305C, 0x26B8, 0x305E, 0x26BA, ++ 0x3060, 0x26BC, 0x3062, 0x26BE, 0x3065, 0x26C0, 0x3067, 0x26C2, ++ 0x3069, 0x26C4, 0x3070, 0x26C6, 0x3071, 0x26C8, 0x3073, 0x26CA, ++ 0x3074, 0x26CC, 0x3076, 0x26CE, 0x3077, 0x26D0, 0x3079, 0x26D2, ++ 0x307A, 0x26D4, 0x307C, 0x26D6, 0x307D, 0x26D8, 0x3094, 0x26DA, ++ 0x309E, 0x26DC, 0x30AC, 0x26DE, 0x30AE, 0x26E0, 0x30B0, 0x26E2, ++ 0x30B2, 0x26E4, 0x30B4, 0x26E6, 0x30B6, 0x26E8, 0x30B8, 0x26EA, ++ 0x30BA, 0x26EC, 0x30BC, 0x26EE, 0x30BE, 0x26F0, 0x30C0, 0x26F2, ++ 0x30C2, 0x26F4, 0x30C5, 0x26F6, 0x30C7, 0x26F8, 0x30C9, 0x26FA, ++ 0x30D0, 0x26FC, 0x30D1, 0x26FE, 0x30D3, 0x2700, 0x30D4, 0x2702, ++ 0x30D6, 0x2704, 0x30D7, 0x2706, 0x30D9, 0x2708, 0x30DA, 0x270A, ++ 0x30DC, 0x270C, 0x30DD, 0x270E, 0x30F4, 0x2710, 0x30F7, 0x2712, ++ 0x30F8, 0x2714, 0x30F9, 0x2716, 0x30FA, 0x2718, 0x30FE, 0x271A, ++ 0xFB1D, 0x271C, 0xFB1F, 0x271E, 0xFB2A, 0x2720, 0xFB2B, 0x2722, ++ 0xFB2C, 0xA724, 0xFB2D, 0xA726, 0xFB2E, 0x2728, 0xFB2F, 0x272A, ++ 0xFB30, 0x272C, 0xFB31, 0x272E, 0xFB32, 0x2730, 0xFB33, 0x2732, ++ 0xFB34, 0x2734, 0xFB35, 0x2736, 0xFB36, 0x2738, 0xFB38, 0x273A, ++ 0xFB39, 0x273C, 0xFB3A, 0x273E, 0xFB3B, 0x2740, 0xFB3C, 0x2742, ++ 0xFB3E, 0x2744, 0xFB40, 0x2746, 0xFB41, 0x2748, 0xFB43, 0x274A, ++ 0xFB44, 0x274C, 0xFB46, 0x274E, 0xFB47, 0x2750, 0xFB48, 0x2752, ++ 0xFB49, 0x2754, 0xFB4A, 0x2756, 0xFB4B, 0x2758, 0xFB4C, 0x275A, ++ 0xFB4D, 0x275C, 0xFB4E, 0x275E ++}; ++ ++static const u_int32_t __UniCharDecompositionTableLength = ++ (sizeof(__CFUniCharDecompositionTable) / (sizeof(u_int16_t) * 2)); ++ ++ ++static const u_int16_t ++__CFUniCharMultipleDecompositionTable[] = { ++ 0x0041, 0x0300, 0x0041, 0x0301, 0x0041, 0x0302, 0x0041, 0x0303, ++ 0x0041, 0x0308, 0x0041, 0x030A, 0x0043, 0x0327, 0x0045, 0x0300, ++ 0x0045, 0x0301, 0x0045, 0x0302, 0x0045, 0x0308, 0x0049, 0x0300, ++ 0x0049, 0x0301, 0x0049, 0x0302, 0x0049, 0x0308, 0x004E, 0x0303, ++ 0x004F, 0x0300, 0x004F, 0x0301, 0x004F, 0x0302, 0x004F, 0x0303, ++ 0x004F, 0x0308, 0x0055, 0x0300, 0x0055, 0x0301, 0x0055, 0x0302, ++ 0x0055, 0x0308, 0x0059, 0x0301, 0x0061, 0x0300, 0x0061, 0x0301, ++ 0x0061, 0x0302, 0x0061, 0x0303, 0x0061, 0x0308, 0x0061, 0x030A, ++ 0x0063, 0x0327, 0x0065, 0x0300, 0x0065, 0x0301, 0x0065, 0x0302, ++ 0x0065, 0x0308, 0x0069, 0x0300, 0x0069, 0x0301, 0x0069, 0x0302, ++ 0x0069, 0x0308, 0x006E, 0x0303, 0x006F, 0x0300, 0x006F, 0x0301, ++ 0x006F, 0x0302, 0x006F, 0x0303, 0x006F, 0x0308, 0x0075, 0x0300, ++ 0x0075, 0x0301, 0x0075, 0x0302, 0x0075, 0x0308, 0x0079, 0x0301, ++ 0x0079, 0x0308, 0x0041, 0x0304, 0x0061, 0x0304, 0x0041, 0x0306, ++ 0x0061, 0x0306, 0x0041, 0x0328, 0x0061, 0x0328, 0x0043, 0x0301, ++ 0x0063, 0x0301, 0x0043, 0x0302, 0x0063, 0x0302, 0x0043, 0x0307, ++ 0x0063, 0x0307, 0x0043, 0x030C, 0x0063, 0x030C, 0x0044, 0x030C, ++ 0x0064, 0x030C, 0x0045, 0x0304, 0x0065, 0x0304, 0x0045, 0x0306, ++ 0x0065, 0x0306, 0x0045, 0x0307, 0x0065, 0x0307, 0x0045, 0x0328, ++ 0x0065, 0x0328, 0x0045, 0x030C, 0x0065, 0x030C, 0x0047, 0x0302, ++ 0x0067, 0x0302, 0x0047, 0x0306, 0x0067, 0x0306, 0x0047, 0x0307, ++ 0x0067, 0x0307, 0x0047, 0x0327, 0x0067, 0x0327, 0x0048, 0x0302, ++ 0x0068, 0x0302, 0x0049, 0x0303, 0x0069, 0x0303, 0x0049, 0x0304, ++ 0x0069, 0x0304, 0x0049, 0x0306, 0x0069, 0x0306, 0x0049, 0x0328, ++ 0x0069, 0x0328, 0x0049, 0x0307, 0x004A, 0x0302, 0x006A, 0x0302, ++ 0x004B, 0x0327, 0x006B, 0x0327, 0x004C, 0x0301, 0x006C, 0x0301, ++ 0x004C, 0x0327, 0x006C, 0x0327, 0x004C, 0x030C, 0x006C, 0x030C, ++ 0x004E, 0x0301, 0x006E, 0x0301, 0x004E, 0x0327, 0x006E, 0x0327, ++ 0x004E, 0x030C, 0x006E, 0x030C, 0x004F, 0x0304, 0x006F, 0x0304, ++ 0x004F, 0x0306, 0x006F, 0x0306, 0x004F, 0x030B, 0x006F, 0x030B, ++ 0x0052, 0x0301, 0x0072, 0x0301, 0x0052, 0x0327, 0x0072, 0x0327, ++ 0x0052, 0x030C, 0x0072, 0x030C, 0x0053, 0x0301, 0x0073, 0x0301, ++ 0x0053, 0x0302, 0x0073, 0x0302, 0x0053, 0x0327, 0x0073, 0x0327, ++ 0x0053, 0x030C, 0x0073, 0x030C, 0x0054, 0x0327, 0x0074, 0x0327, ++ 0x0054, 0x030C, 0x0074, 0x030C, 0x0055, 0x0303, 0x0075, 0x0303, ++ 0x0055, 0x0304, 0x0075, 0x0304, 0x0055, 0x0306, 0x0075, 0x0306, ++ 0x0055, 0x030A, 0x0075, 0x030A, 0x0055, 0x030B, 0x0075, 0x030B, ++ 0x0055, 0x0328, 0x0075, 0x0328, 0x0057, 0x0302, 0x0077, 0x0302, ++ 0x0059, 0x0302, 0x0079, 0x0302, 0x0059, 0x0308, 0x005A, 0x0301, ++ 0x007A, 0x0301, 0x005A, 0x0307, 0x007A, 0x0307, 0x005A, 0x030C, ++ 0x007A, 0x030C, 0x004F, 0x031B, 0x006F, 0x031B, 0x0055, 0x031B, ++ 0x0075, 0x031B, 0x0041, 0x030C, 0x0061, 0x030C, 0x0049, 0x030C, ++ 0x0069, 0x030C, 0x004F, 0x030C, 0x006F, 0x030C, 0x0055, 0x030C, ++ 0x0075, 0x030C, 0x00DC, 0x0304, 0x00FC, 0x0304, 0x00DC, 0x0301, ++ 0x00FC, 0x0301, 0x00DC, 0x030C, 0x00FC, 0x030C, 0x00DC, 0x0300, ++ 0x00FC, 0x0300, 0x00C4, 0x0304, 0x00E4, 0x0304, 0x0226, 0x0304, ++ 0x0227, 0x0304, 0x00C6, 0x0304, 0x00E6, 0x0304, 0x0047, 0x030C, ++ 0x0067, 0x030C, 0x004B, 0x030C, 0x006B, 0x030C, 0x004F, 0x0328, ++ 0x006F, 0x0328, 0x01EA, 0x0304, 0x01EB, 0x0304, 0x01B7, 0x030C, ++ 0x0292, 0x030C, 0x006A, 0x030C, 0x0047, 0x0301, 0x0067, 0x0301, ++ 0x004E, 0x0300, 0x006E, 0x0300, 0x00C5, 0x0301, 0x00E5, 0x0301, ++ 0x00C6, 0x0301, 0x00E6, 0x0301, 0x00D8, 0x0301, 0x00F8, 0x0301, ++ 0x0041, 0x030F, 0x0061, 0x030F, 0x0041, 0x0311, 0x0061, 0x0311, ++ 0x0045, 0x030F, 0x0065, 0x030F, 0x0045, 0x0311, 0x0065, 0x0311, ++ 0x0049, 0x030F, 0x0069, 0x030F, 0x0049, 0x0311, 0x0069, 0x0311, ++ 0x004F, 0x030F, 0x006F, 0x030F, 0x004F, 0x0311, 0x006F, 0x0311, ++ 0x0052, 0x030F, 0x0072, 0x030F, 0x0052, 0x0311, 0x0072, 0x0311, ++ 0x0055, 0x030F, 0x0075, 0x030F, 0x0055, 0x0311, 0x0075, 0x0311, ++ 0x0053, 0x0326, 0x0073, 0x0326, 0x0054, 0x0326, 0x0074, 0x0326, ++ 0x0048, 0x030C, 0x0068, 0x030C, 0x0041, 0x0307, 0x0061, 0x0307, ++ 0x0045, 0x0327, 0x0065, 0x0327, 0x00D6, 0x0304, 0x00F6, 0x0304, ++ 0x00D5, 0x0304, 0x00F5, 0x0304, 0x004F, 0x0307, 0x006F, 0x0307, ++ 0x022E, 0x0304, 0x022F, 0x0304, 0x0059, 0x0304, 0x0079, 0x0304, ++ 0x0308, 0x0301, 0x00A8, 0x0301, 0x0391, 0x0301, 0x0395, 0x0301, ++ 0x0397, 0x0301, 0x0399, 0x0301, 0x039F, 0x0301, 0x03A5, 0x0301, ++ 0x03A9, 0x0301, 0x03CA, 0x0301, 0x0399, 0x0308, 0x03A5, 0x0308, ++ 0x03B1, 0x0301, 0x03B5, 0x0301, 0x03B7, 0x0301, 0x03B9, 0x0301, ++ 0x03CB, 0x0301, 0x03B9, 0x0308, 0x03C5, 0x0308, 0x03BF, 0x0301, ++ 0x03C5, 0x0301, 0x03C9, 0x0301, 0x03D2, 0x0301, 0x03D2, 0x0308, ++ 0x0415, 0x0300, 0x0415, 0x0308, 0x0413, 0x0301, 0x0406, 0x0308, ++ 0x041A, 0x0301, 0x0418, 0x0300, 0x0423, 0x0306, 0x0418, 0x0306, ++ 0x0438, 0x0306, 0x0435, 0x0300, 0x0435, 0x0308, 0x0433, 0x0301, ++ 0x0456, 0x0308, 0x043A, 0x0301, 0x0438, 0x0300, 0x0443, 0x0306, ++ 0x0474, 0x030F, 0x0475, 0x030F, 0x0416, 0x0306, 0x0436, 0x0306, ++ 0x0410, 0x0306, 0x0430, 0x0306, 0x0410, 0x0308, 0x0430, 0x0308, ++ 0x0415, 0x0306, 0x0435, 0x0306, 0x04D8, 0x0308, 0x04D9, 0x0308, ++ 0x0416, 0x0308, 0x0436, 0x0308, 0x0417, 0x0308, 0x0437, 0x0308, ++ 0x0418, 0x0304, 0x0438, 0x0304, 0x0418, 0x0308, 0x0438, 0x0308, ++ 0x041E, 0x0308, 0x043E, 0x0308, 0x04E8, 0x0308, 0x04E9, 0x0308, ++ 0x042D, 0x0308, 0x044D, 0x0308, 0x0423, 0x0304, 0x0443, 0x0304, ++ 0x0423, 0x0308, 0x0443, 0x0308, 0x0423, 0x030B, 0x0443, 0x030B, ++ 0x0427, 0x0308, 0x0447, 0x0308, 0x042B, 0x0308, 0x044B, 0x0308, ++ 0x0627, 0x0653, 0x0627, 0x0654, 0x0648, 0x0654, 0x0627, 0x0655, ++ 0x064A, 0x0654, 0x06D5, 0x0654, 0x06C1, 0x0654, 0x06D2, 0x0654, ++ 0x0928, 0x093C, 0x0930, 0x093C, 0x0933, 0x093C, 0x0915, 0x093C, ++ 0x0916, 0x093C, 0x0917, 0x093C, 0x091C, 0x093C, 0x0921, 0x093C, ++ 0x0922, 0x093C, 0x092B, 0x093C, 0x092F, 0x093C, 0x09C7, 0x09BE, ++ 0x09C7, 0x09D7, 0x09A1, 0x09BC, 0x09A2, 0x09BC, 0x09AF, 0x09BC, ++ 0x0A32, 0x0A3C, 0x0A38, 0x0A3C, 0x0A16, 0x0A3C, 0x0A17, 0x0A3C, ++ 0x0A1C, 0x0A3C, 0x0A2B, 0x0A3C, 0x0B47, 0x0B56, 0x0B47, 0x0B3E, ++ 0x0B47, 0x0B57, 0x0B21, 0x0B3C, 0x0B22, 0x0B3C, 0x0B92, 0x0BD7, ++ 0x0BC6, 0x0BBE, 0x0BC7, 0x0BBE, 0x0BC6, 0x0BD7, 0x0C46, 0x0C56, ++ 0x0CBF, 0x0CD5, 0x0CC6, 0x0CD5, 0x0CC6, 0x0CD6, 0x0CC6, 0x0CC2, ++ 0x0CCA, 0x0CD5, 0x0D46, 0x0D3E, 0x0D47, 0x0D3E, 0x0D46, 0x0D57, ++ 0x0DD9, 0x0DCA, 0x0DD9, 0x0DCF, 0x0DDC, 0x0DCA, 0x0DD9, 0x0DDF, ++ 0x0F42, 0x0FB7, 0x0F4C, 0x0FB7, 0x0F51, 0x0FB7, 0x0F56, 0x0FB7, ++ 0x0F5B, 0x0FB7, 0x0F40, 0x0FB5, 0x0F71, 0x0F72, 0x0F71, 0x0F74, ++ 0x0FB2, 0x0F80, 0x0FB3, 0x0F80, 0x0F71, 0x0F80, 0x0F92, 0x0FB7, ++ 0x0F9C, 0x0FB7, 0x0FA1, 0x0FB7, 0x0FA6, 0x0FB7, 0x0FAB, 0x0FB7, ++ 0x0F90, 0x0FB5, 0x1025, 0x102E, 0x0041, 0x0325, 0x0061, 0x0325, ++ 0x0042, 0x0307, 0x0062, 0x0307, 0x0042, 0x0323, 0x0062, 0x0323, ++ 0x0042, 0x0331, 0x0062, 0x0331, 0x00C7, 0x0301, 0x00E7, 0x0301, ++ 0x0044, 0x0307, 0x0064, 0x0307, 0x0044, 0x0323, 0x0064, 0x0323, ++ 0x0044, 0x0331, 0x0064, 0x0331, 0x0044, 0x0327, 0x0064, 0x0327, ++ 0x0044, 0x032D, 0x0064, 0x032D, 0x0112, 0x0300, 0x0113, 0x0300, ++ 0x0112, 0x0301, 0x0113, 0x0301, 0x0045, 0x032D, 0x0065, 0x032D, ++ 0x0045, 0x0330, 0x0065, 0x0330, 0x0228, 0x0306, 0x0229, 0x0306, ++ 0x0046, 0x0307, 0x0066, 0x0307, 0x0047, 0x0304, 0x0067, 0x0304, ++ 0x0048, 0x0307, 0x0068, 0x0307, 0x0048, 0x0323, 0x0068, 0x0323, ++ 0x0048, 0x0308, 0x0068, 0x0308, 0x0048, 0x0327, 0x0068, 0x0327, ++ 0x0048, 0x032E, 0x0068, 0x032E, 0x0049, 0x0330, 0x0069, 0x0330, ++ 0x00CF, 0x0301, 0x00EF, 0x0301, 0x004B, 0x0301, 0x006B, 0x0301, ++ 0x004B, 0x0323, 0x006B, 0x0323, 0x004B, 0x0331, 0x006B, 0x0331, ++ 0x004C, 0x0323, 0x006C, 0x0323, 0x1E36, 0x0304, 0x1E37, 0x0304, ++ 0x004C, 0x0331, 0x006C, 0x0331, 0x004C, 0x032D, 0x006C, 0x032D, ++ 0x004D, 0x0301, 0x006D, 0x0301, 0x004D, 0x0307, 0x006D, 0x0307, ++ 0x004D, 0x0323, 0x006D, 0x0323, 0x004E, 0x0307, 0x006E, 0x0307, ++ 0x004E, 0x0323, 0x006E, 0x0323, 0x004E, 0x0331, 0x006E, 0x0331, ++ 0x004E, 0x032D, 0x006E, 0x032D, 0x00D5, 0x0301, 0x00F5, 0x0301, ++ 0x00D5, 0x0308, 0x00F5, 0x0308, 0x014C, 0x0300, 0x014D, 0x0300, ++ 0x014C, 0x0301, 0x014D, 0x0301, 0x0050, 0x0301, 0x0070, 0x0301, ++ 0x0050, 0x0307, 0x0070, 0x0307, 0x0052, 0x0307, 0x0072, 0x0307, ++ 0x0052, 0x0323, 0x0072, 0x0323, 0x1E5A, 0x0304, 0x1E5B, 0x0304, ++ 0x0052, 0x0331, 0x0072, 0x0331, 0x0053, 0x0307, 0x0073, 0x0307, ++ 0x0053, 0x0323, 0x0073, 0x0323, 0x015A, 0x0307, 0x015B, 0x0307, ++ 0x0160, 0x0307, 0x0161, 0x0307, 0x1E62, 0x0307, 0x1E63, 0x0307, ++ 0x0054, 0x0307, 0x0074, 0x0307, 0x0054, 0x0323, 0x0074, 0x0323, ++ 0x0054, 0x0331, 0x0074, 0x0331, 0x0054, 0x032D, 0x0074, 0x032D, ++ 0x0055, 0x0324, 0x0075, 0x0324, 0x0055, 0x0330, 0x0075, 0x0330, ++ 0x0055, 0x032D, 0x0075, 0x032D, 0x0168, 0x0301, 0x0169, 0x0301, ++ 0x016A, 0x0308, 0x016B, 0x0308, 0x0056, 0x0303, 0x0076, 0x0303, ++ 0x0056, 0x0323, 0x0076, 0x0323, 0x0057, 0x0300, 0x0077, 0x0300, ++ 0x0057, 0x0301, 0x0077, 0x0301, 0x0057, 0x0308, 0x0077, 0x0308, ++ 0x0057, 0x0307, 0x0077, 0x0307, 0x0057, 0x0323, 0x0077, 0x0323, ++ 0x0058, 0x0307, 0x0078, 0x0307, 0x0058, 0x0308, 0x0078, 0x0308, ++ 0x0059, 0x0307, 0x0079, 0x0307, 0x005A, 0x0302, 0x007A, 0x0302, ++ 0x005A, 0x0323, 0x007A, 0x0323, 0x005A, 0x0331, 0x007A, 0x0331, ++ 0x0068, 0x0331, 0x0074, 0x0308, 0x0077, 0x030A, 0x0079, 0x030A, ++ 0x017F, 0x0307, 0x0041, 0x0323, 0x0061, 0x0323, 0x0041, 0x0309, ++ 0x0061, 0x0309, 0x00C2, 0x0301, 0x00E2, 0x0301, 0x00C2, 0x0300, ++ 0x00E2, 0x0300, 0x00C2, 0x0309, 0x00E2, 0x0309, 0x00C2, 0x0303, ++ 0x00E2, 0x0303, 0x1EA0, 0x0302, 0x1EA1, 0x0302, 0x0102, 0x0301, ++ 0x0103, 0x0301, 0x0102, 0x0300, 0x0103, 0x0300, 0x0102, 0x0309, ++ 0x0103, 0x0309, 0x0102, 0x0303, 0x0103, 0x0303, 0x1EA0, 0x0306, ++ 0x1EA1, 0x0306, 0x0045, 0x0323, 0x0065, 0x0323, 0x0045, 0x0309, ++ 0x0065, 0x0309, 0x0045, 0x0303, 0x0065, 0x0303, 0x00CA, 0x0301, ++ 0x00EA, 0x0301, 0x00CA, 0x0300, 0x00EA, 0x0300, 0x00CA, 0x0309, ++ 0x00EA, 0x0309, 0x00CA, 0x0303, 0x00EA, 0x0303, 0x1EB8, 0x0302, ++ 0x1EB9, 0x0302, 0x0049, 0x0309, 0x0069, 0x0309, 0x0049, 0x0323, ++ 0x0069, 0x0323, 0x004F, 0x0323, 0x006F, 0x0323, 0x004F, 0x0309, ++ 0x006F, 0x0309, 0x00D4, 0x0301, 0x00F4, 0x0301, 0x00D4, 0x0300, ++ 0x00F4, 0x0300, 0x00D4, 0x0309, 0x00F4, 0x0309, 0x00D4, 0x0303, ++ 0x00F4, 0x0303, 0x1ECC, 0x0302, 0x1ECD, 0x0302, 0x01A0, 0x0301, ++ 0x01A1, 0x0301, 0x01A0, 0x0300, 0x01A1, 0x0300, 0x01A0, 0x0309, ++ 0x01A1, 0x0309, 0x01A0, 0x0303, 0x01A1, 0x0303, 0x01A0, 0x0323, ++ 0x01A1, 0x0323, 0x0055, 0x0323, 0x0075, 0x0323, 0x0055, 0x0309, ++ 0x0075, 0x0309, 0x01AF, 0x0301, 0x01B0, 0x0301, 0x01AF, 0x0300, ++ 0x01B0, 0x0300, 0x01AF, 0x0309, 0x01B0, 0x0309, 0x01AF, 0x0303, ++ 0x01B0, 0x0303, 0x01AF, 0x0323, 0x01B0, 0x0323, 0x0059, 0x0300, ++ 0x0079, 0x0300, 0x0059, 0x0323, 0x0079, 0x0323, 0x0059, 0x0309, ++ 0x0079, 0x0309, 0x0059, 0x0303, 0x0079, 0x0303, 0x03B1, 0x0313, ++ 0x03B1, 0x0314, 0x1F00, 0x0300, 0x1F01, 0x0300, 0x1F00, 0x0301, ++ 0x1F01, 0x0301, 0x1F00, 0x0342, 0x1F01, 0x0342, 0x0391, 0x0313, ++ 0x0391, 0x0314, 0x1F08, 0x0300, 0x1F09, 0x0300, 0x1F08, 0x0301, ++ 0x1F09, 0x0301, 0x1F08, 0x0342, 0x1F09, 0x0342, 0x03B5, 0x0313, ++ 0x03B5, 0x0314, 0x1F10, 0x0300, 0x1F11, 0x0300, 0x1F10, 0x0301, ++ 0x1F11, 0x0301, 0x0395, 0x0313, 0x0395, 0x0314, 0x1F18, 0x0300, ++ 0x1F19, 0x0300, 0x1F18, 0x0301, 0x1F19, 0x0301, 0x03B7, 0x0313, ++ 0x03B7, 0x0314, 0x1F20, 0x0300, 0x1F21, 0x0300, 0x1F20, 0x0301, ++ 0x1F21, 0x0301, 0x1F20, 0x0342, 0x1F21, 0x0342, 0x0397, 0x0313, ++ 0x0397, 0x0314, 0x1F28, 0x0300, 0x1F29, 0x0300, 0x1F28, 0x0301, ++ 0x1F29, 0x0301, 0x1F28, 0x0342, 0x1F29, 0x0342, 0x03B9, 0x0313, ++ 0x03B9, 0x0314, 0x1F30, 0x0300, 0x1F31, 0x0300, 0x1F30, 0x0301, ++ 0x1F31, 0x0301, 0x1F30, 0x0342, 0x1F31, 0x0342, 0x0399, 0x0313, ++ 0x0399, 0x0314, 0x1F38, 0x0300, 0x1F39, 0x0300, 0x1F38, 0x0301, ++ 0x1F39, 0x0301, 0x1F38, 0x0342, 0x1F39, 0x0342, 0x03BF, 0x0313, ++ 0x03BF, 0x0314, 0x1F40, 0x0300, 0x1F41, 0x0300, 0x1F40, 0x0301, ++ 0x1F41, 0x0301, 0x039F, 0x0313, 0x039F, 0x0314, 0x1F48, 0x0300, ++ 0x1F49, 0x0300, 0x1F48, 0x0301, 0x1F49, 0x0301, 0x03C5, 0x0313, ++ 0x03C5, 0x0314, 0x1F50, 0x0300, 0x1F51, 0x0300, 0x1F50, 0x0301, ++ 0x1F51, 0x0301, 0x1F50, 0x0342, 0x1F51, 0x0342, 0x03A5, 0x0314, ++ 0x1F59, 0x0300, 0x1F59, 0x0301, 0x1F59, 0x0342, 0x03C9, 0x0313, ++ 0x03C9, 0x0314, 0x1F60, 0x0300, 0x1F61, 0x0300, 0x1F60, 0x0301, ++ 0x1F61, 0x0301, 0x1F60, 0x0342, 0x1F61, 0x0342, 0x03A9, 0x0313, ++ 0x03A9, 0x0314, 0x1F68, 0x0300, 0x1F69, 0x0300, 0x1F68, 0x0301, ++ 0x1F69, 0x0301, 0x1F68, 0x0342, 0x1F69, 0x0342, 0x03B1, 0x0300, ++ 0x03B5, 0x0300, 0x03B7, 0x0300, 0x03B9, 0x0300, 0x03BF, 0x0300, ++ 0x03C5, 0x0300, 0x03C9, 0x0300, 0x1F00, 0x0345, 0x1F01, 0x0345, ++ 0x1F02, 0x0345, 0x1F03, 0x0345, 0x1F04, 0x0345, 0x1F05, 0x0345, ++ 0x1F06, 0x0345, 0x1F07, 0x0345, 0x1F08, 0x0345, 0x1F09, 0x0345, ++ 0x1F0A, 0x0345, 0x1F0B, 0x0345, 0x1F0C, 0x0345, 0x1F0D, 0x0345, ++ 0x1F0E, 0x0345, 0x1F0F, 0x0345, 0x1F20, 0x0345, 0x1F21, 0x0345, ++ 0x1F22, 0x0345, 0x1F23, 0x0345, 0x1F24, 0x0345, 0x1F25, 0x0345, ++ 0x1F26, 0x0345, 0x1F27, 0x0345, 0x1F28, 0x0345, 0x1F29, 0x0345, ++ 0x1F2A, 0x0345, 0x1F2B, 0x0345, 0x1F2C, 0x0345, 0x1F2D, 0x0345, ++ 0x1F2E, 0x0345, 0x1F2F, 0x0345, 0x1F60, 0x0345, 0x1F61, 0x0345, ++ 0x1F62, 0x0345, 0x1F63, 0x0345, 0x1F64, 0x0345, 0x1F65, 0x0345, ++ 0x1F66, 0x0345, 0x1F67, 0x0345, 0x1F68, 0x0345, 0x1F69, 0x0345, ++ 0x1F6A, 0x0345, 0x1F6B, 0x0345, 0x1F6C, 0x0345, 0x1F6D, 0x0345, ++ 0x1F6E, 0x0345, 0x1F6F, 0x0345, 0x03B1, 0x0306, 0x03B1, 0x0304, ++ 0x1F70, 0x0345, 0x03B1, 0x0345, 0x03AC, 0x0345, 0x03B1, 0x0342, ++ 0x1FB6, 0x0345, 0x0391, 0x0306, 0x0391, 0x0304, 0x0391, 0x0300, ++ 0x0391, 0x0345, 0x00A8, 0x0342, 0x1F74, 0x0345, 0x03B7, 0x0345, ++ 0x03AE, 0x0345, 0x03B7, 0x0342, 0x1FC6, 0x0345, 0x0395, 0x0300, ++ 0x0397, 0x0300, 0x0397, 0x0345, 0x1FBF, 0x0300, 0x1FBF, 0x0301, ++ 0x1FBF, 0x0342, 0x03B9, 0x0306, 0x03B9, 0x0304, 0x03CA, 0x0300, ++ 0x03B9, 0x0342, 0x03CA, 0x0342, 0x0399, 0x0306, 0x0399, 0x0304, ++ 0x0399, 0x0300, 0x1FFE, 0x0300, 0x1FFE, 0x0301, 0x1FFE, 0x0342, ++ 0x03C5, 0x0306, 0x03C5, 0x0304, 0x03CB, 0x0300, 0x03C1, 0x0313, ++ 0x03C1, 0x0314, 0x03C5, 0x0342, 0x03CB, 0x0342, 0x03A5, 0x0306, ++ 0x03A5, 0x0304, 0x03A5, 0x0300, 0x03A1, 0x0314, 0x00A8, 0x0300, ++ 0x1F7C, 0x0345, 0x03C9, 0x0345, 0x03CE, 0x0345, 0x03C9, 0x0342, ++ 0x1FF6, 0x0345, 0x039F, 0x0300, 0x03A9, 0x0300, 0x03A9, 0x0345, ++ 0x304B, 0x3099, 0x304D, 0x3099, 0x304F, 0x3099, 0x3051, 0x3099, ++ 0x3053, 0x3099, 0x3055, 0x3099, 0x3057, 0x3099, 0x3059, 0x3099, ++ 0x305B, 0x3099, 0x305D, 0x3099, 0x305F, 0x3099, 0x3061, 0x3099, ++ 0x3064, 0x3099, 0x3066, 0x3099, 0x3068, 0x3099, 0x306F, 0x3099, ++ 0x306F, 0x309A, 0x3072, 0x3099, 0x3072, 0x309A, 0x3075, 0x3099, ++ 0x3075, 0x309A, 0x3078, 0x3099, 0x3078, 0x309A, 0x307B, 0x3099, ++ 0x307B, 0x309A, 0x3046, 0x3099, 0x309D, 0x3099, 0x30AB, 0x3099, ++ 0x30AD, 0x3099, 0x30AF, 0x3099, 0x30B1, 0x3099, 0x30B3, 0x3099, ++ 0x30B5, 0x3099, 0x30B7, 0x3099, 0x30B9, 0x3099, 0x30BB, 0x3099, ++ 0x30BD, 0x3099, 0x30BF, 0x3099, 0x30C1, 0x3099, 0x30C4, 0x3099, ++ 0x30C6, 0x3099, 0x30C8, 0x3099, 0x30CF, 0x3099, 0x30CF, 0x309A, ++ 0x30D2, 0x3099, 0x30D2, 0x309A, 0x30D5, 0x3099, 0x30D5, 0x309A, ++ 0x30D8, 0x3099, 0x30D8, 0x309A, 0x30DB, 0x3099, 0x30DB, 0x309A, ++ 0x30A6, 0x3099, 0x30EF, 0x3099, 0x30F0, 0x3099, 0x30F1, 0x3099, ++ 0x30F2, 0x3099, 0x30FD, 0x3099, 0x05D9, 0x05B4, 0x05F2, 0x05B7, ++ 0x05E9, 0x05C1, 0x05E9, 0x05C2, 0xFB49, 0x05C1, 0xFB49, 0x05C2, ++ 0x05D0, 0x05B7, 0x05D0, 0x05B8, 0x05D0, 0x05BC, 0x05D1, 0x05BC, ++ 0x05D2, 0x05BC, 0x05D3, 0x05BC, 0x05D4, 0x05BC, 0x05D5, 0x05BC, ++ 0x05D6, 0x05BC, 0x05D8, 0x05BC, 0x05D9, 0x05BC, 0x05DA, 0x05BC, ++ 0x05DB, 0x05BC, 0x05DC, 0x05BC, 0x05DE, 0x05BC, 0x05E0, 0x05BC, ++ 0x05E1, 0x05BC, 0x05E3, 0x05BC, 0x05E4, 0x05BC, 0x05E6, 0x05BC, ++ 0x05E7, 0x05BC, 0x05E8, 0x05BC, 0x05E9, 0x05BC, 0x05EA, 0x05BC, ++ 0x05D5, 0x05B9, 0x05D1, 0x05BF, 0x05DB, 0x05BF, 0x05E4, 0x05BF ++}; ++ ++static const u_int8_t ++__CFUniCharDecomposableBitmap[] = { ++ 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x06, 0x00, ++ 0x00, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x00, 0x0C, ++ 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x0F, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x11, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, ++ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0xBF, 0xFF, 0x7E, 0x3E, 0xBF, 0xFF, 0x7E, 0xBE, ++ 0xFF, 0xFF, 0xFC, 0xFF, 0x3F, 0xFF, 0xF1, 0x7E, ++ 0xF8, 0xF1, 0xF3, 0xFF, 0x3F, 0xFF, 0xFF, 0x7F, ++ 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x01, 0x00, ++ 0x00, 0xE0, 0xFF, 0xDF, 0xCF, 0xFF, 0x31, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xCF, 0xC0, 0xFF, 0x0F, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x40, ++ 0xE0, 0xD7, 0x01, 0x00, 0x00, 0xFC, 0x01, 0x00, ++ 0x00, 0x7C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x8B, 0x70, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, ++ 0x00, 0x00, 0x8B, 0x70, 0x00, 0x00, 0xC0, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x06, 0x00, 0xCF, 0xFC, 0xFC, 0xFC, 0x3F, 0x03, ++ 0x00, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x05, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x12, 0x00, ++ 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x18, 0x00, 0xB0, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, ++ 0x00, 0x00, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x19, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x81, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x08, 0x20, 0x84, 0x10, 0x00, 0x02, 0x68, 0x01, ++ 0x02, 0x00, 0x08, 0x20, 0x84, 0x10, 0x00, 0x02, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x03, ++ 0xFF, 0xFF, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0x3F, 0x3F, 0xFF, 0xAA, 0xFF, 0xFF, 0xFF, 0x3F, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x5F, ++ 0xDE, 0xFF, 0xCF, 0xEF, 0xFF, 0xFF, 0xDC, 0x3F, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x50, 0x55, 0x55, 0xA5, 0x02, 0xDB, 0x36, ++ 0x00, 0x00, 0x10, 0x40, 0x00, 0x50, 0x55, 0x55, ++ 0xA5, 0x02, 0xDB, 0x36, 0x00, 0x00, 0x90, 0x47, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0xA0, 0x00, 0xFC, 0x7F, 0x5F, ++ 0xDB, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ++}; ++ ++static const u_int32_t ++__CFUniCharPrecompSourceTable[] = { ++ 0x00000300, 0x00540000, 0x00000301, 0x00750054, ++ 0x00000302, 0x002000C9, 0x00000303, 0x001C00E9, ++ 0x00000304, 0x002C0105, 0x00000306, 0x00200131, ++ 0x00000307, 0x002E0151, 0x00000308, 0x0036017F, ++ 0x00000309, 0x001801B5, 0x0000030A, 0x000601CD, ++ 0x0000030B, 0x000601D3, 0x0000030C, 0x002501D9, ++ 0x0000030F, 0x000E01FE, 0x00000311, 0x000C020C, ++ 0x00000313, 0x000E0218, 0x00000314, 0x00100226, ++ 0x0000031B, 0x00040236, 0x00000323, 0x002A023A, ++ 0x00000324, 0x00020264, 0x00000325, 0x00020266, ++ 0x00000326, 0x00040268, 0x00000327, 0x0016026C, ++ 0x00000328, 0x000A0282, 0x0000032D, 0x000C028C, ++ 0x0000032E, 0x00020298, 0x00000330, 0x0006029A, ++ 0x00000331, 0x001102A0, 0x00000338, 0x002C02B1, ++ 0x00000342, 0x001D02DD, 0x00000345, 0x003F02FA, ++ 0x00000653, 0x00010339, 0x00000654, 0x0006033A, ++ 0x00000655, 0x00010340, 0x0000093C, 0x00030341, ++ 0x000009BE, 0x00010344, 0x000009D7, 0x00010345, ++ 0x00000B3E, 0x00010346, 0x00000B56, 0x00010347, ++ 0x00000B57, 0x00010348, 0x00000BBE, 0x00020349, ++ 0x00000BD7, 0x0002034B, 0x00000C56, 0x0001034D, ++ 0x00000CC2, 0x0001034E, 0x00000CD5, 0x0003034F, ++ 0x00000CD6, 0x00010352, 0x00000D3E, 0x00020353, ++ 0x00000D57, 0x00010355, 0x00000DCA, 0x00020356, ++ 0x00000DCF, 0x00010358, 0x00000DDF, 0x00010359, ++ 0x0000102E, 0x0001035A, 0x00003099, 0x0030035B, ++ 0x0000309A, 0x000A038B ++}; ++ ++static const u_int32_t __CFUniCharPrecompositionTableLength = ++ (sizeof(__CFUniCharPrecompSourceTable) / (sizeof(u_int32_t) * 2)); ++ ++ ++static const u_int16_t ++__CFUniCharBMPPrecompDestinationTable[] = { ++ 0x0041, 0x00C0, 0x0045, 0x00C8, 0x0049, 0x00CC, 0x004E, 0x01F8, ++ 0x004F, 0x00D2, 0x0055, 0x00D9, 0x0057, 0x1E80, 0x0059, 0x1EF2, ++ 0x0061, 0x00E0, 0x0065, 0x00E8, 0x0069, 0x00EC, 0x006E, 0x01F9, ++ 0x006F, 0x00F2, 0x0075, 0x00F9, 0x0077, 0x1E81, 0x0079, 0x1EF3, ++ 0x00A8, 0x1FED, 0x00C2, 0x1EA6, 0x00CA, 0x1EC0, 0x00D4, 0x1ED2, ++ 0x00DC, 0x01DB, 0x00E2, 0x1EA7, 0x00EA, 0x1EC1, 0x00F4, 0x1ED3, ++ 0x00FC, 0x01DC, 0x0102, 0x1EB0, 0x0103, 0x1EB1, 0x0112, 0x1E14, ++ 0x0113, 0x1E15, 0x014C, 0x1E50, 0x014D, 0x1E51, 0x01A0, 0x1EDC, ++ 0x01A1, 0x1EDD, 0x01AF, 0x1EEA, 0x01B0, 0x1EEB, 0x0391, 0x1FBA, ++ 0x0395, 0x1FC8, 0x0397, 0x1FCA, 0x0399, 0x1FDA, 0x039F, 0x1FF8, ++ 0x03A5, 0x1FEA, 0x03A9, 0x1FFA, 0x03B1, 0x1F70, 0x03B5, 0x1F72, ++ 0x03B7, 0x1F74, 0x03B9, 0x1F76, 0x03BF, 0x1F78, 0x03C5, 0x1F7A, ++ 0x03C9, 0x1F7C, 0x03CA, 0x1FD2, 0x03CB, 0x1FE2, 0x0415, 0x0400, ++ 0x0418, 0x040D, 0x0435, 0x0450, 0x0438, 0x045D, 0x1F00, 0x1F02, ++ 0x1F01, 0x1F03, 0x1F08, 0x1F0A, 0x1F09, 0x1F0B, 0x1F10, 0x1F12, ++ 0x1F11, 0x1F13, 0x1F18, 0x1F1A, 0x1F19, 0x1F1B, 0x1F20, 0x1F22, ++ 0x1F21, 0x1F23, 0x1F28, 0x1F2A, 0x1F29, 0x1F2B, 0x1F30, 0x1F32, ++ 0x1F31, 0x1F33, 0x1F38, 0x1F3A, 0x1F39, 0x1F3B, 0x1F40, 0x1F42, ++ 0x1F41, 0x1F43, 0x1F48, 0x1F4A, 0x1F49, 0x1F4B, 0x1F50, 0x1F52, ++ 0x1F51, 0x1F53, 0x1F59, 0x1F5B, 0x1F60, 0x1F62, 0x1F61, 0x1F63, ++ 0x1F68, 0x1F6A, 0x1F69, 0x1F6B, 0x1FBF, 0x1FCD, 0x1FFE, 0x1FDD, ++ 0x0041, 0x00C1, 0x0043, 0x0106, 0x0045, 0x00C9, 0x0047, 0x01F4, ++ 0x0049, 0x00CD, 0x004B, 0x1E30, 0x004C, 0x0139, 0x004D, 0x1E3E, ++ 0x004E, 0x0143, 0x004F, 0x00D3, 0x0050, 0x1E54, 0x0052, 0x0154, ++ 0x0053, 0x015A, 0x0055, 0x00DA, 0x0057, 0x1E82, 0x0059, 0x00DD, ++ 0x005A, 0x0179, 0x0061, 0x00E1, 0x0063, 0x0107, 0x0065, 0x00E9, ++ 0x0067, 0x01F5, 0x0069, 0x00ED, 0x006B, 0x1E31, 0x006C, 0x013A, ++ 0x006D, 0x1E3F, 0x006E, 0x0144, 0x006F, 0x00F3, 0x0070, 0x1E55, ++ 0x0072, 0x0155, 0x0073, 0x015B, 0x0075, 0x00FA, 0x0077, 0x1E83, ++ 0x0079, 0x00FD, 0x007A, 0x017A, 0x00A8, 0x0385, 0x00C2, 0x1EA4, ++ 0x00C5, 0x01FA, 0x00C6, 0x01FC, 0x00C7, 0x1E08, 0x00CA, 0x1EBE, ++ 0x00CF, 0x1E2E, 0x00D4, 0x1ED0, 0x00D5, 0x1E4C, 0x00D8, 0x01FE, ++ 0x00DC, 0x01D7, 0x00E2, 0x1EA5, 0x00E5, 0x01FB, 0x00E6, 0x01FD, ++ 0x00E7, 0x1E09, 0x00EA, 0x1EBF, 0x00EF, 0x1E2F, 0x00F4, 0x1ED1, ++ 0x00F5, 0x1E4D, 0x00F8, 0x01FF, 0x00FC, 0x01D8, 0x0102, 0x1EAE, ++ 0x0103, 0x1EAF, 0x0112, 0x1E16, 0x0113, 0x1E17, 0x014C, 0x1E52, ++ 0x014D, 0x1E53, 0x0168, 0x1E78, 0x0169, 0x1E79, 0x01A0, 0x1EDA, ++ 0x01A1, 0x1EDB, 0x01AF, 0x1EE8, 0x01B0, 0x1EE9, 0x0391, 0x0386, ++ 0x0395, 0x0388, 0x0397, 0x0389, 0x0399, 0x038A, 0x039F, 0x038C, ++ 0x03A5, 0x038E, 0x03A9, 0x038F, 0x03B1, 0x03AC, 0x03B5, 0x03AD, ++ 0x03B7, 0x03AE, 0x03B9, 0x03AF, 0x03BF, 0x03CC, 0x03C5, 0x03CD, ++ 0x03C9, 0x03CE, 0x03CA, 0x0390, 0x03CB, 0x03B0, 0x03D2, 0x03D3, ++ 0x0413, 0x0403, 0x041A, 0x040C, 0x0433, 0x0453, 0x043A, 0x045C, ++ 0x1F00, 0x1F04, 0x1F01, 0x1F05, 0x1F08, 0x1F0C, 0x1F09, 0x1F0D, ++ 0x1F10, 0x1F14, 0x1F11, 0x1F15, 0x1F18, 0x1F1C, 0x1F19, 0x1F1D, ++ 0x1F20, 0x1F24, 0x1F21, 0x1F25, 0x1F28, 0x1F2C, 0x1F29, 0x1F2D, ++ 0x1F30, 0x1F34, 0x1F31, 0x1F35, 0x1F38, 0x1F3C, 0x1F39, 0x1F3D, ++ 0x1F40, 0x1F44, 0x1F41, 0x1F45, 0x1F48, 0x1F4C, 0x1F49, 0x1F4D, ++ 0x1F50, 0x1F54, 0x1F51, 0x1F55, 0x1F59, 0x1F5D, 0x1F60, 0x1F64, ++ 0x1F61, 0x1F65, 0x1F68, 0x1F6C, 0x1F69, 0x1F6D, 0x1FBF, 0x1FCE, ++ 0x1FFE, 0x1FDE, 0x0041, 0x00C2, 0x0043, 0x0108, 0x0045, 0x00CA, ++ 0x0047, 0x011C, 0x0048, 0x0124, 0x0049, 0x00CE, 0x004A, 0x0134, ++ 0x004F, 0x00D4, 0x0053, 0x015C, 0x0055, 0x00DB, 0x0057, 0x0174, ++ 0x0059, 0x0176, 0x005A, 0x1E90, 0x0061, 0x00E2, 0x0063, 0x0109, ++ 0x0065, 0x00EA, 0x0067, 0x011D, 0x0068, 0x0125, 0x0069, 0x00EE, ++ 0x006A, 0x0135, 0x006F, 0x00F4, 0x0073, 0x015D, 0x0075, 0x00FB, ++ 0x0077, 0x0175, 0x0079, 0x0177, 0x007A, 0x1E91, 0x1EA0, 0x1EAC, ++ 0x1EA1, 0x1EAD, 0x1EB8, 0x1EC6, 0x1EB9, 0x1EC7, 0x1ECC, 0x1ED8, ++ 0x1ECD, 0x1ED9, 0x0041, 0x00C3, 0x0045, 0x1EBC, 0x0049, 0x0128, ++ 0x004E, 0x00D1, 0x004F, 0x00D5, 0x0055, 0x0168, 0x0056, 0x1E7C, ++ 0x0059, 0x1EF8, 0x0061, 0x00E3, 0x0065, 0x1EBD, 0x0069, 0x0129, ++ 0x006E, 0x00F1, 0x006F, 0x00F5, 0x0075, 0x0169, 0x0076, 0x1E7D, ++ 0x0079, 0x1EF9, 0x00C2, 0x1EAA, 0x00CA, 0x1EC4, 0x00D4, 0x1ED6, ++ 0x00E2, 0x1EAB, 0x00EA, 0x1EC5, 0x00F4, 0x1ED7, 0x0102, 0x1EB4, ++ 0x0103, 0x1EB5, 0x01A0, 0x1EE0, 0x01A1, 0x1EE1, 0x01AF, 0x1EEE, ++ 0x01B0, 0x1EEF, 0x0041, 0x0100, 0x0045, 0x0112, 0x0047, 0x1E20, ++ 0x0049, 0x012A, 0x004F, 0x014C, 0x0055, 0x016A, 0x0059, 0x0232, ++ 0x0061, 0x0101, 0x0065, 0x0113, 0x0067, 0x1E21, 0x0069, 0x012B, ++ 0x006F, 0x014D, 0x0075, 0x016B, 0x0079, 0x0233, 0x00C4, 0x01DE, ++ 0x00C6, 0x01E2, 0x00D5, 0x022C, 0x00D6, 0x022A, 0x00DC, 0x01D5, ++ 0x00E4, 0x01DF, 0x00E6, 0x01E3, 0x00F5, 0x022D, 0x00F6, 0x022B, ++ 0x00FC, 0x01D6, 0x01EA, 0x01EC, 0x01EB, 0x01ED, 0x0226, 0x01E0, ++ 0x0227, 0x01E1, 0x022E, 0x0230, 0x022F, 0x0231, 0x0391, 0x1FB9, ++ 0x0399, 0x1FD9, 0x03A5, 0x1FE9, 0x03B1, 0x1FB1, 0x03B9, 0x1FD1, ++ 0x03C5, 0x1FE1, 0x0418, 0x04E2, 0x0423, 0x04EE, 0x0438, 0x04E3, ++ 0x0443, 0x04EF, 0x1E36, 0x1E38, 0x1E37, 0x1E39, 0x1E5A, 0x1E5C, ++ 0x1E5B, 0x1E5D, 0x0041, 0x0102, 0x0045, 0x0114, 0x0047, 0x011E, ++ 0x0049, 0x012C, 0x004F, 0x014E, 0x0055, 0x016C, 0x0061, 0x0103, ++ 0x0065, 0x0115, 0x0067, 0x011F, 0x0069, 0x012D, 0x006F, 0x014F, ++ 0x0075, 0x016D, 0x0228, 0x1E1C, 0x0229, 0x1E1D, 0x0391, 0x1FB8, ++ 0x0399, 0x1FD8, 0x03A5, 0x1FE8, 0x03B1, 0x1FB0, 0x03B9, 0x1FD0, ++ 0x03C5, 0x1FE0, 0x0410, 0x04D0, 0x0415, 0x04D6, 0x0416, 0x04C1, ++ 0x0418, 0x0419, 0x0423, 0x040E, 0x0430, 0x04D1, 0x0435, 0x04D7, ++ 0x0436, 0x04C2, 0x0438, 0x0439, 0x0443, 0x045E, 0x1EA0, 0x1EB6, ++ 0x1EA1, 0x1EB7, 0x0041, 0x0226, 0x0042, 0x1E02, 0x0043, 0x010A, ++ 0x0044, 0x1E0A, 0x0045, 0x0116, 0x0046, 0x1E1E, 0x0047, 0x0120, ++ 0x0048, 0x1E22, 0x0049, 0x0130, 0x004D, 0x1E40, 0x004E, 0x1E44, ++ 0x004F, 0x022E, 0x0050, 0x1E56, 0x0052, 0x1E58, 0x0053, 0x1E60, ++ 0x0054, 0x1E6A, 0x0057, 0x1E86, 0x0058, 0x1E8A, 0x0059, 0x1E8E, ++ 0x005A, 0x017B, 0x0061, 0x0227, 0x0062, 0x1E03, 0x0063, 0x010B, ++ 0x0064, 0x1E0B, 0x0065, 0x0117, 0x0066, 0x1E1F, 0x0067, 0x0121, ++ 0x0068, 0x1E23, 0x006D, 0x1E41, 0x006E, 0x1E45, 0x006F, 0x022F, ++ 0x0070, 0x1E57, 0x0072, 0x1E59, 0x0073, 0x1E61, 0x0074, 0x1E6B, ++ 0x0077, 0x1E87, 0x0078, 0x1E8B, 0x0079, 0x1E8F, 0x007A, 0x017C, ++ 0x015A, 0x1E64, 0x015B, 0x1E65, 0x0160, 0x1E66, 0x0161, 0x1E67, ++ 0x017F, 0x1E9B, 0x1E62, 0x1E68, 0x1E63, 0x1E69, 0x0041, 0x00C4, ++ 0x0045, 0x00CB, 0x0048, 0x1E26, 0x0049, 0x00CF, 0x004F, 0x00D6, ++ 0x0055, 0x00DC, 0x0057, 0x1E84, 0x0058, 0x1E8C, 0x0059, 0x0178, ++ 0x0061, 0x00E4, 0x0065, 0x00EB, 0x0068, 0x1E27, 0x0069, 0x00EF, ++ 0x006F, 0x00F6, 0x0074, 0x1E97, 0x0075, 0x00FC, 0x0077, 0x1E85, ++ 0x0078, 0x1E8D, 0x0079, 0x00FF, 0x00D5, 0x1E4E, 0x00F5, 0x1E4F, ++ 0x016A, 0x1E7A, 0x016B, 0x1E7B, 0x0399, 0x03AA, 0x03A5, 0x03AB, ++ 0x03B9, 0x03CA, 0x03C5, 0x03CB, 0x03D2, 0x03D4, 0x0406, 0x0407, ++ 0x0410, 0x04D2, 0x0415, 0x0401, 0x0416, 0x04DC, 0x0417, 0x04DE, ++ 0x0418, 0x04E4, 0x041E, 0x04E6, 0x0423, 0x04F0, 0x0427, 0x04F4, ++ 0x042B, 0x04F8, 0x042D, 0x04EC, 0x0430, 0x04D3, 0x0435, 0x0451, ++ 0x0436, 0x04DD, 0x0437, 0x04DF, 0x0438, 0x04E5, 0x043E, 0x04E7, ++ 0x0443, 0x04F1, 0x0447, 0x04F5, 0x044B, 0x04F9, 0x044D, 0x04ED, ++ 0x0456, 0x0457, 0x04D8, 0x04DA, 0x04D9, 0x04DB, 0x04E8, 0x04EA, ++ 0x04E9, 0x04EB, 0x0041, 0x1EA2, 0x0045, 0x1EBA, 0x0049, 0x1EC8, ++ 0x004F, 0x1ECE, 0x0055, 0x1EE6, 0x0059, 0x1EF6, 0x0061, 0x1EA3, ++ 0x0065, 0x1EBB, 0x0069, 0x1EC9, 0x006F, 0x1ECF, 0x0075, 0x1EE7, ++ 0x0079, 0x1EF7, 0x00C2, 0x1EA8, 0x00CA, 0x1EC2, 0x00D4, 0x1ED4, ++ 0x00E2, 0x1EA9, 0x00EA, 0x1EC3, 0x00F4, 0x1ED5, 0x0102, 0x1EB2, ++ 0x0103, 0x1EB3, 0x01A0, 0x1EDE, 0x01A1, 0x1EDF, 0x01AF, 0x1EEC, ++ 0x01B0, 0x1EED, 0x0041, 0x00C5, 0x0055, 0x016E, 0x0061, 0x00E5, ++ 0x0075, 0x016F, 0x0077, 0x1E98, 0x0079, 0x1E99, 0x004F, 0x0150, ++ 0x0055, 0x0170, 0x006F, 0x0151, 0x0075, 0x0171, 0x0423, 0x04F2, ++ 0x0443, 0x04F3, 0x0041, 0x01CD, 0x0043, 0x010C, 0x0044, 0x010E, ++ 0x0045, 0x011A, 0x0047, 0x01E6, 0x0048, 0x021E, 0x0049, 0x01CF, ++ 0x004B, 0x01E8, 0x004C, 0x013D, 0x004E, 0x0147, 0x004F, 0x01D1, ++ 0x0052, 0x0158, 0x0053, 0x0160, 0x0054, 0x0164, 0x0055, 0x01D3, ++ 0x005A, 0x017D, 0x0061, 0x01CE, 0x0063, 0x010D, 0x0064, 0x010F, ++ 0x0065, 0x011B, 0x0067, 0x01E7, 0x0068, 0x021F, 0x0069, 0x01D0, ++ 0x006A, 0x01F0, 0x006B, 0x01E9, 0x006C, 0x013E, 0x006E, 0x0148, ++ 0x006F, 0x01D2, 0x0072, 0x0159, 0x0073, 0x0161, 0x0074, 0x0165, ++ 0x0075, 0x01D4, 0x007A, 0x017E, 0x00DC, 0x01D9, 0x00FC, 0x01DA, ++ 0x01B7, 0x01EE, 0x0292, 0x01EF, 0x0041, 0x0200, 0x0045, 0x0204, ++ 0x0049, 0x0208, 0x004F, 0x020C, 0x0052, 0x0210, 0x0055, 0x0214, ++ 0x0061, 0x0201, 0x0065, 0x0205, 0x0069, 0x0209, 0x006F, 0x020D, ++ 0x0072, 0x0211, 0x0075, 0x0215, 0x0474, 0x0476, 0x0475, 0x0477, ++ 0x0041, 0x0202, 0x0045, 0x0206, 0x0049, 0x020A, 0x004F, 0x020E, ++ 0x0052, 0x0212, 0x0055, 0x0216, 0x0061, 0x0203, 0x0065, 0x0207, ++ 0x0069, 0x020B, 0x006F, 0x020F, 0x0072, 0x0213, 0x0075, 0x0217, ++ 0x0391, 0x1F08, 0x0395, 0x1F18, 0x0397, 0x1F28, 0x0399, 0x1F38, ++ 0x039F, 0x1F48, 0x03A9, 0x1F68, 0x03B1, 0x1F00, 0x03B5, 0x1F10, ++ 0x03B7, 0x1F20, 0x03B9, 0x1F30, 0x03BF, 0x1F40, 0x03C1, 0x1FE4, ++ 0x03C5, 0x1F50, 0x03C9, 0x1F60, 0x0391, 0x1F09, 0x0395, 0x1F19, ++ 0x0397, 0x1F29, 0x0399, 0x1F39, 0x039F, 0x1F49, 0x03A1, 0x1FEC, ++ 0x03A5, 0x1F59, 0x03A9, 0x1F69, 0x03B1, 0x1F01, 0x03B5, 0x1F11, ++ 0x03B7, 0x1F21, 0x03B9, 0x1F31, 0x03BF, 0x1F41, 0x03C1, 0x1FE5, ++ 0x03C5, 0x1F51, 0x03C9, 0x1F61, 0x004F, 0x01A0, 0x0055, 0x01AF, ++ 0x006F, 0x01A1, 0x0075, 0x01B0, 0x0041, 0x1EA0, 0x0042, 0x1E04, ++ 0x0044, 0x1E0C, 0x0045, 0x1EB8, 0x0048, 0x1E24, 0x0049, 0x1ECA, ++ 0x004B, 0x1E32, 0x004C, 0x1E36, 0x004D, 0x1E42, 0x004E, 0x1E46, ++ 0x004F, 0x1ECC, 0x0052, 0x1E5A, 0x0053, 0x1E62, 0x0054, 0x1E6C, ++ 0x0055, 0x1EE4, 0x0056, 0x1E7E, 0x0057, 0x1E88, 0x0059, 0x1EF4, ++ 0x005A, 0x1E92, 0x0061, 0x1EA1, 0x0062, 0x1E05, 0x0064, 0x1E0D, ++ 0x0065, 0x1EB9, 0x0068, 0x1E25, 0x0069, 0x1ECB, 0x006B, 0x1E33, ++ 0x006C, 0x1E37, 0x006D, 0x1E43, 0x006E, 0x1E47, 0x006F, 0x1ECD, ++ 0x0072, 0x1E5B, 0x0073, 0x1E63, 0x0074, 0x1E6D, 0x0075, 0x1EE5, ++ 0x0076, 0x1E7F, 0x0077, 0x1E89, 0x0079, 0x1EF5, 0x007A, 0x1E93, ++ 0x01A0, 0x1EE2, 0x01A1, 0x1EE3, 0x01AF, 0x1EF0, 0x01B0, 0x1EF1, ++ 0x0055, 0x1E72, 0x0075, 0x1E73, 0x0041, 0x1E00, 0x0061, 0x1E01, ++ 0x0053, 0x0218, 0x0054, 0x021A, 0x0073, 0x0219, 0x0074, 0x021B, ++ 0x0043, 0x00C7, 0x0044, 0x1E10, 0x0045, 0x0228, 0x0047, 0x0122, ++ 0x0048, 0x1E28, 0x004B, 0x0136, 0x004C, 0x013B, 0x004E, 0x0145, ++ 0x0052, 0x0156, 0x0053, 0x015E, 0x0054, 0x0162, 0x0063, 0x00E7, ++ 0x0064, 0x1E11, 0x0065, 0x0229, 0x0067, 0x0123, 0x0068, 0x1E29, ++ 0x006B, 0x0137, 0x006C, 0x013C, 0x006E, 0x0146, 0x0072, 0x0157, ++ 0x0073, 0x015F, 0x0074, 0x0163, 0x0041, 0x0104, 0x0045, 0x0118, ++ 0x0049, 0x012E, 0x004F, 0x01EA, 0x0055, 0x0172, 0x0061, 0x0105, ++ 0x0065, 0x0119, 0x0069, 0x012F, 0x006F, 0x01EB, 0x0075, 0x0173, ++ 0x0044, 0x1E12, 0x0045, 0x1E18, 0x004C, 0x1E3C, 0x004E, 0x1E4A, ++ 0x0054, 0x1E70, 0x0055, 0x1E76, 0x0064, 0x1E13, 0x0065, 0x1E19, ++ 0x006C, 0x1E3D, 0x006E, 0x1E4B, 0x0074, 0x1E71, 0x0075, 0x1E77, ++ 0x0048, 0x1E2A, 0x0068, 0x1E2B, 0x0045, 0x1E1A, 0x0049, 0x1E2C, ++ 0x0055, 0x1E74, 0x0065, 0x1E1B, 0x0069, 0x1E2D, 0x0075, 0x1E75, ++ 0x0042, 0x1E06, 0x0044, 0x1E0E, 0x004B, 0x1E34, 0x004C, 0x1E3A, ++ 0x004E, 0x1E48, 0x0052, 0x1E5E, 0x0054, 0x1E6E, 0x005A, 0x1E94, ++ 0x0062, 0x1E07, 0x0064, 0x1E0F, 0x0068, 0x1E96, 0x006B, 0x1E35, ++ 0x006C, 0x1E3B, 0x006E, 0x1E49, 0x0072, 0x1E5F, 0x0074, 0x1E6F, ++ 0x007A, 0x1E95, 0x003C, 0x226E, 0x003D, 0x2260, 0x003E, 0x226F, ++ 0x2190, 0x219A, 0x2192, 0x219B, 0x2194, 0x21AE, 0x21D0, 0x21CD, ++ 0x21D2, 0x21CF, 0x21D4, 0x21CE, 0x2203, 0x2204, 0x2208, 0x2209, ++ 0x220B, 0x220C, 0x2223, 0x2224, 0x2225, 0x2226, 0x223C, 0x2241, ++ 0x2243, 0x2244, 0x2245, 0x2247, 0x2248, 0x2249, 0x224D, 0x226D, ++ 0x2261, 0x2262, 0x2264, 0x2270, 0x2265, 0x2271, 0x2272, 0x2274, ++ 0x2273, 0x2275, 0x2276, 0x2278, 0x2277, 0x2279, 0x227A, 0x2280, ++ 0x227B, 0x2281, 0x227C, 0x22E0, 0x227D, 0x22E1, 0x2282, 0x2284, ++ 0x2283, 0x2285, 0x2286, 0x2288, 0x2287, 0x2289, 0x2291, 0x22E2, ++ 0x2292, 0x22E3, 0x22A2, 0x22AC, 0x22A8, 0x22AD, 0x22A9, 0x22AE, ++ 0x22AB, 0x22AF, 0x22B2, 0x22EA, 0x22B3, 0x22EB, 0x22B4, 0x22EC, ++ 0x22B5, 0x22ED, 0x00A8, 0x1FC1, 0x03B1, 0x1FB6, 0x03B7, 0x1FC6, ++ 0x03B9, 0x1FD6, 0x03C5, 0x1FE6, 0x03C9, 0x1FF6, 0x03CA, 0x1FD7, ++ 0x03CB, 0x1FE7, 0x1F00, 0x1F06, 0x1F01, 0x1F07, 0x1F08, 0x1F0E, ++ 0x1F09, 0x1F0F, 0x1F20, 0x1F26, 0x1F21, 0x1F27, 0x1F28, 0x1F2E, ++ 0x1F29, 0x1F2F, 0x1F30, 0x1F36, 0x1F31, 0x1F37, 0x1F38, 0x1F3E, ++ 0x1F39, 0x1F3F, 0x1F50, 0x1F56, 0x1F51, 0x1F57, 0x1F59, 0x1F5F, ++ 0x1F60, 0x1F66, 0x1F61, 0x1F67, 0x1F68, 0x1F6E, 0x1F69, 0x1F6F, ++ 0x1FBF, 0x1FCF, 0x1FFE, 0x1FDF, 0x0391, 0x1FBC, 0x0397, 0x1FCC, ++ 0x03A9, 0x1FFC, 0x03AC, 0x1FB4, 0x03AE, 0x1FC4, 0x03B1, 0x1FB3, ++ 0x03B7, 0x1FC3, 0x03C9, 0x1FF3, 0x03CE, 0x1FF4, 0x1F00, 0x1F80, ++ 0x1F01, 0x1F81, 0x1F02, 0x1F82, 0x1F03, 0x1F83, 0x1F04, 0x1F84, ++ 0x1F05, 0x1F85, 0x1F06, 0x1F86, 0x1F07, 0x1F87, 0x1F08, 0x1F88, ++ 0x1F09, 0x1F89, 0x1F0A, 0x1F8A, 0x1F0B, 0x1F8B, 0x1F0C, 0x1F8C, ++ 0x1F0D, 0x1F8D, 0x1F0E, 0x1F8E, 0x1F0F, 0x1F8F, 0x1F20, 0x1F90, ++ 0x1F21, 0x1F91, 0x1F22, 0x1F92, 0x1F23, 0x1F93, 0x1F24, 0x1F94, ++ 0x1F25, 0x1F95, 0x1F26, 0x1F96, 0x1F27, 0x1F97, 0x1F28, 0x1F98, ++ 0x1F29, 0x1F99, 0x1F2A, 0x1F9A, 0x1F2B, 0x1F9B, 0x1F2C, 0x1F9C, ++ 0x1F2D, 0x1F9D, 0x1F2E, 0x1F9E, 0x1F2F, 0x1F9F, 0x1F60, 0x1FA0, ++ 0x1F61, 0x1FA1, 0x1F62, 0x1FA2, 0x1F63, 0x1FA3, 0x1F64, 0x1FA4, ++ 0x1F65, 0x1FA5, 0x1F66, 0x1FA6, 0x1F67, 0x1FA7, 0x1F68, 0x1FA8, ++ 0x1F69, 0x1FA9, 0x1F6A, 0x1FAA, 0x1F6B, 0x1FAB, 0x1F6C, 0x1FAC, ++ 0x1F6D, 0x1FAD, 0x1F6E, 0x1FAE, 0x1F6F, 0x1FAF, 0x1F70, 0x1FB2, ++ 0x1F74, 0x1FC2, 0x1F7C, 0x1FF2, 0x1FB6, 0x1FB7, 0x1FC6, 0x1FC7, ++ 0x1FF6, 0x1FF7, 0x0627, 0x0622, 0x0627, 0x0623, 0x0648, 0x0624, ++ 0x064A, 0x0626, 0x06C1, 0x06C2, 0x06D2, 0x06D3, 0x06D5, 0x06C0, ++ 0x0627, 0x0625, 0x0928, 0x0929, 0x0930, 0x0931, 0x0933, 0x0934, ++ 0x09C7, 0x09CB, 0x09C7, 0x09CC, 0x0B47, 0x0B4B, 0x0B47, 0x0B48, ++ 0x0B47, 0x0B4C, 0x0BC6, 0x0BCA, 0x0BC7, 0x0BCB, 0x0B92, 0x0B94, ++ 0x0BC6, 0x0BCC, 0x0C46, 0x0C48, 0x0CC6, 0x0CCA, 0x0CBF, 0x0CC0, ++ 0x0CC6, 0x0CC7, 0x0CCA, 0x0CCB, 0x0CC6, 0x0CC8, 0x0D46, 0x0D4A, ++ 0x0D47, 0x0D4B, 0x0D46, 0x0D4C, 0x0DD9, 0x0DDA, 0x0DDC, 0x0DDD, ++ 0x0DD9, 0x0DDC, 0x0DD9, 0x0DDE, 0x1025, 0x1026, 0x3046, 0x3094, ++ 0x304B, 0x304C, 0x304D, 0x304E, 0x304F, 0x3050, 0x3051, 0x3052, ++ 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, 0x305A, ++ 0x305B, 0x305C, 0x305D, 0x305E, 0x305F, 0x3060, 0x3061, 0x3062, ++ 0x3064, 0x3065, 0x3066, 0x3067, 0x3068, 0x3069, 0x306F, 0x3070, ++ 0x3072, 0x3073, 0x3075, 0x3076, 0x3078, 0x3079, 0x307B, 0x307C, ++ 0x309D, 0x309E, 0x30A6, 0x30F4, 0x30AB, 0x30AC, 0x30AD, 0x30AE, ++ 0x30AF, 0x30B0, 0x30B1, 0x30B2, 0x30B3, 0x30B4, 0x30B5, 0x30B6, ++ 0x30B7, 0x30B8, 0x30B9, 0x30BA, 0x30BB, 0x30BC, 0x30BD, 0x30BE, ++ 0x30BF, 0x30C0, 0x30C1, 0x30C2, 0x30C4, 0x30C5, 0x30C6, 0x30C7, ++ 0x30C8, 0x30C9, 0x30CF, 0x30D0, 0x30D2, 0x30D3, 0x30D5, 0x30D6, ++ 0x30D8, 0x30D9, 0x30DB, 0x30DC, 0x30EF, 0x30F7, 0x30F0, 0x30F8, ++ 0x30F1, 0x30F9, 0x30F2, 0x30FA, 0x30FD, 0x30FE, 0x306F, 0x3071, ++ 0x3072, 0x3074, 0x3075, 0x3077, 0x3078, 0x307A, 0x307B, 0x307D, ++ 0x30CF, 0x30D1, 0x30D2, 0x30D4, 0x30D5, 0x30D7, 0x30D8, 0x30DA, ++ 0x30DB, 0x30DD ++}; ++ ++static const u_int8_t ++__CFUniCharCombiningBitmap[] = { ++ 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, ++ 0x00, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, ++ 0x0D, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, ++ 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x13, 0x00, ++ ++ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, ++ 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x78, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0xFE, 0xFF, 0xFB, 0xFF, 0xFF, 0xBB, ++ 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0xF8, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0xC0, 0xFF, 0x9F, 0x3D, 0x00, 0x00, ++ 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xFF, 0xFF, ++ 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFF, 0x01, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, ++ 0xFF, 0x3F, 0x1E, 0x00, 0x0C, 0x00, 0x00, 0x00, ++ 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, ++ 0x9F, 0x39, 0x80, 0x00, 0x0C, 0x00, 0x00, 0x00, ++ 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, ++ 0x87, 0x39, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, ++ 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, ++ 0xBF, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, ++ 0x8F, 0x39, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, ++ 0xC7, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, ++ 0xDF, 0x3D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, ++ 0xDF, 0x3D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, ++ 0xCF, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x84, 0x5F, 0xFF, 0x00, 0x00, 0x0C, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, 0x07, ++ 0x80, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, 0x1B, ++ 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xA0, 0xC2, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, ++ 0xDF, 0x00, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0x1F, ++ 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xC7, 0x03, ++ 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x1C, 0x00, ++ 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xFF, ++ 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0xFF, 0xFF, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0x3F, 0x00, ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, ++ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ++}; ++ ++/* Surrogate Pair Constants */ ++#define SP_HALF_SHIFT 10 ++#define SP_HALF_BASE 0x0010000UL ++#define SP_HALF_MASK 0x3FFUL ++ ++#define SP_HIGH_FIRST 0xD800UL ++#define SP_HIGH_LAST 0xDBFFUL ++#define SP_LOW_FIRST 0xDC00UL ++#define SP_LOW_LAST 0xDFFFUL ++ ++/* ++ * Test for a combining character. ++ * ++ * Similar to __CFUniCharIsNonBaseCharacter except that ++ * unicode_combinable also includes Hangul Jamo characters. ++ */ ++static inline int ++unicode_combinable(u_int16_t character) ++{ ++ const u_int8_t *bitmap = __CFUniCharCombiningBitmap; ++ u_int8_t value; ++ ++ if (character < 0x0300) ++ return (0); ++ ++ value = bitmap[(character >> 8) & 0xFF]; ++ ++ if (value == 0xFF) { ++ return (1); ++ } else if (value) { ++ bitmap = bitmap + ((value - 1) * 32) + 256; ++ return (bitmap[(character & 0xFF) / 8] & (1 << (character % 8)) ? 1 : 0); ++ } ++ return (0); ++} ++ ++/* ++ * Test for a precomposed character. ++ * ++ * Similar to __CFUniCharIsDecomposableCharacter. ++ */ ++static inline int ++unicode_decomposeable(u_int16_t character) { ++ const u_int8_t *bitmap = __CFUniCharDecomposableBitmap; ++ u_int8_t value; ++ ++ if (character < 0x00C0) ++ return (0); ++ ++ value = bitmap[(character >> 8) & 0xFF]; ++ ++ if (value == 0xFF) { ++ return (1); ++ } else if (value) { ++ bitmap = bitmap + ((value - 1) * 32) + 256; ++ return (bitmap[(character & 0xFF) / 8] & (1 << (character % 8)) ? 1 : 0); ++ } ++ return (0); ++} ++ ++static int unicode_decompose(u_int16_t character, u_int16_t *convertedChars); ++static u_int16_t unicode_combine(u_int16_t base, u_int16_t combining); ++ ++char utf_extrabytes[32] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ++ -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 2, 2, 3, -1 ++}; ++ ++/* ++ * utf8_encodestr - Encodes a Unicode string to UTF-8 ++ * ++ * NOTES: ++ * The resulting UTF-8 string is NULL terminated. ++ * ++ * If '/' chars are not allowed on disk then an alternate ++ * (replacement) char must be provided in altslash. ++ * ++ * input flags: ++ * UTF_REVERSE_ENDIAN: Unicode byteorder is opposite current runtime ++ * UTF_NO_NULL_TERM: don't add NULL termination to UTF-8 output ++ * ++ * result: ++ * ENAMETOOLONG: Name didn't fit; only buflen bytes were encoded ++ * EINVAL: Illegal char found; char was replaced by an '_'. ++ */ ++int ++utf8_encodestr(const u_int16_t * ucsp, size_t ucslen, u_int8_t * utf8p, ++ size_t * utf8len, size_t buflen, u_int16_t altslash, int flags) ++{ ++ u_int8_t * bufstart; ++ u_int8_t * bufend; ++ u_int16_t ucs_ch; ++ u_int16_t * chp = NULL; ++ u_int16_t sequence[8]; ++ int extra = 0; ++ int charcnt; ++ int swapbytes = (flags & UTF_REVERSE_ENDIAN); ++ int nullterm = ((flags & UTF_NO_NULL_TERM) == 0); ++ int decompose = (flags & UTF_DECOMPOSED); ++ int result = 0; ++ ++ bufstart = utf8p; ++ bufend = bufstart + buflen; ++ if (nullterm) ++ --bufend; ++ charcnt = ucslen / 2; ++ ++ while (charcnt-- > 0) { ++ if (extra > 0) { ++ --extra; ++ ucs_ch = *chp++; ++ } else { ++ ucs_ch = swapbytes ? OSSwapInt16(*ucsp++) : *ucsp++; ++ ++ if (decompose && unicode_decomposeable(ucs_ch)) { ++ extra = unicode_decompose(ucs_ch, sequence) - 1; ++ charcnt += extra; ++ ucs_ch = sequence[0]; ++ chp = &sequence[1]; ++ } ++ } ++ ++ if (ucs_ch < 0x0080) { ++ if (utf8p >= bufend) { ++ result = ENAMETOOLONG; ++ break; ++ } ++ *utf8p++ = ucs_ch; ++ ++ } else if (ucs_ch < 0x800) { ++ if ((utf8p + 1) >= bufend) { ++ result = ENAMETOOLONG; ++ break; ++ } ++ *utf8p++ = 0xc0 | (ucs_ch >> 6); ++ *utf8p++ = 0x80 | (0x3f & ucs_ch); ++ ++ } else { ++ /* Combine valid surrogate pairs */ ++ if (ucs_ch >= SP_HIGH_FIRST && ucs_ch <= SP_HIGH_LAST ++ && charcnt > 0) { ++ u_int16_t ch2; ++ u_int32_t pair; ++ ++ ch2 = swapbytes ? OSSwapInt16(*ucsp) : *ucsp; ++ if (ch2 >= SP_LOW_FIRST && ch2 <= SP_LOW_LAST) { ++ pair = ((ucs_ch - SP_HIGH_FIRST) << SP_HALF_SHIFT) ++ + (ch2 - SP_LOW_FIRST) + SP_HALF_BASE; ++ if ((utf8p + 3) >= bufend) { ++ result = ENAMETOOLONG; ++ break; ++ } ++ --charcnt; ++ ++ucsp; ++ *utf8p++ = 0xf0 | (pair >> 18); ++ *utf8p++ = 0x80 | (0x3f & (pair >> 12)); ++ *utf8p++ = 0x80 | (0x3f & (pair >> 6)); ++ *utf8p++ = 0x80 | (0x3f & pair); ++ continue; ++ } ++ } ++ if ((utf8p + 2) >= bufend) { ++ result = ENAMETOOLONG; ++ break; ++ } ++ *utf8p++ = 0xe0 | (ucs_ch >> 12); ++ *utf8p++ = 0x80 | (0x3f & (ucs_ch >> 6)); ++ *utf8p++ = 0x80 | (0x3f & ucs_ch); ++ } ++ } ++ ++ *utf8len = utf8p - bufstart; ++ if (nullterm) ++ *utf8p++ = '\0'; ++ ++ return (result); ++} ++ ++ ++/* ++ * utf8_decodestr - Decodes a UTF-8 string back to Unicode ++ * ++ * NOTES: ++ * The input UTF-8 string does not need to be null terminated ++ * if utf8len is set. ++ * ++ * If '/' chars are not allowed on disk then an alternate ++ * (replacement) char must be provided in altslash. ++ * ++ * input flags: ++ * UTF_REV_ENDIAN: Unicode byteorder is oposite current runtime ++ * UTF_DECOMPOSED: Unicode output string must be fully decompsed ++ * ++ * result: ++ * ENAMETOOLONG: Name didn't fit; only ucslen chars were decoded. ++ * EINVAL: Illegal UTF-8 sequence found. ++ */ ++int ++utf8_decodestr(const u_int8_t* utf8p, size_t utf8len, u_int16_t* ucsp, ++ size_t *ucslen, size_t buflen, u_int16_t altslash, int flags, size_t *consumed) ++{ ++ u_int16_t* bufstart; ++ u_int16_t* bufend; ++ unsigned int ucs_ch; ++ unsigned int byte; ++ int result = 0; ++ int decompose, precompose, swapbytes; ++ const u_int8_t *utf8start, *utf8lastpass; ++ ++ decompose = (flags & UTF_DECOMPOSED); ++ precompose = (flags & UTF_PRECOMPOSED); ++ swapbytes = (flags & UTF_REVERSE_ENDIAN); ++ ++ bufstart = ucsp; ++ bufend = (u_int16_t *)((u_int8_t *)ucsp + buflen); ++ utf8start = utf8p; ++ ++ while (utf8len-- > 0) { ++ byte = *utf8p++; ++ ++ if (ucsp >= bufend) ++ goto toolong; ++ ++ /* check for ascii */ ++ if (byte < 0x80) { ++ ucs_ch = byte; /* 1st byte */ ++ } else { ++ u_int32_t ch; ++ int extrabytes = utf_extrabytes[byte >> 3]; ++ ++ if (utf8len < extrabytes) ++ goto invalid; ++ utf8len -= extrabytes; ++ ++ switch (extrabytes) { ++ case 1: ++ ch = byte; ch <<= 6; /* 1st byte */ ++ byte = *utf8p++; /* 2nd byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ++ ch -= 0x00003080UL; ++ if (ch < 0x0080) ++ goto invalid; ++ ucs_ch = ch; ++ break; ++ case 2: ++ ch = byte; ch <<= 6; /* 1st byte */ ++ byte = *utf8p++; /* 2nd byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ch <<= 6; ++ byte = *utf8p++; /* 3rd byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ++ ch -= 0x000E2080UL; ++ if (ch < 0x0800) ++ goto invalid; ++ if (ch >= 0xD800) { ++ if (ch <= 0xDFFF) ++ goto invalid; ++ if (ch == 0xFFFE || ch == 0xFFFF) ++ goto invalid; ++ } ++ ucs_ch = ch; ++ break; ++ case 3: ++ ch = byte; ch <<= 6; /* 1st byte */ ++ byte = *utf8p++; /* 2nd byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ch <<= 6; ++ byte = *utf8p++; /* 3rd byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ch <<= 6; ++ byte = *utf8p++; /* 4th byte */ ++ if ((byte >> 6) != 2) ++ goto invalid; ++ ch += byte; ++ ch -= 0x03C82080UL + SP_HALF_BASE; ++ ucs_ch = (ch >> SP_HALF_SHIFT) + SP_HIGH_FIRST; ++ if (ucs_ch < SP_HIGH_FIRST || ucs_ch > SP_HIGH_LAST) ++ goto invalid; ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; ++ if (ucsp >= bufend) ++ goto toolong; ++ ucs_ch = (ch & SP_HALF_MASK) + SP_LOW_FIRST; ++ if (ucs_ch < SP_LOW_FIRST || ucs_ch > SP_LOW_LAST) ++ goto invalid; ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; ++ continue; ++ default: ++ goto invalid; ++ } ++ } ++ if (precompose && (ucsp != bufstart)) { ++ u_int16_t composite, base; ++ ++ if (unicode_combinable(ucs_ch)) { ++ base = swapbytes ? OSSwapInt16(*(ucsp - 1)) : *(ucsp - 1); ++ composite = unicode_combine(base, ucs_ch); ++ if (composite) { ++ --ucsp; ++ ucs_ch = composite; ++ } else { ++ goto exit; ++ } ++ } else { ++ goto exit; ++ } ++ } ++ *ucsp++ = swapbytes ? OSSwapInt16(ucs_ch) : ucs_ch; ++ utf8lastpass = utf8p; ++ } ++ ++exit: ++ *ucslen = (u_int8_t*)ucsp - (u_int8_t*)bufstart; ++ *consumed = utf8lastpass - utf8start; ++ return (result); ++ ++invalid: ++ result = EINVAL; ++ goto exit; ++ ++toolong: ++ result = ENAMETOOLONG; ++ goto exit; ++} ++ ++ /* ++ * Unicode 3.2 decomposition code (derived from Core Foundation) ++ */ ++ ++typedef struct { ++ u_int32_t _key; ++ u_int32_t _value; ++} unicode_mappings32; ++ ++static inline u_int32_t ++getmappedvalue32(const unicode_mappings32 *theTable, u_int32_t numElem, ++ u_int16_t character) ++{ ++ const unicode_mappings32 *p, *q, *divider; ++ ++ if ((character < theTable[0]._key) || (character > theTable[numElem-1]._key)) ++ return (0); ++ ++ p = theTable; ++ q = p + (numElem-1); ++ while (p <= q) { ++ divider = p + ((q - p) >> 1); /* divide by 2 */ ++ if (character < divider->_key) { q = divider - 1; } ++ else if (character > divider->_key) { p = divider + 1; } ++ else { return (divider->_value); } ++ } ++ return (0); ++} ++ ++#define RECURSIVE_DECOMPOSITION (1 << 15) ++#define EXTRACT_COUNT(value) (((value) >> 12) & 0x0007) ++ ++typedef struct { ++ u_int16_t _key; ++ u_int16_t _value; ++} unicode_mappings16; ++ ++static inline u_int16_t ++getmappedvalue16(const unicode_mappings16 *theTable, u_int32_t numElem, ++ u_int16_t character) ++{ ++ const unicode_mappings16 *p, *q, *divider; ++ ++ if ((character < theTable[0]._key) || (character > theTable[numElem-1]._key)) ++ return (0); ++ ++ p = theTable; ++ q = p + (numElem-1); ++ while (p <= q) { ++ divider = p + ((q - p) >> 1); /* divide by 2 */ ++ if (character < divider->_key) ++ q = divider - 1; ++ else if (character > divider->_key) ++ p = divider + 1; ++ else ++ return (divider->_value); ++ } ++ return (0); ++} ++ ++ ++static u_int32_t ++unicode_recursive_decompose(u_int16_t character, u_int16_t *convertedChars) ++{ ++ u_int16_t value; ++ u_int32_t length; ++ u_int16_t firstChar; ++ u_int16_t theChar; ++ const u_int16_t *bmpMappings; ++ u_int32_t usedLength; ++ ++ value = getmappedvalue16( ++ (const unicode_mappings16 *)__CFUniCharDecompositionTable, ++ __UniCharDecompositionTableLength, character); ++ length = EXTRACT_COUNT(value); ++ firstChar = value & 0x0FFF; ++ theChar = firstChar; ++ bmpMappings = (length == 1 ? &theChar : __CFUniCharMultipleDecompositionTable + firstChar); ++ usedLength = 0; ++ ++ if (value & RECURSIVE_DECOMPOSITION) { ++ usedLength = unicode_recursive_decompose((u_int16_t)*bmpMappings, convertedChars); ++ ++ --length; /* Decrement for the first char */ ++ if (!usedLength) ++ return 0; ++ ++bmpMappings; ++ convertedChars += usedLength; ++ } ++ ++ usedLength += length; ++ ++ while (length--) ++ *(convertedChars++) = *(bmpMappings++); ++ ++ return (usedLength); ++} ++ ++#define HANGUL_SBASE 0xAC00 ++#define HANGUL_LBASE 0x1100 ++#define HANGUL_VBASE 0x1161 ++#define HANGUL_TBASE 0x11A7 ++ ++#define HANGUL_SCOUNT 11172 ++#define HANGUL_LCOUNT 19 ++#define HANGUL_VCOUNT 21 ++#define HANGUL_TCOUNT 28 ++#define HANGUL_NCOUNT (HANGUL_VCOUNT * HANGUL_TCOUNT) ++ ++/* ++ * unicode_decompose - decompose a composed Unicode char ++ * ++ * Composed Unicode characters are forbidden on ++ * HFS Plus volumes. ucs_decompose will convert a ++ * composed character into its correct decomposed ++ * sequence. ++ * ++ * Similar to CFUniCharDecomposeCharacter ++ */ ++static int ++unicode_decompose(u_int16_t character, u_int16_t *convertedChars) ++{ ++ if ((character >= HANGUL_SBASE) && ++ (character <= (HANGUL_SBASE + HANGUL_SCOUNT))) { ++ u_int32_t length; ++ ++ character -= HANGUL_SBASE; ++ length = (character % HANGUL_TCOUNT ? 3 : 2); ++ ++ *(convertedChars++) = ++ character / HANGUL_NCOUNT + HANGUL_LBASE; ++ *(convertedChars++) = ++ (character % HANGUL_NCOUNT) / HANGUL_TCOUNT + HANGUL_VBASE; ++ if (length > 2) ++ *convertedChars = (character % HANGUL_TCOUNT) + HANGUL_TBASE; ++ return (length); ++ } else { ++ return (unicode_recursive_decompose(character, convertedChars)); ++ } ++} ++ ++/* ++ * unicode_combine - generate a precomposed Unicode char ++ * ++ * Precomposed Unicode characters are required for some volume ++ * formats and network protocols. unicode_combine will combine ++ * a decomposed character sequence into a single precomposed ++ * (composite) character. ++ * ++ * Similar toCFUniCharPrecomposeCharacter but unicode_combine ++ * also handles Hangul Jamo characters. ++ */ ++static u_int16_t ++unicode_combine(u_int16_t base, u_int16_t combining) ++{ ++ u_int32_t value; ++ ++ /* Check HANGUL */ ++ if ((combining >= HANGUL_VBASE) && (combining < (HANGUL_TBASE + HANGUL_TCOUNT))) { ++ /* 2 char Hangul sequences */ ++ if ((combining < (HANGUL_VBASE + HANGUL_VCOUNT)) && ++ (base >= HANGUL_LBASE && base < (HANGUL_LBASE + HANGUL_LCOUNT))) { ++ return (HANGUL_SBASE + ++ ((base - HANGUL_LBASE)*(HANGUL_VCOUNT*HANGUL_TCOUNT)) + ++ ((combining - HANGUL_VBASE)*HANGUL_TCOUNT)); ++ } ++ ++ /* 3 char Hangul sequences */ ++ if ((combining > HANGUL_TBASE) && ++ (base >= HANGUL_SBASE && base < (HANGUL_SBASE + HANGUL_SCOUNT))) { ++ if ((base - HANGUL_SBASE) % HANGUL_TCOUNT) ++ return (0); ++ else ++ return (base + (combining - HANGUL_TBASE)); ++ } ++ } ++ ++ value = getmappedvalue32( ++ (const unicode_mappings32 *)__CFUniCharPrecompSourceTable, ++ __CFUniCharPrecompositionTableLength, combining); ++ ++ if (value) { ++ value = getmappedvalue16( ++ (const unicode_mappings16 *) ++ ((u_int32_t *)__CFUniCharBMPPrecompDestinationTable + (value & 0xFFFF)), ++ (value >> 16), base); ++ } ++ return (value); ++} ++ ++static int ++utf8mac_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) ++{ ++ u_int16_t ucsp[13]; ++ size_t ucslen = 0, consumed = 0; ++ int ret; ++ int flags; ++ ++ bzero(&ucsp, sizeof(ucsp)); ++ *pwc = 0; ++ flags = UTF_PRECOMPOSED; ++ ++#ifdef __LITTLE_ENDIAN__ ++ flags |= UTF_REVERSE_ENDIAN; ++#endif ++ ++ ret = utf8_decodestr(s, n, ucsp, &ucslen, sizeof(ucsp), 0, flags, &consumed); ++ ++ if (ret == ENAMETOOLONG) /* Name didn't fit; only ucslen chars were decoded */ ++ return RET_TOOFEW(0); ++ ++ if ( ret == EINVAL) /* Illegal UTF-8 sequence found */ ++ return RET_ILSEQ; ++ ++ if((ret = ucs2_mbtowc(conv, pwc, (const unsigned char *) ucsp, ucslen)) < 0) ++ return ret; ++ ++ return consumed; ++} ++ ++static int ++utf8mac_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) /* n == 0 is acceptable */ ++{ ++ int ret; ++ size_t len; ++ u_int16_t ucs_string[13]; ++ int flags; ++ ++ if((ret = ucs2_wctomb(conv, (unsigned char *) ucs_string, wc, sizeof(ucs_string))) < 0) ++ return ret; ++ ++ flags = UTF_NO_NULL_TERM | UTF_DECOMPOSED; ++#ifdef __LITTLE_ENDIAN__ ++ flags |= UTF_REVERSE_ENDIAN; ++#endif ++ utf8_encodestr(ucs_string, ret, r, &len, n, 0, flags); ++ ++ return len; ++} +-- +2.40.1 + diff --git a/depends/common/iconv/0002-src-Makefile.in-darwin.patch b/depends/common/iconv/0002-src-Makefile.in-darwin.patch new file mode 100644 index 00000000..50f8f558 --- /dev/null +++ b/depends/common/iconv/0002-src-Makefile.in-darwin.patch @@ -0,0 +1,24 @@ +From adfa84dd83f2f2060ee2ebf321c551b2c5d84862 Mon Sep 17 00:00:00 2001 +From: Alwin Esch +Date: Sun, 28 May 2023 23:44:50 +0200 +Subject: [PATCH 2/2] src-Makefile.in-darwin + +--- + src/Makefile.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 7035316..59d9013 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -113,6 +113,7 @@ install : all force + if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi + case "@host_os@" in \ + hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \ ++ darwin*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ + *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \ + esac + $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT) +-- +2.40.1 + diff --git a/depends/common/iconv/CMakeLists.txt b/depends/common/iconv/CMakeLists.txt new file mode 100644 index 00000000..7eccf61b --- /dev/null +++ b/depends/common/iconv/CMakeLists.txt @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 3.5) +project(iconv) + +include(ExternalProject) +externalproject_add(iconv + SOURCE_DIR ${CMAKE_SOURCE_DIR} + CONFIGURE_COMMAND ./configure + --prefix=${OUTPUT_DIR} + --without-libiconv-prefix + --without-libintl-prefix + --disable-debug + --disable-shared + --disable-dependency-tracking + --disable-nls + --enable-extra-encodings + --enable-static + --with-pic + BUILD_COMMAND make + INSTALL_COMMAND "" + BUILD_IN_SOURCE 1) + +install(CODE "execute_process(COMMAND make install-lib WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") diff --git a/depends/common/iconv/iconv.sha256 b/depends/common/iconv/iconv.sha256 new file mode 100644 index 00000000..d33829df --- /dev/null +++ b/depends/common/iconv/iconv.sha256 @@ -0,0 +1 @@ +8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313 diff --git a/depends/common/iconv/iconv.txt b/depends/common/iconv/iconv.txt new file mode 100644 index 00000000..956bb883 --- /dev/null +++ b/depends/common/iconv/iconv.txt @@ -0,0 +1 @@ +iconv https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz diff --git a/depends/common/iconv/platforms.txt b/depends/common/iconv/platforms.txt new file mode 100644 index 00000000..730d984f --- /dev/null +++ b/depends/common/iconv/platforms.txt @@ -0,0 +1 @@ +!darwin_embedded !osx diff --git a/depends/common/libpng/0001-disable-neon-arm-apple.patch b/depends/common/libpng/0001-disable-neon-arm-apple.patch index 5194268f..7f8fe3bb 100644 --- a/depends/common/libpng/0001-disable-neon-arm-apple.patch +++ b/depends/common/libpng/0001-disable-neon-arm-apple.patch @@ -1,11 +1,14 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -79,6 +79,8 @@ - if(index EQUAL -1) - message(FATAL_ERROR - "PNG_ARM_NEON must be one of [${PNG_ARM_NEON_POSSIBLE_VALUES}]") -+ elseif(APPLE) -+ add_definitions(-DPNG_ARM_NEON_OPT=0) - elseif(NOT ${PNG_ARM_NEON} STREQUAL "off") - set(libpng_arm_sources - arm/arm_init.c +@@ -92,8 +92,9 @@ + # Set definitions and sources for ARM. + if(TARGET_ARCH MATCHES "^arm" OR + TARGET_ARCH MATCHES "^aarch64") +- if(TARGET_ARCH MATCHES "^arm64" OR +- TARGET_ARCH MATCHES "^aarch64") ++ if(NOT APPLE AND ++ (TARGET_ARCH MATCHES "^arm64" OR ++ TARGET_ARCH MATCHES "^aarch64")) + set(PNG_ARM_NEON_POSSIBLE_VALUES on off) + set(PNG_ARM_NEON "on" + CACHE STRING "Enable ARM NEON optimizations: on|off; on is default") diff --git a/depends/common/libpng/0002-fix-cmake-install.patch b/depends/common/libpng/0002-fix-cmake-install.patch new file mode 100644 index 00000000..d097a4ac --- /dev/null +++ b/depends/common/libpng/0002-fix-cmake-install.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1033,7 +1033,7 @@ + # Create an export file that CMake users can include() to import our targets. + if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL) + install(EXPORT libpng +- DESTINATION lib/libpng ++ DESTINATION lib/cmake/libpng + FILE lib${PNG_LIB_NAME}.cmake) + endif() diff --git a/depends/common/libpng/0002-fix-compile-if-libm-not-found.patch b/depends/common/libpng/0002-fix-compile-if-libm-not-found.patch deleted file mode 100644 index 18ba4264..00000000 --- a/depends/common/libpng/0002-fix-compile-if-libm-not-found.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -45,6 +45,9 @@ endif() - - if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) - find_library(M_LIBRARY m) -+ if(NOT M_LIBRARY) -+ set(M_LIBRARY "") -+ endif() - else() - # libm is not needed and/or not available - set(M_LIBRARY "") - diff --git a/depends/common/libpng/flags.txt b/depends/common/libpng/flags.txt index eaaf12f9..1b884f2e 100644 --- a/depends/common/libpng/flags.txt +++ b/depends/common/libpng/flags.txt @@ -1 +1 @@ --DBUILD_SHARED_LIBS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=1 -DPNG_SHARED=0 +-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DPNG_SHARED=OFF -DPNG_TESTS=OFF -DPNG_EXECUTABLES=OFF diff --git a/depends/common/libpng/libpng.sha256 b/depends/common/libpng/libpng.sha256 index bc0183bb..9f3e131b 100644 --- a/depends/common/libpng/libpng.sha256 +++ b/depends/common/libpng/libpng.sha256 @@ -1 +1 @@ -505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca +a00e9d2f2f664186e4202db9299397f851aea71b36a35e74910b8820e380d441 \ No newline at end of file diff --git a/depends/common/libpng/libpng.txt b/depends/common/libpng/libpng.txt index bfb4f65a..433aa143 100644 --- a/depends/common/libpng/libpng.txt +++ b/depends/common/libpng/libpng.txt @@ -1 +1 @@ -libpng http://mirrors.kodi.tv/build-deps/sources/libpng-1.6.37.tar.xz \ No newline at end of file +libpng https://github.com/glennrp/libpng/archive/refs/tags/v1.6.39.tar.gz diff --git a/depends/common/libxml2/0001-check-about-readline-lib-also-presence-of-header.patch b/depends/common/libxml2/0001-check-about-readline-lib-also-presence-of-header.patch new file mode 100644 index 00000000..b4609ee4 --- /dev/null +++ b/depends/common/libxml2/0001-check-about-readline-lib-also-presence-of-header.patch @@ -0,0 +1,14 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -151,7 +151,10 @@ if (NOT MSVC) + check_include_files(inttypes.h HAVE_INTTYPES_H) + check_function_exists(isascii HAVE_ISASCII) + check_library_exists(history append_history "" HAVE_LIBHISTORY) +- check_library_exists(readline readline "" HAVE_LIBREADLINE) ++ check_library_exists(readline readline "" HAVE_LIBREADLINE_LIB) ++ if (HAVE_LIBREADLINE_LIB) ++ check_include_files(readline/readline.h HAVE_LIBREADLINE) ++ endif() + check_function_exists(mmap HAVE_MMAP) + check_function_exists(munmap HAVE_MUNMAP) + check_include_files(netdb.h HAVE_NETDB_H) diff --git a/depends/common/libxml2/0002-disable-docs.patch b/depends/common/libxml2/0002-disable-docs.patch new file mode 100644 index 00000000..564959b7 --- /dev/null +++ b/depends/common/libxml2/0002-disable-docs.patch @@ -0,0 +1,19 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -574,16 +574,6 @@ if(LIBXML2_WITH_PYTHON) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2.py DESTINATION ${LIBXML2_PYTHON_INSTALL_DIR} COMPONENT runtime) + endif() + +-install(FILES doc/xml2-config.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) +-install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) +-install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) +-install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT documentation +- PATTERN "Makefile.*" EXCLUDE +- PATTERN "*.1" EXCLUDE +- PATTERN "*.py" EXCLUDE +- PATTERN "*.res" EXCLUDE +- PATTERN "*.xml" EXCLUDE +- PATTERN "*.xsl" EXCLUDE) + + configure_package_config_file( + libxml2-config.cmake.cmake.in libxml2-config.cmake diff --git a/depends/common/libxml2/0003-fix_cmakelist.patch b/depends/common/libxml2/0003-fix_cmakelist.patch new file mode 100644 index 00000000..9bc32ce1 --- /dev/null +++ b/depends/common/libxml2/0003-fix_cmakelist.patch @@ -0,0 +1,106 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -396,15 +396,15 @@ endif() + if(LIBXML2_WITH_ICU) + target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc) + if(WIN32) +- set(ICU_LIBS "-licudt -licuin -licuuc") ++ set(ICU_LIBS "icu-i18n") + else() +- set(ICU_LIBS "-licudata -licui18n -licuuc") ++ set(ICU_LIBS "icu-i18n") + endif() + endif() + + if(LIBXML2_WITH_LZMA) + target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA) +- set(LZMA_LIBS "-llzma") ++ set(LZMA_LIBS "liblzma") + endif() + + if(LIBXML2_WITH_THREADS) +@@ -414,7 +414,7 @@ endif() + + if(LIBXML2_WITH_ZLIB) + target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB) +- set(Z_LIBS "-lz") ++ set(Z_LIBS "zlib") + endif() + + set_target_properties( +@@ -428,23 +428,11 @@ set_target_properties( + SOVERSION ${LIBXML_MAJOR_VERSION} + ) + ++set(XML_LIB_NAME xml2) + if(MSVC) +- if(BUILD_SHARED_LIBS) +- set_target_properties( +- LibXml2 +- PROPERTIES +- DEBUG_POSTFIX d +- ) +- else() +- set_target_properties( +- LibXml2 +- PROPERTIES +- DEBUG_POSTFIX sd +- MINSIZEREL_POSTFIX s +- RELEASE_POSTFIX s +- RELWITHDEBINFO_POSTFIX s +- ) +- endif() ++ add_definitions(-D_CRT_SECURE_NO_DEPRECATE) ++ add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) ++ set(XML_LIB_NAME libxml2) + endif() + + install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) +@@ -577,30 +565,30 @@ endif() + + configure_package_config_file( + libxml2-config.cmake.cmake.in libxml2-config.cmake +- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + ) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + COMPONENT development + ) + + write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake + VERSION ${PROJECT_VERSION} +- COMPATIBILITY ExactVersion ++ COMPATIBILITY SameMinorVersion + ) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + COMPONENT development + ) + + install( + EXPORT LibXml2 +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + NAMESPACE LibXml2:: + FILE libxml2-export.cmake + COMPONENT development +--- a/libxml-2.0.pc.in ++++ b/libxml-2.0.pc.in +@@ -8,6 +8,7 @@ Name: libXML + Version: @VERSION@ + Description: libXML library version2. + Requires: +-Libs: -L${libdir} @XML_LIBS@ +-Libs.private: @XML_PRIVATE_LIBS@ @LIBS@ ++Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@ ++Libs: -L${libdir} -l@XML_LIB_NAME@ ++Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @LIBM@ @WIN32_EXTRA_LIBADD@ @LIBS@ + Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ diff --git a/depends/common/libxml2/CMakeLists.txt b/depends/common/libxml2/CMakeLists.txt deleted file mode 100644 index d3121b44..00000000 --- a/depends/common/libxml2/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -project(libxml2) - -cmake_minimum_required(VERSION 3.5) - -list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) - -if (APPLE) - # For some reason libxml2 requires this flag or it will create an insane amout of log output on compile - list(APPEND libxml2_conf CFLAGS=-Wno-nullability-completeness) -endif() -list(APPEND libxml2_conf CPPFLAGS=-I${CMAKE_INSTALL_PREFIX}/include) -list(APPEND libxml2_conf LDFLAGS=-L${CMAKE_INSTALL_PREFIX}/lib) - -include(ExternalProject) -externalproject_add(libxml2 - SOURCE_DIR ${CMAKE_SOURCE_DIR} - CONFIGURE_COMMAND /configure - --prefix=${CMAKE_INSTALL_PREFIX} - --without-python - --without-iconv - --without-http - --without-ftp - --without-catalog - --without-modules - --disable-shared - --with-pic - ${libxml2_conf}) - -externalproject_add_step(libxml2 - RunSedCommand - COMMAND echo "Removing executable from makefile.in using BBB sed ${CMAKE_CURRENT_SOURCE_DIR}" - COMMAND bash -c "sed -ie 's|runtest$(EXEEXT)||' ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.in" - COMMAND bash -c "sed -ie 's|testrecurse$(EXEEXT)||' ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.in" - DEPENDERS configure) - -install(CODE "Message(Done)") diff --git a/depends/common/libxml2/darwin_embedded-deps.txt b/depends/common/libxml2/darwin_embedded-deps.txt new file mode 100644 index 00000000..225c7a07 --- /dev/null +++ b/depends/common/libxml2/darwin_embedded-deps.txt @@ -0,0 +1,2 @@ +xz-utils +zlib diff --git a/depends/common/libxml2/deps.txt b/depends/common/libxml2/deps.txt index f22003e8..37c5c074 100644 --- a/depends/common/libxml2/deps.txt +++ b/depends/common/libxml2/deps.txt @@ -1 +1,3 @@ +iconv +xz-utils zlib diff --git a/depends/common/libxml2/flags.txt b/depends/common/libxml2/flags.txt new file mode 100644 index 00000000..47daa983 --- /dev/null +++ b/depends/common/libxml2/flags.txt @@ -0,0 +1 @@ +-DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ICONV=OFF -DLIBXML2_WITH_HTTP=OFF -DLIBXML2_WITH_FTP=OFF -DLIBXML2_WITH_CATALOG=OFF -DLIBXML2_WITH_MODULES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_TESTS=OFF -DLIBXML2_WITH_PROGRAMS=OFF $<$:-DLIBXML2_WITH_LZMA=OFF> diff --git a/depends/common/libxml2/libxml2.sha256 b/depends/common/libxml2/libxml2.sha256 index 98a6d4b1..1e989249 100644 --- a/depends/common/libxml2/libxml2.sha256 +++ b/depends/common/libxml2/libxml2.sha256 @@ -1 +1 @@ -aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f +2fd59eccfe277f7b7dec8836254acbebd24af33857a018dd64ddcf92d88d7f7e \ No newline at end of file diff --git a/depends/common/libxml2/libxml2.txt b/depends/common/libxml2/libxml2.txt index 61551cc0..9a3bfedf 100644 --- a/depends/common/libxml2/libxml2.txt +++ b/depends/common/libxml2/libxml2.txt @@ -1 +1 @@ -libxml2 http://xmlsoft.org/sources/libxml2-2.9.10.tar.gz +libxml2 https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.4.tar.gz diff --git a/depends/common/libxml2/osx-deps.txt b/depends/common/libxml2/osx-deps.txt new file mode 100644 index 00000000..225c7a07 --- /dev/null +++ b/depends/common/libxml2/osx-deps.txt @@ -0,0 +1,2 @@ +xz-utils +zlib diff --git a/depends/common/nettle/02-conftest_exit.patch b/depends/common/nettle/02-conftest_exit.patch deleted file mode 100644 index 96183ab3..00000000 --- a/depends/common/nettle/02-conftest_exit.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -369,7 +369,7 @@ - int - main () - { -- exit(0); -+ return 0; - } - EOF - gmp_compile="$1 conftest.c" -@@ -410,7 +410,7 @@ - int - main () - { -- exit (0); -+ return 0; - } - EOF - for i in .exe ,ff8 ""; do - - ---- a/configure -+++ b/configure -@@ -4640,7 +4640,7 @@ - int - main () - { -- exit(0); -+ return 0; - } - EOF - gmp_compile="$CC_FOR_BUILD conftest.c" -@@ -4672,7 +4672,7 @@ - int - main () - { -- exit(0); -+ return 0; - } - EOF - gmp_compile="$HOST_CC conftest.c" -@@ -4708,7 +4708,7 @@ - int - main () - { -- exit(0); -+ return 0; - } - EOF - gmp_compile="$i conftest.c" -@@ -4758,7 +4758,7 @@ - int - main () - { -- exit (0); -+ return 0; - } - EOF - for i in .exe ,ff8 ""; do - diff --git a/depends/common/nettle/nettle.sha256 b/depends/common/nettle/nettle.sha256 index 84b0dc41..7e238823 100644 --- a/depends/common/nettle/nettle.sha256 +++ b/depends/common/nettle/nettle.sha256 @@ -1 +1 @@ -d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1 +0ee7adf5a7201610bb7fe0acbb7c9b3be83be44904dd35ebbcd965cd896bfeaa \ No newline at end of file diff --git a/depends/common/nettle/nettle.txt b/depends/common/nettle/nettle.txt index 2c7e376d..5919884b 100644 --- a/depends/common/nettle/nettle.txt +++ b/depends/common/nettle/nettle.txt @@ -1 +1 @@ -nettle https://ftp.gnu.org/gnu/nettle/nettle-3.6.tar.gz +nettle https://ftp.gnu.org/gnu/nettle/nettle-3.9.tar.gz diff --git a/depends/common/xz-utils/01-enable-uwp-builds.patch b/depends/common/xz-utils/01-enable-uwp-builds.patch new file mode 100644 index 00000000..9b53765f --- /dev/null +++ b/depends/common/xz-utils/01-enable-uwp-builds.patch @@ -0,0 +1,24 @@ +--- a/src/common/tuklib_physmem.c ++++ b/src/common/tuklib_physmem.c +@@ -79,6 +79,13 @@ tuklib_physmem(void) + uint64_t ret = 0; + + #if defined(_WIN32) || defined(__CYGWIN__) ++#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) ++ MEMORYSTATUSEX ms; ++ ms.dwLength = sizeof(ms); ++ if(!GlobalMemoryStatusEx(&ms)) ++ return 0; ++ return ms.ullTotalPhys; ++#else + if ((GetVersion() & 0xFF) >= 5) { + // Windows 2000 and later have GlobalMemoryStatusEx() which + // supports reporting values greater than 4 GiB. To keep the +@@ -107,6 +114,7 @@ tuklib_physmem(void) + GlobalMemoryStatus(&meminfo); + ret = meminfo.dwTotalPhys; + } ++#endif + + #elif defined(__OS2__) + unsigned long mem; diff --git a/depends/common/xz-utils/CMakeLists.txt b/depends/common/xz-utils/CMakeLists.txt deleted file mode 100644 index 2ed00c7b..00000000 --- a/depends/common/xz-utils/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(xz-utils) - -include(ExternalProject) -externalproject_add(xz-utils - SOURCE_DIR ${CMAKE_SOURCE_DIR} - CONFIGURE_COMMAND /configure - --prefix=${OUTPUT_DIR} - --enable-static - --disable-shared - --disable-doc - --with-pic - ${EXTRA_CFLAGS} - INSTALL_COMMAND "" - BUILD_IN_SOURCE 1) - -install(CODE "execute_process(COMMAND make install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") diff --git a/depends/common/xz-utils/flags.txt b/depends/common/xz-utils/flags.txt new file mode 100644 index 00000000..cf8e15c3 --- /dev/null +++ b/depends/common/xz-utils/flags.txt @@ -0,0 +1 @@ +-DBUILD_TESTING=OFF -DCREATE_XZ_SYMLINKS=OFF -DCREATE_LZMA_SYMLINKS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ No newline at end of file diff --git a/depends/common/xz-utils/xz-utils.sha256 b/depends/common/xz-utils/xz-utils.sha256 index ddd8e80e..1c431a1d 100644 --- a/depends/common/xz-utils/xz-utils.sha256 +++ b/depends/common/xz-utils/xz-utils.sha256 @@ -1 +1 @@ -9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b +92177bef62c3824b4badc524f8abcce54a20b7dbcfb84cde0a2eb8b49159518c \ No newline at end of file diff --git a/depends/common/xz-utils/xz-utils.txt b/depends/common/xz-utils/xz-utils.txt index 27f957f9..3893cb4c 100644 --- a/depends/common/xz-utils/xz-utils.txt +++ b/depends/common/xz-utils/xz-utils.txt @@ -1 +1 @@ -xz-utils https://tukaani.org/xz/xz-5.2.4.tar.xz +xz-utils https://tukaani.org/xz/xz-5.4.3.tar.xz diff --git a/depends/common/zlib/01-build-static.patch b/depends/common/zlib/01-build-static.patch index 8cc3cfc3..7ae95b94 100644 --- a/depends/common/zlib/01-build-static.patch +++ b/depends/common/zlib/01-build-static.patch @@ -1,14 +1,14 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -183,10 +183,11 @@ +@@ -147,10 +147,11 @@ set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) endif(MINGW) --add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) --add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) -set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) -set_target_properties(zlib PROPERTIES SOVERSION 1) -+add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) ++add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +if(BUILD_SHARED_LIBS) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) + set_target_properties(zlib PROPERTIES SOVERSION 1) @@ -16,7 +16,7 @@ if(NOT CYGWIN) # This property causes shared libraries on Linux to have the full version -@@ -201,7 +202,7 @@ +@@ -165,7 +166,7 @@ if(UNIX) # On unix-like platforms the library is almost always called libz @@ -25,7 +25,7 @@ if(NOT APPLE) set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") endif() -@@ -211,7 +212,7 @@ +@@ -175,7 +176,7 @@ endif() if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) diff --git a/depends/common/zlib/zlib.sha256 b/depends/common/zlib/zlib.sha256 index ec1ba07f..d765328c 100644 --- a/depends/common/zlib/zlib.sha256 +++ b/depends/common/zlib/zlib.sha256 @@ -1 +1 @@ -c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 +d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 \ No newline at end of file diff --git a/depends/common/zlib/zlib.txt b/depends/common/zlib/zlib.txt index 4bf36450..1c345b9a 100644 --- a/depends/common/zlib/zlib.txt +++ b/depends/common/zlib/zlib.txt @@ -1 +1 @@ -zlib http://mirrors.kodi.tv/build-deps/sources/zlib-1.2.11.tar.gz +zlib http://mirrors.kodi.tv/build-deps/sources/zlib-1.2.13.tar.xz diff --git a/depends/windows/libxml2/CMakeLists.txt b/depends/windows/libxml2/CMakeLists.txt deleted file mode 100644 index 72f20bc4..00000000 --- a/depends/windows/libxml2/CMakeLists.txt +++ /dev/null @@ -1,454 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(xml2) - -enable_language(C) - -find_package(ZLIB REQUIRED) -list(APPEND CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIRS}) - -if(NOT WIN32) - include(CheckIncludeFile) - include(CheckFunctionExists) - include(CheckStructHasMember) - include(CheckSymbolExists) - - file(READ config.h.in FILE_CONTENT) - string(REPLACE "#undef" "#cmakedefine" MODIFIED_FILE_CONTENT "${FILE_CONTENT}") - file(WRITE config.h.cmake "${MODIFIED_FILE_CONTENT}") - - #/* Type cast for the gethostbyname() argument */ - #undef GETHOSTBYNAME_ARG_CAST - - #/* Define to 1 if you have the header file. */ - check_include_file(ansidecl.h HAVE_ANSIDECL_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(arpa/inet.h HAVE_ARPA_INET_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(arpa/nameser.h HAVE_ARPA_NAMESER_H) - - #/* Whether struct sockaddr::__ss_family exists */ - check_struct_has_member("struct sockaddr" __ss_family sys/socket.h HAVE_BROKEN_SS_FAMILY) - - #/* Define to 1 if you have the `class' function. */ - check_function_exists(class HAVE_CLASS) - - #/* Define to 1 if you have the header file. */ - check_include_file(ctype.h HAVE_CTYPE_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(dirent.h HAVE_DIRENT_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(dlfcn.h HAVE_DLFCN_H) - - #/* Have dlopen based dso */ - #undef HAVE_DLOPEN - - #/* Define to 1 if you have the header file. */ - check_include_file(dl.h HAVE_DL_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(errno.h HAVE_ERRNO_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(fcntl.h HAVE_FCNTL_H) - - #/* Define to 1 if you have the `finite' function. */ - check_function_exists(finite HAVE_FINITE) - - #/* Define to 1 if you have the header file. */ - check_include_file(float.h HAVE_FLOAT_H) - - #/* Define to 1 if you have the `fpclass' function. */ - check_function_exists(fpclass HAVE_FPCLASS) - - #/* Define to 1 if you have the `fprintf' function. */ - check_function_exists(fprintf HAVE_FPRINTF) - - #/* Define to 1 if you have the `fp_class' function. */ - check_function_exists(fp_class HAVE_FP_CLASS) - - #/* Define to 1 if you have the header file. */ - check_include_file(fp_class.h HAVE_FP_CLASS_H) - - #/* Define to 1 if you have the `ftime' function. */ - check_function_exists(ftime HAVE_FTIME) - - #/* Define if getaddrinfo is there */ - check_function_exists(getaddrinfo HAVE_GETADDRINFO) - - #/* Define to 1 if you have the `gettimeofday' function. */ - check_function_exists(gettimeofday HAVE_GETTIMEOFDAY) - - #/* Define to 1 if you have the header file. */ - check_include_file(ieeefp.h HAVE_IEEEFP_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(inttypes.h HAVE_INTTYPES_H) - - #/* Define to 1 if you have the `isascii' function. */ - check_function_exists(isascii HAVE_ISASCII) - - #/* Define if isinf is there */ - check_function_exists(isinf HAVE_ISINF) - - #/* Define if isnan is there */ - check_function_exists(isnan HAVE_ISNAN) - - #/* Define to 1 if you have the `isnand' function. */ - check_function_exists(isnand HAVE_ISNAND) - - #/* Define if history library is there (-lhistory) */ - #undef HAVE_LIBHISTORY - - #/* Have compression library */ - #undef HAVE_LIBLZMA - - #/* Define if pthread library is there (-lpthread) */ - #undef HAVE_LIBPTHREAD - - #/* Define if readline library is there (-lreadline) */ - #undef HAVE_LIBREADLINE - - #/* Have compression library */ - #undef HAVE_LIBZ - - #/* Define to 1 if you have the header file. */ - check_include_file(limits.h HAVE_LIMITS_H) - - #/* Define to 1 if you have the `localtime' function. */ - check_function_exists(localtime HAVE_LOCALTIME) - - #/* Define to 1 if you have the header file. */ - check_include_file(lzma.h HAVE_LZMA_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(malloc.h HAVE_MALLOC_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(math.h HAVE_MATH_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(memory.h HAVE_MEMORY_H) - - #/* Define to 1 if you have the `mmap' function. */ - check_function_exists(mmap HAVE_MMAP) - - #/* Define to 1 if you have the `munmap' function. */ - check_function_exists(munmap HAVE_MUNMAP) - - #/* mmap() is no good without munmap() */ - #if defined(HAVE_MMAP) && !defined(HAVE_MUNMAP) - # undef /**/ HAVE_MMAP - #endif - - #/* Define to 1 if you have the header file. */ - check_include_file(nan.h HAVE_NAN_H) - - #/* Define to 1 if you have the header file, and it defines `DIR'. */ - check_include_file(ndir.h HAVE_NDIR_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(netdb.h HAVE_NETDB_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(netinet/in.h HAVE_NETINET_IN_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(poll.h HAVE_POLL_H) - - #/* Define to 1 if you have the `printf' function. */ - check_function_exists(printf HAVE_PRINTF) - - #/* Define if is there */ - #undef HAVE_PTHREAD_H - - #/* Define to 1 if you have the `putenv' function. */ - check_function_exists(putenv HAVE_PUTENV) - - #/* Define to 1 if you have the `rand' function. */ - check_function_exists(rand HAVE_RAND) - - #/* Define to 1 if you have the `rand_r' function. */ - check_function_exists(rand_r HAVE_RAND_R) - - #/* Define to 1 if you have the header file. */ - check_include_file(resolv.h HAVE_RESOLV_H) - - #/* Have shl_load based dso */ - #undef HAVE_SHLLOAD - - #/* Define to 1 if you have the `signal' function. */ - check_function_exists(signal HAVE_SIGNAL) - - #/* Define to 1 if you have the header file. */ - check_include_file(signal.h HAVE_SIGNAL_H) - - #/* Define to 1 if you have the `snprintf' function. */ - #check_function_exists(snprintf HAVE_SNPRINTF) - check_symbol_exists(snprintf stdio.h HAVE_SNPRINTF) - - #/* Define to 1 if you have the `sprintf' function. */ - check_function_exists(sprintf HAVE_SPRINTF) - - #/* Define to 1 if you have the `srand' function. */ - check_function_exists(srand HAVE_SRAND) - - #/* Define to 1 if you have the `sscanf' function. */ - check_function_exists(sscanf HAVE_SSCANF) - - #/* Define to 1 if you have the `stat' function. */ - check_function_exists(stat HAVE_STAT) - - #/* Define to 1 if you have the header file. */ - check_include_file(stdarg.h HAVE_STDARG_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(stdint.h HAVE_STDINT_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(stdlib.h HAVE_STDLIB_H) - - #/* Define to 1 if you have the `strdup' function. */ - check_function_exists(strdup HAVE_STRDUP) - - #/* Define to 1 if you have the `strerror' function. */ - check_function_exists(strerror HAVE_STRERROR) - - #/* Define to 1 if you have the `strftime' function. */ - check_function_exists(strftime HAVE_STRFTIME) - - #/* Define to 1 if you have the header file. */ - check_include_file(strings.h HAVE_STRINGS_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(string.h HAVE_STRING_H) - - #/* Define to 1 if you have the `strndup' function. */ - check_function_exists(strndup HAVE_STRNDUP) - - #/* Define to 1 if you have the header file, and it defines `DIR'. - # */ - check_include_file(sys/dir.h HAVE_SYS_DIR_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(sys/mman.h HAVE_SYS_MMAN_H) - - #/* Define to 1 if you have the header file, and it defines `DIR'. - # */ - check_include_file(sys/ndir.h HAVE_SYS_NDIR_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(sys/select.h HAVE_SYS_SELECT_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(sys/socket.h HAVE_SYS_SOCKET_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(sys/stat.h HAVE_SYS_STAT_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(sys/time.h HAVE_SYS_TIME_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(sys/types.h HAVE_SYS_TYPES_H) - - #/* Define to 1 if you have the `time' function. */ - check_function_exists(time HAVE_TIME) - - #/* Define to 1 if you have the header file. */ - check_include_file(time.h HAVE_TIME_H) - - #/* Define to 1 if you have the header file. */ - check_include_file(unistd.h HAVE_UNISTD_H) - - #/* Whether va_copy() is available */ - check_symbol_exists(va_copy stdarg.h HAVE_VA_COPY) - - #/* Define to 1 if you have the `vfprintf' function. */ - check_function_exists(vfprintf HAVE_VFPRINTF) - - #/* Define to 1 if you have the `vsnprintf' function. */ - check_function_exists(vsnprintf HAVE_VSNPRINTF) - - #/* Define to 1 if you have the `vsprintf' function. */ - check_function_exists(vsprintf HAVE_VSPRINTF) - - #/* Define to 1 if you have the header file. */ - check_include_file(zlib.h HAVE_ZLIB_H) - - #/* Define to 1 if you have the `_stat' function. */ - check_function_exists(_stat HAVE__STAT) - - #/* Whether __va_copy() is available */ - check_symbol_exists(__va_copy stdarg.h HAVE___VA_COPY) - - #/* Define as const if the declaration of iconv() needs const. */ - #undef ICONV_CONST - set(ICONV_CONST const) - - #/* Define to the sub-directory where libtool stores uninstalled libraries. */ - #undef LT_OBJDIR - - #/* Name of package */ - #undef PACKAGE - - #/* Define to the address where bug reports for this package should be sent. */ - #undef PACKAGE_BUGREPORT - - #/* Define to the full name of this package. */ - #undef PACKAGE_NAME - - #/* Define to the full name and version of this package. */ - #undef PACKAGE_STRING - - #/* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - - #/* Define to the home page for this package. */ - #undef PACKAGE_URL - - #/* Define to the version of this package. */ - #undef PACKAGE_VERSION - - #/* Type cast for the send() function 2nd arg */ - #undef SEND_ARG2_CAST - - #/* Define to 1 if you have the ANSI C header files. */ - #undef STDC_HEADERS - - #/* Support for IPv6 */ - #undef SUPPORT_IP6 - - #/* Define if va_list is an array type */ - check_c_source_compiles("#include \n int main() {va_list list1, list2; list1 = list2;}" NOT_VA_LIST_IS_ARRAY) - if(NOT NOT_VA_LIST_IS_ARRAY) - set(VA_LIST_IS_ARRAY 1) - endif() - - #/* Version number of package */ - #undef VERSION - - #/* Determine what socket length (socklen_t) data type is */ - #undef XML_SOCKLEN_T - - #/* Define for Solaris 2.5.1 so the uint32_t typedef from , - # , or is not used. If the typedef were allowed, the - #define below would cause a syntax error. */ - #undef _UINT32_T - - #/* Using the Win32 Socket implementation */ - #undef _WINSOCKAPI_ - - #/* ss_family is not defined here, use __ss_family instead */ - #undef ss_family - - #/* Define to the type of an unsigned integer type of width exactly 32 bits if - # such a type exists and the standard includes do not define it. */ - #undef uint32_t -endif() - -set(LIBXML_MAJOR_VERSION 2) -set(LIBXML_MINOR_VERSION 9) -set(LIBXML_MICRO_VERSION 3) -set(LIBXML_MICRO_VERSION_SUFFIX) -set(LIBXML_VERSION ${LIBXML_MAJOR_VERSION}.${LIBXML_MINOR_VERSION}.${LIBXML_MICRO_VERSION}${LIBXML_MICRO_VERSION_SUFFIX}) -math(EXPR LIBXML_VERSION_INFO "${LIBXML_MAJOR_VERSION} + ${LIBXML_MINOR_VERSION}") -set(LIBXML_VERSION_INFO ${LIBXML_VERSION_INFO}:${LIBXML_MICRO_VERSION}:${LIBXML_MINOR_VERSION}) -math(EXPR LIBXML_VERSION_NUMBER "${LIBXML_MAJOR_VERSION} * 10000 + ${LIBXML_MINOR_VERSION} * 100 + ${LIBXML_MICRO_VERSION}") -set(VERSION ${LIBXML_VERSION}) -set(LIBXML_VERSION_EXTRA) - -set(WITH_TRIO 0) -set(WITH_THREADS 0) -set(WITH_THREAD_ALLOC 0) -set(WITH_TREE 1) -set(WITH_OUTPUT 1) -set(WITH_PUSH 1) -set(WITH_READER 1) -set(WITH_PATTERN 0) -set(WITH_WRITER 0) -set(WITH_SAX1 0) -set(WITH_FTP 0) -set(WITH_HTTP 0) -set(WITH_VALID 0) -set(WITH_HTML 0) -set(WITH_LEGACY 0) -set(WITH_C14N 0) -set(WITH_CATALOG 0) -set(WITH_DOCB 0) -set(WITH_XPATH 0) -set(WITH_XPTR 0) -set(WITH_XINCLUDE 0) -set(WITH_ICONV 1) -set(WITH_ICU 0) -set(WITH_ISO8859X 1) -set(WITH_DEBUG 0) -set(WITH_MEM_DEBUG 0) -set(WITH_RUN_DEBUG 0) -set(WITH_REGEXPS 0) -set(WITH_SCHEMAS 0) -set(WITH_SCHEMATRON 0) -set(WITH_MODULES 0) -set(MODULE_EXTENSION 0) -set(WITH_ZLIB 1) -set(WITH_LZMA 0) - -if(NOT WIN32) - configure_file(config.h.cmake ${PROJECT_SOURCE_DIR}/config.h) -else() - file(COPY include/win32config.h DESTINATION ${PROJECT_SOURCE_DIR}) - file(COPY win32/VC10/config.h DESTINATION ${PROJECT_SOURCE_DIR}) -endif() - -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix "$") -set(exec_prefix "${exec_prefix}{") -set(exec_prefix "${exec_prefix}prefix") -set(exec_prefix "${exec_prefix}}") - -set(libdir "$") -set(libdir "${libdir}{") -set(libdir "${libdir}exec_prefix") -set(libdir "${libdir}}/lib") - -set(includedir "$") -set(includedir "${includedir}{") -set(includedir "${includedir}prefix") -set(includedir "${includedir}}/include") - -set(XML_INCLUDEDIR "-I$") -set(XML_INCLUDEDIR "${XML_INCLUDEDIR}{") -set(XML_INCLUDEDIR "${XML_INCLUDEDIR}includedir") -set(XML_INCLUDEDIR "${XML_INCLUDEDIR}}/libxml2") - -set(Z_LIBS "-lz") -set(ICONV_LIBS "-liconv") - -configure_file(include/libxml/xmlversion.h.in ${PROJECT_SOURCE_DIR}/include/libxml/xmlversion.h) -configure_file(libxml-2.0.pc.in ${PROJECT_SOURCE_DIR}/libxml-2.0.pc) - -include_directories(${ZLIB_INCLUDE_DIRS} include) -file(GLOB SOURCES *.c) - -file(GLOB SOURCES_EXCLUDE test*.c runsuite.c runtest.c runxmlconf.c trio*.c xmlcatalog.c) -list(REMOVE_ITEM SOURCES ${SOURCES_EXCLUDE}) - -add_library(xml2 STATIC ${SOURCES}) -target_link_libraries(xml2 ${ZLIB_LIBRARIES}) - -if(NOT WIN32) - set_target_properties(xml2 PROPERTIES COMPILE_FLAGS "-fPIC") -else() - add_definitions(-DHAVE_ZLIB_H -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) - set_target_properties(xml2 PROPERTIES COMPILE_FLAGS "/W1") -endif() - -install(TARGETS xml2 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) -install(DIRECTORY include/libxml DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libxml2/) -install(FILES libxml-2.0.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) diff --git a/depends/windows/libxml2/deps.txt b/depends/windows/libxml2/deps.txt deleted file mode 100644 index cdb85419..00000000 --- a/depends/windows/libxml2/deps.txt +++ /dev/null @@ -1,2 +0,0 @@ -iconv -zlib diff --git a/depends/windows/libxml2/libxml2.sha256 b/depends/windows/libxml2/libxml2.sha256 deleted file mode 100644 index 98a6d4b1..00000000 --- a/depends/windows/libxml2/libxml2.sha256 +++ /dev/null @@ -1 +0,0 @@ -aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f diff --git a/depends/windows/libxml2/libxml2.txt b/depends/windows/libxml2/libxml2.txt deleted file mode 100644 index 61551cc0..00000000 --- a/depends/windows/libxml2/libxml2.txt +++ /dev/null @@ -1 +0,0 @@ -libxml2 http://xmlsoft.org/sources/libxml2-2.9.10.tar.gz diff --git a/depends/windows/openssl/01-openssl.patch b/depends/windows/openssl/01-openssl.patch index 5ec13827..c09ae322 100644 --- a/depends/windows/openssl/01-openssl.patch +++ b/depends/windows/openssl/01-openssl.patch @@ -1,6 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000000..a92d7101fb --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,107 @@ @@ -111,196 +108,9 @@ index 0000000000..a92d7101fb + DESTINATION + lib/cmake/openssl +) -diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf -index 3c4299d264..c5915a8561 100644 ---- a/Configurations/10-main.conf -+++ b/Configurations/10-main.conf -@@ -1287,7 +1287,7 @@ my %targets = ( - }, - "VC-WIN64I" => { - inherit_from => [ "VC-WIN64-common", asm("ia64_asm"), -- sub { $disabled{shared} ? () : "ia64_uplink" } ], -+ sub { $disabled{uplink} ? () : "ia64_uplink" } ], - AS => "ias", - ASFLAGS => "-d debug", - asoutflag => "-o ", -@@ -1299,7 +1299,7 @@ my %targets = ( - }, - "VC-WIN64A" => { - inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), -- sub { $disabled{shared} ? () : "x86_64_uplink" } ], -+ sub { $disabled{uplink} ? () : "x86_64_uplink" } ], - AS => sub { vc_win64a_info()->{AS} }, - ASFLAGS => sub { vc_win64a_info()->{ASFLAGS} }, - asoutflag => sub { vc_win64a_info()->{asoutflag} }, -@@ -1312,7 +1312,7 @@ my %targets = ( - }, - "VC-WIN32" => { - inherit_from => [ "VC-noCE-common", asm("x86_asm"), -- sub { $disabled{shared} ? () : "uplink_common" } ], -+ sub { $disabled{uplink} ? () : "uplink_common" } ], - CFLAGS => add("/WX"), - AS => sub { vc_win32_info()->{AS} }, - ASFLAGS => sub { vc_win32_info()->{ASFLAGS} }, -diff --git a/Configurations/50-win-onecore.conf b/Configurations/50-win-onecore.conf -index d478f42b0f..9ce0f6870b 100644 ---- a/Configurations/50-win-onecore.conf -+++ b/Configurations/50-win-onecore.conf -@@ -61,4 +61,53 @@ my %targets = ( - ex_libs => "onecore.lib", - multilib => "-arm64", - }, -+ -+ # Universal Windows Platform (UWP) App Support -+ -+ # TODO -+ # -+ # The 'disable' attribute should have 'uplink'. -+ # however, these are checked in some 'inherit_from', which is processed -+ # very early, before the 'disable' attributes are seen. -+ # This is a problem that needs to be resolved in Configure first. -+ # -+ # But if you want to build library with Windows 10 Version 1809 SDK or -+ # earlier, the 'disable' attribute should also have 'asm'. -+ -+ "VC-WIN32-UWP" => { -+ inherit_from => [ "VC-WIN32-ONECORE" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => [ 'ui-console', 'async', 'uplink' ], -+ ex_libs => "WindowsApp.lib", -+ }, -+ "VC-WIN64A-UWP" => { -+ inherit_from => [ "VC-WIN64A-ONECORE" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => [ 'ui-console', 'async', 'uplink' ], -+ ex_libs => "WindowsApp.lib", -+ }, -+ "VC-WIN32-ARM-UWP" => { -+ inherit_from => [ "VC-WIN32-ARM" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => [ 'ui-console', 'async', 'uplink' ], -+ ex_libs => "WindowsApp.lib", -+ }, -+ "VC-WIN64-ARM-UWP" => { -+ inherit_from => [ "VC-WIN64-ARM" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => [ 'ui-console', 'async', 'uplink' ], -+ ex_libs => "WindowsApp.lib", -+ }, - ); -diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl -index 8ef70b8699..b0ddbf1c35 100644 ---- a/Configurations/windows-makefile.tmpl -+++ b/Configurations/windows-makefile.tmpl -@@ -164,8 +164,8 @@ libdir={- file_name_is_absolute($libdir) - - ##### User defined commands and flags ################################ - --CC={- $config{CC} -} --CPP={- $config{CPP} -} -+CC="{- $config{CC} -}" -+CPP="{- $config{CPP} -}" - CPPFLAGS={- our $cppflags1 = join(" ", - (map { "-D".$_} @{$config{CPPDEFINES}}), - (map { " /I ".$_} @{$config{CPPINCLUDES}}), -diff --git a/Configure b/Configure -index 5a699836f3..859b9f4ad9 100755 ---- a/Configure -+++ b/Configure -@@ -63,6 +63,7 @@ my $usage="Usage: Configure [no- ...] [enable- ...] [-Dxxx] [-lx - # zlib-dynamic Like "zlib", but the zlib library is expected to be a shared - # library and will be loaded in run-time by the OpenSSL library. - # sctp include SCTP support -+# no-uplink Don't build support for UPLINK interface. - # enable-weak-ssl-ciphers - # Enable weak ciphers that are disabled by default. - # 386 generate 80386 code in assembly modules -@@ -407,6 +408,7 @@ my @disablables = ( - "ubsan", - "ui-console", - "unit-test", -+ "uplink", - "whirlpool", - "weak-ssl-ciphers", - "zlib", -@@ -1118,6 +1118,8 @@ foreach my $feature (@{$target{enable}}) { - delete $disabled{$feature}; - } - } -+# If uplink_arch isn't defined, disable uplink -+$disabled{uplink} = 'no uplink_arch' unless (defined $target{uplink_arch}); - - $target{CXXFLAGS}//=$target{CFLAGS} if $target{CXX}; - $target{cxxflags}//=$target{cflags} if $target{CXX}; -diff --git a/INSTALL b/INSTALL -index 2119cbae9e..51a7cd2f0b 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -540,6 +540,9 @@ - Enable additional unit test APIs. This should not typically - be used in production deployments. - -+ no-uplink -+ Don't build support for UPLINK interface. -+ - enable-weak-ssl-ciphers - Build support for SSL/TLS ciphers that are considered "weak" - (e.g. RC4 based ciphersuites). -diff --git a/NOTES.WIN b/NOTES.WIN -index b1cb542d09..7b8ceadf72 100644 ---- a/NOTES.WIN -+++ b/NOTES.WIN -@@ -83,6 +83,18 @@ - is, of course, to choose a different set of directories by using - --prefix and --openssldir when configuring. - -+ -+ Special notes for Universal Windows Platform builds, a.k.a. VC-*-UWP -+ -------------------------------------------------------------------- -+ -+ - UWP targets only support building the static and dynamic libraries. -+ -+ - The "no-uplink" must be given in the "Configure" script. -+ -+ - You should define the platform type to "uwp" and the target arch via -+ "vcvarsall.bat" before you compile. For example, if you want to build -+ "arm64" builds, you should type "vcvarsall.bat x86_arm64 uwp". -+ - mingw and mingw64 - ================= - -diff --git a/cmake/openssl-config.cmake b/cmake/openssl-config.cmake -new file mode 100644 -index 0000000000..6ad219072f --- /dev/null +++ b/cmake/openssl-config.cmake @@ -0,0 +1,3 @@ +# include(${CMAKE_CURRENT_LIST_DIR}/openssl.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/crypto.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/ssl.cmake) -\ No newline at end of file -diff --git a/ms/uplink-x86_64.pl b/ms/uplink-x86_64.pl -index 1f244504cd..713e4ea8e3 100755 ---- a/ms/uplink-x86_64.pl -+++ b/ms/uplink-x86_64.pl -@@ -8,7 +8,7 @@ - - $output=pop; - $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; --open OUT,"| \"$^X\" \"${dir}../crypto/perlasm/x86_64-xlate.pl\" \"$output\""; -+open OUT,"| \"$^X\" \"${dir}/../crypto/perlasm/x86_64-xlate.pl\" \"$output\""; - *STDOUT=*OUT; - push(@INC,"${dir}."); - diff --git a/depends/windows/openssl/openssl.sha256 b/depends/windows/openssl/openssl.sha256 index 20e81adb..c7556e36 100644 --- a/depends/windows/openssl/openssl.sha256 +++ b/depends/windows/openssl/openssl.sha256 @@ -1 +1 @@ -1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2 +b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674 diff --git a/depends/windows/openssl/openssl.txt b/depends/windows/openssl/openssl.txt index fc8996da..cb3435f8 100644 --- a/depends/windows/openssl/openssl.txt +++ b/depends/windows/openssl/openssl.txt @@ -1 +1 @@ -openssl http://mirrors.kodi.tv/build-deps/sources/openssl-1.1.1d.tar.gz +openssl https://github.com/openssl/openssl/releases/download/openssl-3.1.1/openssl-3.1.1.tar.gz diff --git a/depends/windows/strawberryperl/strawberryperl.sha256 b/depends/windows/strawberryperl/strawberryperl.sha256 index 502c4a11..04c084d3 100644 --- a/depends/windows/strawberryperl/strawberryperl.sha256 +++ b/depends/windows/strawberryperl/strawberryperl.sha256 @@ -1 +1 @@ -dcdc5f4d54e6def73a472bbd4820aa7a22d336f6004fc35e180818f3d388c7e1 +692646105b0f5e058198a852dc52a48f1cebcaf676d63bbdeae12f4eaee9bf5c \ No newline at end of file diff --git a/depends/windows/strawberryperl/strawberryperl.txt b/depends/windows/strawberryperl/strawberryperl.txt index d6090441..3581a947 100644 --- a/depends/windows/strawberryperl/strawberryperl.txt +++ b/depends/windows/strawberryperl/strawberryperl.txt @@ -1 +1 @@ -strawberryperl http://mirrors.kodi.tv/build-deps/win32/strawberry-perl-5.28.0.1-64bit-portable.zip +strawberryperl http://mirrors.kodi.tv/build-deps/win32/strawberry-perl-5.32.1.1-64bit-portable.zip diff --git a/depends/windows/xz-utils/01-add-xz-config.cmake.patch b/depends/windows/xz-utils/01-add-xz-config.cmake.patch deleted file mode 100644 index b53b3acc..00000000 --- a/depends/windows/xz-utils/01-add-xz-config.cmake.patch +++ /dev/null @@ -1,4 +0,0 @@ ---- /dev/null -+++ b/cmake/xz-config.cmake -@@ -0,0 +1 @@ -+include(${CMAKE_CURRENT_LIST_DIR}/xz.cmake) diff --git a/depends/windows/xz-utils/CMakeLists.txt b/depends/windows/xz-utils/CMakeLists.txt deleted file mode 100644 index 0e46397f..00000000 --- a/depends/windows/xz-utils/CMakeLists.txt +++ /dev/null @@ -1,218 +0,0 @@ -cmake_minimum_required(VERSION 3.2) - -project(xz VERSION 5.3.0 LANGUAGES C) - -if(MSVC) - set(CMAKE_DEBUG_POSTFIX "d") -endif() - -add_library(lzma - src/common/tuklib_cpucores.c - src/common/tuklib_physmem.c - src/liblzma/check/check.c - src/liblzma/check/crc32_fast.c - src/liblzma/check/crc32_table.c - src/liblzma/check/crc64_fast.c - src/liblzma/check/crc64_table.c - src/liblzma/check/sha256.c - src/liblzma/common/alone_decoder.c - src/liblzma/common/alone_encoder.c - src/liblzma/common/auto_decoder.c - src/liblzma/common/block_buffer_decoder.c - src/liblzma/common/block_buffer_encoder.c - src/liblzma/common/block_decoder.c - src/liblzma/common/block_encoder.c - src/liblzma/common/block_header_decoder.c - src/liblzma/common/block_header_encoder.c - src/liblzma/common/block_util.c - src/liblzma/common/common.c - src/liblzma/common/easy_buffer_encoder.c - src/liblzma/common/easy_decoder_memusage.c - src/liblzma/common/easy_encoder.c - src/liblzma/common/easy_encoder_memusage.c - src/liblzma/common/easy_preset.c - src/liblzma/common/filter_buffer_decoder.c - src/liblzma/common/filter_buffer_encoder.c - src/liblzma/common/filter_common.c - src/liblzma/common/filter_decoder.c - src/liblzma/common/filter_encoder.c - src/liblzma/common/filter_flags_decoder.c - src/liblzma/common/filter_flags_encoder.c - src/liblzma/common/hardware_cputhreads.c - src/liblzma/common/hardware_physmem.c - src/liblzma/common/index.c - src/liblzma/common/index_decoder.c - src/liblzma/common/index_encoder.c - src/liblzma/common/index_hash.c - src/liblzma/common/outqueue.c - src/liblzma/common/stream_buffer_decoder.c - src/liblzma/common/stream_buffer_encoder.c - src/liblzma/common/stream_decoder.c - src/liblzma/common/stream_encoder.c - src/liblzma/common/stream_encoder_mt.c - src/liblzma/common/stream_flags_common.c - src/liblzma/common/stream_flags_decoder.c - src/liblzma/common/stream_flags_encoder.c - src/liblzma/common/vli_decoder.c - src/liblzma/common/vli_encoder.c - src/liblzma/common/vli_size.c - src/liblzma/delta/delta_common.c - src/liblzma/delta/delta_decoder.c - src/liblzma/delta/delta_encoder.c - src/liblzma/lzma/fastpos_table.c - src/liblzma/lzma/lzma2_decoder.c - src/liblzma/lzma/lzma2_encoder.c - src/liblzma/lzma/lzma_decoder.c - src/liblzma/lzma/lzma_encoder.c - src/liblzma/lzma/lzma_encoder_optimum_fast.c - src/liblzma/lzma/lzma_encoder_optimum_normal.c - src/liblzma/lzma/lzma_encoder_presets.c - src/liblzma/lz/lz_decoder.c - src/liblzma/lz/lz_encoder.c - src/liblzma/lz/lz_encoder_mf.c - src/liblzma/rangecoder/price_table.c - src/liblzma/simple/arm.c - src/liblzma/simple/armthumb.c - src/liblzma/simple/ia64.c - src/liblzma/simple/powerpc.c - src/liblzma/simple/simple_coder.c - src/liblzma/simple/simple_decoder.c - src/liblzma/simple/simple_encoder.c - src/liblzma/simple/sparc.c - src/liblzma/simple/x86.c - src/common/mythread.h - src/common/sysdefs.h - src/common/tuklib_common.h - src/common/tuklib_config.h - src/common/tuklib_cpucores.h - src/common/tuklib_integer.h - src/common/tuklib_physmem.h - src/liblzma/api/lzma.h - src/liblzma/api/lzma/base.h - src/liblzma/api/lzma/bcj.h - src/liblzma/api/lzma/block.h - src/liblzma/api/lzma/check.h - src/liblzma/api/lzma/container.h - src/liblzma/api/lzma/delta.h - src/liblzma/api/lzma/filter.h - src/liblzma/api/lzma/hardware.h - src/liblzma/api/lzma/index.h - src/liblzma/api/lzma/index_hash.h - src/liblzma/api/lzma/lzma12.h - src/liblzma/api/lzma/stream_flags.h - src/liblzma/api/lzma/version.h - src/liblzma/api/lzma/vli.h - src/liblzma/check/check.h - src/liblzma/check/crc32_table_be.h - src/liblzma/check/crc32_table_le.h - src/liblzma/check/crc64_table_be.h - src/liblzma/check/crc64_table_le.h - src/liblzma/check/crc_macros.h - src/liblzma/common/alone_decoder.h - src/liblzma/common/block_buffer_encoder.h - src/liblzma/common/block_decoder.h - src/liblzma/common/block_encoder.h - src/liblzma/common/common.h - src/liblzma/common/easy_preset.h - src/liblzma/common/filter_common.h - src/liblzma/common/filter_decoder.h - src/liblzma/common/filter_encoder.h - src/liblzma/common/index.h - src/liblzma/common/index_encoder.h - src/liblzma/common/memcmplen.h - src/liblzma/common/outqueue.h - src/liblzma/common/stream_decoder.h - src/liblzma/common/stream_flags_common.h - src/liblzma/delta/delta_common.h - src/liblzma/delta/delta_decoder.h - src/liblzma/delta/delta_encoder.h - src/liblzma/delta/delta_private.h - src/liblzma/lzma/fastpos.h - src/liblzma/lzma/lzma2_decoder.h - src/liblzma/lzma/lzma2_encoder.h - src/liblzma/lzma/lzma_common.h - src/liblzma/lzma/lzma_decoder.h - src/liblzma/lzma/lzma_encoder.h - src/liblzma/lzma/lzma_encoder_private.h - src/liblzma/lz/lz_decoder.h - src/liblzma/lz/lz_encoder.h - src/liblzma/lz/lz_encoder_hash.h - src/liblzma/lz/lz_encoder_hash_table.h - src/liblzma/rangecoder/price.h - src/liblzma/rangecoder/range_common.h - src/liblzma/rangecoder/range_decoder.h - src/liblzma/rangecoder/range_encoder.h - src/liblzma/simple/simple_coder.h - src/liblzma/simple/simple_decoder.h - src/liblzma/simple/simple_encoder.h - src/liblzma/simple/simple_private.h - windows/vs2017/config.h -) - -target_include_directories(lzma - PRIVATE - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - $ - INTERFACE - $ - PUBLIC - $ -) - -target_compile_definitions(lzma - PRIVATE - _CRT_SECURE_NO_WARNINGS - _CRT_STDC_NO_DEPRECATE - HAVE_CONFIG_H -) - -include(CMakePackageConfigHelpers) -write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake - VERSION ${PROJECT_VERSION} - COMPATIBILITY AnyNewerVersion -) - -install(TARGETS lzma EXPORT lzma - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -install(DIRECTORY - ${CMAKE_CURRENT_SOURCE_DIR}/src/liblzma/api/ - DESTINATION include -) - -install(EXPORT lzma - FILE - ${PROJECT_NAME}.cmake - NAMESPACE - ${PROJECT_NAME}:: - DESTINATION - lib/cmake/${PROJECT_NAME} -) - -install(FILES - cmake/${PROJECT_NAME}-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake - DESTINATION - lib/cmake/${PROJECT_NAME} -) - -export(TARGETS lzma - FILE - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake - NAMESPACE ${PROJECT_NAME}:: -) diff --git a/depends/windows/xz-utils/xz-utils.sha256 b/depends/windows/xz-utils/xz-utils.sha256 deleted file mode 100644 index ddd8e80e..00000000 --- a/depends/windows/xz-utils/xz-utils.sha256 +++ /dev/null @@ -1 +0,0 @@ -9717ae363760dedf573dad241420c5fea86256b65bc21d2cf71b2b12f0544f4b diff --git a/depends/windows/xz-utils/xz-utils.txt b/depends/windows/xz-utils/xz-utils.txt deleted file mode 100644 index 27f957f9..00000000 --- a/depends/windows/xz-utils/xz-utils.txt +++ /dev/null @@ -1 +0,0 @@ -xz-utils https://tukaani.org/xz/xz-5.2.4.tar.xz diff --git a/inputstream.ffmpegdirect/addon.xml.in b/inputstream.ffmpegdirect/addon.xml.in index f94fe92e..7bdab4d9 100644 --- a/inputstream.ffmpegdirect/addon.xml.in +++ b/inputstream.ffmpegdirect/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/inputstream.ffmpegdirect/changelog.txt b/inputstream.ffmpegdirect/changelog.txt index 9bb6ae81..b7d50c57 100644 --- a/inputstream.ffmpegdirect/changelog.txt +++ b/inputstream.ffmpegdirect/changelog.txt @@ -1,3 +1,16 @@ +v21.2.1 +- Update dependency xz-utils to version 5.4.3 +- Update dependency zlib to version 1.2.13 +- Update dependency libxml2 to version 2.11.4 +- Update dependency nettle to version 3.9 +- Update dependency libpng to version 1.6.39 +- Update dependency libzvbi to version 0.2.41 +- Update dependency libiconv to version 1.17 +- Update dependency gnutls to version 3.8.0 +- Update dependency strawberry perl to version 5.32.1.1 (about Windows builds) +- Update dependency openssl to version 3.1.1 (about Windows builds) +- Cleanup dependency builds to use only "depends/common" source folder + v21.2.0 - Kodi inputstream API update to version 3.3.0