From 4a468580d03ca082c9d2622826e8b2950d2157ac Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 19 Aug 2021 06:43:33 +0200 Subject: [PATCH] Update HarfBuzz to 2.8.2 (#1766) --- VERSIONS.txt | 10 +- externals/skia | 2 +- native/android/libHarfBuzzSharp/config.h | 77 +++------ .../libHarfBuzzSharp/jni/HarfBuzzSharp.mk | 8 +- native/ios/libHarfBuzzSharp/config.h | 65 ++------ .../project.pbxproj | 146 +++++++++-------- native/macos/libHarfBuzzSharp/config.h | 65 ++------ .../project.pbxproj | 24 ++- native/tizen/libHarfBuzzSharp/config.h | 34 ++-- .../tizen/libHarfBuzzSharp/project_def.prop | 8 +- native/tvos/libHarfBuzzSharp/config.h | 65 ++------ .../project.pbxproj | 44 +++-- native/uwp/libHarfBuzzSharp/config.h | 155 ------------------ .../libHarfBuzzSharp/libHarfBuzzSharp.vcxproj | 40 +++-- native/watchos/libHarfBuzzSharp/config.h | 65 ++------ .../project.pbxproj | 28 ++-- native/windows/libHarfBuzzSharp/config.h | 155 ------------------ .../libHarfBuzzSharp/libHarfBuzzSharp.vcxproj | 36 ++-- scripts/azure-pipelines.yml | 8 +- scripts/install-maui.ps1 | 1 - tests/Tests/HBBufferTest.cs | 2 +- 21 files changed, 305 insertions(+), 733 deletions(-) delete mode 100644 native/uwp/libHarfBuzzSharp/config.h delete mode 100644 native/windows/libHarfBuzzSharp/config.h diff --git a/VERSIONS.txt b/VERSIONS.txt index 5c16acc0d..2040ec87f 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -1,6 +1,6 @@ # dependencies mdoc release 5.8.3 -harfbuzz release 2.6.1 +harfbuzz release 2.8.2 skia release m88 xunit release 2.4.1 xunit.runner.console release 2.4.1 @@ -49,7 +49,7 @@ SkiaSharp file 2.88.0.0 # HarfBuzzSharp.dll HarfBuzzSharp assembly 1.0.0.0 -HarfBuzzSharp file 2.6.1.9 +HarfBuzzSharp file 2.8.2.0 # nuget versions SkiaSharp nuget 2.88.0 @@ -82,9 +82,9 @@ SkiaSharp.Views.Maui.Controls nuget 2.88.0 SkiaSharp.Views.Maui.Controls.Compatibility nuget 2.88.0 SkiaSharp.HarfBuzz nuget 2.88.0 SkiaSharp.Vulkan.SharpVk nuget 2.88.0 -HarfBuzzSharp nuget 2.6.1.9 -HarfBuzzSharp.NativeAssets.Linux nuget 2.6.1.9 -HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.6.1.9 +HarfBuzzSharp nuget 2.8.2 +HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2 +HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2 # nuget replacement versions Xamarin.Forms nuget 4.8.0.1821 diff --git a/externals/skia b/externals/skia index bc345769d..5a9653106 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit bc345769d2cc7e1dd8e4e603725d41de68043ef5 +Subproject commit 5a96531068ac55e2ed84d7c926c56a137c7b97d0 diff --git a/native/android/libHarfBuzzSharp/config.h b/native/android/libHarfBuzzSharp/config.h index ded174e92..a713668d2 100644 --- a/native/android/libHarfBuzzSharp/config.h +++ b/native/android/libHarfBuzzSharp/config.h @@ -13,30 +13,39 @@ /* Have cairo-ft support in cairo graphics library */ /* #undef HAVE_CAIRO_FT */ +/* Have chafa terminal graphics library */ +/* #undef HAVE_CHAFA */ + /* Have Core Text backend */ /* #undef HAVE_CORETEXT */ +/* define if the compiler supports basic C++11 syntax */ +#define HAVE_CXX11 1 + /* Have DirectWrite library */ /* #undef HAVE_DIRECTWRITE */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ +#define HAVE_DLFCN_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_DWRITE_H */ -/* Have simple TrueType Layout backend */ -/* #undef HAVE_FALLBACK */ - -/* Have fontconfig library */ -/* #undef HAVE_FONTCONFIG */ - /* Have FreeType 2 library */ /* #undef HAVE_FREETYPE */ +/* Define to 1 if you have the `FT_Done_MM_Var' function. */ +/* #undef HAVE_FT_DONE_MM_VAR */ + /* Define to 1 if you have the `FT_Get_Var_Blend_Coordinates' function. */ /* #undef HAVE_FT_GET_VAR_BLEND_COORDINATES */ +/* Define to 1 if you have the `FT_Set_Var_Blend_Coordinates' function. */ +/* #undef HAVE_FT_SET_VAR_BLEND_COORDINATES */ + +/* Have GDI library */ +/* #undef HAVE_GDI */ + /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 @@ -73,23 +82,14 @@ /* Define to 1 if you have the `mprotect' function. */ #define HAVE_MPROTECT 1 -/* Have native OpenType Layout backend */ -#define HAVE_OT 1 - /* Have POSIX threads */ #define HAVE_PTHREAD 1 /* Have PTHREAD_PRIO_INHERIT. */ #define HAVE_PTHREAD_PRIO_INHERIT 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ - -/* Have sched_yield */ -/* #undef HAVE_SCHED_YIELD */ - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -/* #undef HAVE_SOLARIS_ATOMIC_OPS */ +/* Define to 1 if you have the header file. */ +#define HAVE_STDBOOL_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -127,18 +127,17 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "https://github.com/behdad/harfbuzz/issues/new" +#define PACKAGE_BUGREPORT "https://github.com/harfbuzz/harfbuzz/issues/new" /* Define to the full name of this package. */ #define PACKAGE_NAME "HarfBuzz" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "HarfBuzz 2.6.1" +#define PACKAGE_STRING "HarfBuzz 2.8.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "harfbuzz" @@ -147,7 +146,7 @@ #define PACKAGE_URL "http://harfbuzz.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.6.1" +#define PACKAGE_VERSION "2.8.2" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -156,28 +155,6 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# define _ALL_SOURCE 1 -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# define _POSIX_PTHREAD_SEMANTICS 1 -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# define _TANDEM_SOURCE 1 -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif - - /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 @@ -188,13 +165,3 @@ /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ - -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ diff --git a/native/android/libHarfBuzzSharp/jni/HarfBuzzSharp.mk b/native/android/libHarfBuzzSharp/jni/HarfBuzzSharp.mk index a2e336e0d..7f5713980 100644 --- a/native/android/libHarfBuzzSharp/jni/HarfBuzzSharp.mk +++ b/native/android/libHarfBuzzSharp/jni/HarfBuzzSharp.mk @@ -23,10 +23,12 @@ LOCAL_SRC_FILES := $(src_root)/hb-aat-layout.cc $(src_root)/hb-buffer-serialize.cc \ $(src_root)/hb-buffer.cc \ $(src_root)/hb-common.cc \ + $(src_root)/hb-draw.cc \ $(src_root)/hb-face.cc \ $(src_root)/hb-fallback-shape.cc \ $(src_root)/hb-font.cc \ $(src_root)/hb-map.cc \ + $(src_root)/hb-number.cc \ $(src_root)/hb-ot-cff1-table.cc \ $(src_root)/hb-ot-cff2-table.cc \ $(src_root)/hb-ot-color.cc \ @@ -46,8 +48,8 @@ LOCAL_SRC_FILES := $(src_root)/hb-aat-layout.cc $(src_root)/hb-ot-shape-complex-indic.cc \ $(src_root)/hb-ot-shape-complex-khmer.cc \ $(src_root)/hb-ot-shape-complex-myanmar.cc \ + $(src_root)/hb-ot-shape-complex-syllabic.cc \ $(src_root)/hb-ot-shape-complex-thai.cc \ - $(src_root)/hb-ot-shape-complex-use-table.cc \ $(src_root)/hb-ot-shape-complex-use.cc \ $(src_root)/hb-ot-shape-complex-vowel-constraints.cc \ $(src_root)/hb-ot-shape-fallback.cc \ @@ -60,6 +62,7 @@ LOCAL_SRC_FILES := $(src_root)/hb-aat-layout.cc $(src_root)/hb-shape.cc \ $(src_root)/hb-shaper.cc \ $(src_root)/hb-static.cc \ + $(src_root)/hb-style.cc \ $(src_root)/hb-subset-cff-common.cc \ $(src_root)/hb-subset-cff1.cc \ $(src_root)/hb-subset-cff2.cc \ @@ -67,7 +70,6 @@ LOCAL_SRC_FILES := $(src_root)/hb-aat-layout.cc $(src_root)/hb-subset-plan.cc \ $(src_root)/hb-subset.cc \ $(src_root)/hb-ucd.cc \ - $(src_root)/hb-unicode.cc \ - $(src_root)/hb-warning.cc + $(src_root)/hb-unicode.cc include $(BUILD_SHARED_LIBRARY) diff --git a/native/ios/libHarfBuzzSharp/config.h b/native/ios/libHarfBuzzSharp/config.h index 30c48aefa..59a04737a 100644 --- a/native/ios/libHarfBuzzSharp/config.h +++ b/native/ios/libHarfBuzzSharp/config.h @@ -13,28 +13,24 @@ /* Have cairo-ft support in cairo graphics library */ /* #undef HAVE_CAIRO_FT */ +/* Have chafa terminal graphics library */ +/* #undef HAVE_CHAFA */ + /* Have Core Text backend */ /* #undef HAVE_CORETEXT */ -/* Define to 1 if you have the declaration of `round', and to 0 if you don't. - */ -/* #undef HAVE_DECL_ROUND */ +/* define if the compiler supports basic C++11 syntax */ +#define HAVE_CXX11 1 /* Have DirectWrite library */ /* #undef HAVE_DIRECTWRITE */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ +#define HAVE_DLFCN_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_DWRITE_H */ -/* Have simple TrueType Layout backend */ -/* #undef HAVE_FALLBACK */ - -/* Have fontconfig library */ -/* #undef HAVE_FONTCONFIG */ - /* Have FreeType 2 library */ /* #undef HAVE_FREETYPE */ @@ -47,6 +43,9 @@ /* Define to 1 if you have the `FT_Set_Var_Blend_Coordinates' function. */ /* #undef HAVE_FT_SET_VAR_BLEND_COORDINATES */ +/* Have GDI library */ +/* #undef HAVE_GDI */ + /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 @@ -65,54 +64,33 @@ /* Use hb-icu Unicode callbacks */ /* #undef HAVE_ICU_BUILTIN */ -/* Have Intel __sync_* atomic primitives */ -#define HAVE_INTEL_ATOMIC_PRIMITIVES 1 - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the `isatty' function. */ #define HAVE_ISATTY 1 -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - /* Define to 1 if you have the `mmap' function. */ #define HAVE_MMAP 1 /* Define to 1 if you have the `mprotect' function. */ #define HAVE_MPROTECT 1 -/* Define to 1 if you have the `newlocale' function. */ -#define HAVE_NEWLOCALE 1 - -/* Define to 1 if you have the `posix_memalign' function. */ -#define HAVE_POSIX_MEMALIGN 1 - /* Have POSIX threads */ #define HAVE_PTHREAD 1 /* Have PTHREAD_PRIO_INHERIT. */ #define HAVE_PTHREAD_PRIO_INHERIT 1 -/* Define to 1 if you have the `round' function. */ -#define HAVE_ROUND 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ - -/* Have sched_yield */ -/* #undef HAVE_SCHED_YIELD */ - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -/* #undef HAVE_SOLARIS_ATOMIC_OPS */ - /* Define to 1 if you have the header file. */ #define HAVE_STDBOOL_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 @@ -122,9 +100,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the `strtod_l' function. */ -#define HAVE_STRTOD_L 1 - /* Define to 1 if you have the `sysconf' function. */ #define HAVE_SYSCONF 1 @@ -149,9 +124,6 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ -/* Define to 1 if you have the header file. */ -#define HAVE_XLOCALE_H 1 - /* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" @@ -162,7 +134,7 @@ #define PACKAGE_NAME "HarfBuzz" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "HarfBuzz 2.6.1" +#define PACKAGE_STRING "HarfBuzz 2.8.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "harfbuzz" @@ -171,20 +143,17 @@ #define PACKAGE_URL "http://harfbuzz.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.6.1" +#define PACKAGE_VERSION "2.8.2" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ /* #undef PTHREAD_CREATE_JOINABLE */ -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #define STDC_HEADERS 1 -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj index 2c6c2f897..d393440c0 100644 --- a/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj +++ b/native/ios/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 340D5F4726C207C700EC8433 /* hb-draw.cc in Sources */ = {isa = PBXBuildFile; fileRef = 340D5F4626C207C700EC8433 /* hb-draw.cc */; }; + 340D5F4926C207E400EC8433 /* hb-number.cc in Sources */ = {isa = PBXBuildFile; fileRef = 340D5F4826C207E400EC8433 /* hb-number.cc */; }; + 340D5F4B26C2080100EC8433 /* hb-ot-shape-complex-syllabic.cc in Sources */ = {isa = PBXBuildFile; fileRef = 340D5F4A26C2080100EC8433 /* hb-ot-shape-complex-syllabic.cc */; }; + 340D5F4D26C2082700EC8433 /* hb-style.cc in Sources */ = {isa = PBXBuildFile; fileRef = 340D5F4C26C2082700EC8433 /* hb-style.cc */; }; 345637C92614B133007E2D90 /* libHarfBuzzSharp.h in Headers */ = {isa = PBXBuildFile; fileRef = 345637C72614B133007E2D90 /* libHarfBuzzSharp.h */; settings = {ATTRIBUTES = (Public, ); }; }; 345637CE2614B15E007E2D90 /* hb-aat-layout.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9307721FA5A76002D729C /* hb-aat-layout.cc */; }; 345637CF2614B15E007E2D90 /* hb-aat-map.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9307E21FA5A76002D729C /* hb-aat-map.cc */; }; @@ -42,7 +46,6 @@ 345637ED2614B15E007E2D90 /* hb-ot-shape-complex-khmer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9307F21FA5A76002D729C /* hb-ot-shape-complex-khmer.cc */; }; 345637EE2614B15E007E2D90 /* hb-ot-shape-complex-myanmar.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9307421FA5A76002D729C /* hb-ot-shape-complex-myanmar.cc */; }; 345637EF2614B15E007E2D90 /* hb-ot-shape-complex-thai.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9308921FA5A76002D729C /* hb-ot-shape-complex-thai.cc */; }; - 345637F02614B15E007E2D90 /* hb-ot-shape-complex-use-table.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9309821FA5A77002D729C /* hb-ot-shape-complex-use-table.cc */; }; 345637F12614B15E007E2D90 /* hb-ot-shape-complex-use.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9308121FA5A76002D729C /* hb-ot-shape-complex-use.cc */; }; 345637F22614B15E007E2D90 /* hb-ot-shape-complex-vowel-constraints.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9308B21FA5A76002D729C /* hb-ot-shape-complex-vowel-constraints.cc */; }; 345637F32614B15E007E2D90 /* hb-ot-shape-fallback.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9308421FA5A76002D729C /* hb-ot-shape-fallback.cc */; }; @@ -63,12 +66,15 @@ 345638022614B15E007E2D90 /* hb-subset.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34B817BF22BD8F6F00508F73 /* hb-subset.cc */; }; 345638032614B15E007E2D90 /* hb-ucd.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34B817BE22BD8F6F00508F73 /* hb-ucd.cc */; }; 345638042614B15E007E2D90 /* hb-unicode.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9308E21FA5A76002D729C /* hb-unicode.cc */; }; - 345638052614B15E007E2D90 /* hb-warning.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34C9309B21FA5A77002D729C /* hb-warning.cc */; }; 345638062614B15E007E2D90 /* config.h in Sources */ = {isa = PBXBuildFile; fileRef = 34C92F8D21FA593F002D729C /* config.h */; }; 345638072614B15E007E2D90 /* libHarfBuzzSharp.h in Sources */ = {isa = PBXBuildFile; fileRef = 345637C72614B133007E2D90 /* libHarfBuzzSharp.h */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 340D5F4626C207C700EC8433 /* hb-draw.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-draw.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-draw.cc"; sourceTree = ""; }; + 340D5F4826C207E400EC8433 /* hb-number.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-number.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-number.cc"; sourceTree = ""; }; + 340D5F4A26C2080100EC8433 /* hb-ot-shape-complex-syllabic.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-syllabic.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-syllabic.cc"; sourceTree = ""; }; + 340D5F4C26C2082700EC8433 /* hb-style.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-style.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-style.cc"; sourceTree = ""; }; 345637C52614B133007E2D90 /* libHarfBuzzSharp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libHarfBuzzSharp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 345637C72614B133007E2D90 /* libHarfBuzzSharp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libHarfBuzzSharp.h; sourceTree = ""; }; 345637C82614B133007E2D90 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -117,10 +123,8 @@ 34C9309421FA5A77002D729C /* hb-map.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-map.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-map.cc"; sourceTree = ""; }; 34C9309521FA5A77002D729C /* hb-font.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-font.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-font.cc"; sourceTree = ""; }; 34C9309621FA5A77002D729C /* hb-set.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-set.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-set.cc"; sourceTree = ""; }; - 34C9309821FA5A77002D729C /* hb-ot-shape-complex-use-table.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-use-table.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-use-table.cc"; sourceTree = ""; }; 34C9309921FA5A77002D729C /* hb-ot-tag.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-tag.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-tag.cc"; sourceTree = ""; }; 34C9309A21FA5A77002D729C /* hb-shape.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-shape.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-shape.cc"; sourceTree = ""; }; - 34C9309B21FA5A77002D729C /* hb-warning.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-warning.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-warning.cc"; sourceTree = ""; }; 34C9309C21FA5A77002D729C /* hb-fallback-shape.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-fallback-shape.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-fallback-shape.cc"; sourceTree = ""; }; 34C9309D21FA5A77002D729C /* hb-ot-var.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-var.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-var.cc"; sourceTree = ""; }; 34F6800B233ED0F70091C30D /* hb-ot-meta.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-meta.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-meta.cc"; sourceTree = ""; }; @@ -160,10 +164,12 @@ 34C9308321FA5A76002D729C /* hb-buffer-serialize.cc */, 34C9307621FA5A76002D729C /* hb-buffer.cc */, 34C9307921FA5A76002D729C /* hb-common.cc */, + 340D5F4626C207C700EC8433 /* hb-draw.cc */, 34C9309221FA5A77002D729C /* hb-face.cc */, 34C9309C21FA5A77002D729C /* hb-fallback-shape.cc */, 34C9309521FA5A77002D729C /* hb-font.cc */, 34C9309421FA5A77002D729C /* hb-map.cc */, + 340D5F4826C207E400EC8433 /* hb-number.cc */, 34C9307C21FA5A76002D729C /* hb-ot-cff1-table.cc */, 34C9307D21FA5A76002D729C /* hb-ot-cff2-table.cc */, 34C9307821FA5A76002D729C /* hb-ot-color.cc */, @@ -187,8 +193,8 @@ 34C9308821FA5A76002D729C /* hb-ot-shape-complex-indic.cc */, 34C9307F21FA5A76002D729C /* hb-ot-shape-complex-khmer.cc */, 34C9307421FA5A76002D729C /* hb-ot-shape-complex-myanmar.cc */, + 340D5F4A26C2080100EC8433 /* hb-ot-shape-complex-syllabic.cc */, 34C9308921FA5A76002D729C /* hb-ot-shape-complex-thai.cc */, - 34C9309821FA5A77002D729C /* hb-ot-shape-complex-use-table.cc */, 34C9308121FA5A76002D729C /* hb-ot-shape-complex-use.cc */, 34C9308B21FA5A76002D729C /* hb-ot-shape-complex-vowel-constraints.cc */, 34C9308421FA5A76002D729C /* hb-ot-shape-fallback.cc */, @@ -201,6 +207,7 @@ 34C9309A21FA5A77002D729C /* hb-shape.cc */, 34C9308221FA5A76002D729C /* hb-shaper.cc */, 34C9308D21FA5A76002D729C /* hb-static.cc */, + 340D5F4C26C2082700EC8433 /* hb-style.cc */, 34B817BC22BD8F6F00508F73 /* hb-subset-cff-common.cc */, 34B817C122BD8F6F00508F73 /* hb-subset-cff1.cc */, 34B817BB22BD8F6F00508F73 /* hb-subset-cff2.cc */, @@ -209,7 +216,6 @@ 34B817BF22BD8F6F00508F73 /* hb-subset.cc */, 34B817BE22BD8F6F00508F73 /* hb-ucd.cc */, 34C9308E21FA5A76002D729C /* hb-unicode.cc */, - 34C9309B21FA5A77002D729C /* hb-warning.cc */, ); name = src; sourceTree = ""; @@ -321,6 +327,7 @@ 345637D42614B15E007E2D90 /* hb-face.cc in Sources */, 345637D52614B15E007E2D90 /* hb-fallback-shape.cc in Sources */, 345637D62614B15E007E2D90 /* hb-font.cc in Sources */, + 340D5F4D26C2082700EC8433 /* hb-style.cc in Sources */, 345637D72614B15E007E2D90 /* hb-map.cc in Sources */, 345637D82614B15E007E2D90 /* hb-ot-cff1-table.cc in Sources */, 345637D92614B15E007E2D90 /* hb-ot-cff2-table.cc in Sources */, @@ -332,9 +339,11 @@ 345637DF2614B15E007E2D90 /* hb-ot-math.cc in Sources */, 345637E02614B15E007E2D90 /* hb-ot-meta-table.hh in Sources */, 345637E12614B15E007E2D90 /* hb-ot-meta.cc in Sources */, + 340D5F4926C207E400EC8433 /* hb-number.cc in Sources */, 345637E22614B15E007E2D90 /* hb-ot-meta.h in Sources */, 345637E32614B15E007E2D90 /* hb-ot-metrics.cc in Sources */, 345637E42614B15E007E2D90 /* hb-ot-metrics.h in Sources */, + 340D5F4726C207C700EC8433 /* hb-draw.cc in Sources */, 345637E52614B15E007E2D90 /* hb-ot-metrics.hh in Sources */, 345637E62614B15E007E2D90 /* hb-ot-name.cc in Sources */, 345637E72614B15E007E2D90 /* hb-ot-shape-complex-arabic.cc in Sources */, @@ -343,10 +352,10 @@ 345637EA2614B15E007E2D90 /* hb-ot-shape-complex-hebrew.cc in Sources */, 345637EB2614B15E007E2D90 /* hb-ot-shape-complex-indic-table.cc in Sources */, 345637EC2614B15E007E2D90 /* hb-ot-shape-complex-indic.cc in Sources */, + 340D5F4B26C2080100EC8433 /* hb-ot-shape-complex-syllabic.cc in Sources */, 345637ED2614B15E007E2D90 /* hb-ot-shape-complex-khmer.cc in Sources */, 345637EE2614B15E007E2D90 /* hb-ot-shape-complex-myanmar.cc in Sources */, 345637EF2614B15E007E2D90 /* hb-ot-shape-complex-thai.cc in Sources */, - 345637F02614B15E007E2D90 /* hb-ot-shape-complex-use-table.cc in Sources */, 345637F12614B15E007E2D90 /* hb-ot-shape-complex-use.cc in Sources */, 345637F22614B15E007E2D90 /* hb-ot-shape-complex-vowel-constraints.cc in Sources */, 345637F32614B15E007E2D90 /* hb-ot-shape-fallback.cc in Sources */, @@ -367,7 +376,6 @@ 345638022614B15E007E2D90 /* hb-subset.cc in Sources */, 345638032614B15E007E2D90 /* hb-ucd.cc in Sources */, 345638042614B15E007E2D90 /* hb-unicode.cc in Sources */, - 345638052614B15E007E2D90 /* hb-warning.cc in Sources */, 345638062614B15E007E2D90 /* config.h in Sources */, 345638072614B15E007E2D90 /* libHarfBuzzSharp.h in Sources */, ); @@ -376,6 +384,64 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ + 345637CB2614B133007E2D90 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + DEAD_CODE_STRIPPING = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = libHarfBuzzSharp/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + "IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.libHarfBuzzSharp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SUPPORTS_MACCATALYST = YES; + WARNING_CFLAGS = ( + "-Wno-comma", + "-Wno-conditional-uninitialized", + "-Wno-documentation", + ); + }; + name = Debug; + }; + 345637CC2614B133007E2D90 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + DEAD_CODE_STRIPPING = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = libHarfBuzzSharp/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + "IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.libHarfBuzzSharp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + SUPPORTS_MACCATALYST = YES; + WARNING_CFLAGS = ( + "-Wno-comma", + "-Wno-conditional-uninitialized", + "-Wno-documentation", + ); + }; + name = Release; + }; 34D723491EB385E900E6210E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -431,8 +497,8 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-all_load"; - SDKROOT = iphoneos; PLATFORM = ios; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -490,73 +556,15 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-all_load"; - SDKROOT = iphoneos; PLATFORM = ios; - VALIDATE_PRODUCT = YES; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 345637CB2614B133007E2D90 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEAD_CODE_STRIPPING = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = libHarfBuzzSharp/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - "IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.libHarfBuzzSharp; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - WARNING_CFLAGS = ( - "-Wno-comma", - "-Wno-conditional-uninitialized", - "-Wno-documentation", - ); - SUPPORTS_MACCATALYST = YES; - }; - name = Debug; - }; - 345637CC2614B133007E2D90 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - DEAD_CODE_STRIPPING = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = libHarfBuzzSharp/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - "IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 13.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.libHarfBuzzSharp; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - WARNING_CFLAGS = ( - "-Wno-comma", - "-Wno-conditional-uninitialized", - "-Wno-documentation", - ); - SUPPORTS_MACCATALYST = YES; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ diff --git a/native/macos/libHarfBuzzSharp/config.h b/native/macos/libHarfBuzzSharp/config.h index 30c48aefa..59a04737a 100644 --- a/native/macos/libHarfBuzzSharp/config.h +++ b/native/macos/libHarfBuzzSharp/config.h @@ -13,28 +13,24 @@ /* Have cairo-ft support in cairo graphics library */ /* #undef HAVE_CAIRO_FT */ +/* Have chafa terminal graphics library */ +/* #undef HAVE_CHAFA */ + /* Have Core Text backend */ /* #undef HAVE_CORETEXT */ -/* Define to 1 if you have the declaration of `round', and to 0 if you don't. - */ -/* #undef HAVE_DECL_ROUND */ +/* define if the compiler supports basic C++11 syntax */ +#define HAVE_CXX11 1 /* Have DirectWrite library */ /* #undef HAVE_DIRECTWRITE */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ +#define HAVE_DLFCN_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_DWRITE_H */ -/* Have simple TrueType Layout backend */ -/* #undef HAVE_FALLBACK */ - -/* Have fontconfig library */ -/* #undef HAVE_FONTCONFIG */ - /* Have FreeType 2 library */ /* #undef HAVE_FREETYPE */ @@ -47,6 +43,9 @@ /* Define to 1 if you have the `FT_Set_Var_Blend_Coordinates' function. */ /* #undef HAVE_FT_SET_VAR_BLEND_COORDINATES */ +/* Have GDI library */ +/* #undef HAVE_GDI */ + /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 @@ -65,54 +64,33 @@ /* Use hb-icu Unicode callbacks */ /* #undef HAVE_ICU_BUILTIN */ -/* Have Intel __sync_* atomic primitives */ -#define HAVE_INTEL_ATOMIC_PRIMITIVES 1 - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the `isatty' function. */ #define HAVE_ISATTY 1 -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - /* Define to 1 if you have the `mmap' function. */ #define HAVE_MMAP 1 /* Define to 1 if you have the `mprotect' function. */ #define HAVE_MPROTECT 1 -/* Define to 1 if you have the `newlocale' function. */ -#define HAVE_NEWLOCALE 1 - -/* Define to 1 if you have the `posix_memalign' function. */ -#define HAVE_POSIX_MEMALIGN 1 - /* Have POSIX threads */ #define HAVE_PTHREAD 1 /* Have PTHREAD_PRIO_INHERIT. */ #define HAVE_PTHREAD_PRIO_INHERIT 1 -/* Define to 1 if you have the `round' function. */ -#define HAVE_ROUND 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ - -/* Have sched_yield */ -/* #undef HAVE_SCHED_YIELD */ - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -/* #undef HAVE_SOLARIS_ATOMIC_OPS */ - /* Define to 1 if you have the header file. */ #define HAVE_STDBOOL_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 @@ -122,9 +100,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the `strtod_l' function. */ -#define HAVE_STRTOD_L 1 - /* Define to 1 if you have the `sysconf' function. */ #define HAVE_SYSCONF 1 @@ -149,9 +124,6 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ -/* Define to 1 if you have the header file. */ -#define HAVE_XLOCALE_H 1 - /* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" @@ -162,7 +134,7 @@ #define PACKAGE_NAME "HarfBuzz" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "HarfBuzz 2.6.1" +#define PACKAGE_STRING "HarfBuzz 2.8.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "harfbuzz" @@ -171,20 +143,17 @@ #define PACKAGE_URL "http://harfbuzz.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.6.1" +#define PACKAGE_VERSION "2.8.2" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ /* #undef PTHREAD_CREATE_JOINABLE */ -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #define STDC_HEADERS 1 -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/native/macos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/macos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj index 611465336..baf1f85f9 100644 --- a/native/macos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj +++ b/native/macos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 3448EB1A26C208D3004A4705 /* hb-draw.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3448EB1626C208D3004A4705 /* hb-draw.cc */; }; + 3448EB1B26C208D3004A4705 /* hb-number.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3448EB1726C208D3004A4705 /* hb-number.cc */; }; + 3448EB1C26C208D3004A4705 /* hb-ot-shape-complex-syllabic.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3448EB1826C208D3004A4705 /* hb-ot-shape-complex-syllabic.cc */; }; + 3448EB1D26C208D3004A4705 /* hb-style.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3448EB1926C208D3004A4705 /* hb-style.cc */; }; 34F57ABF233ED11C00427BE9 /* hb-ot-meta.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F57AB9233ED11B00427BE9 /* hb-ot-meta.cc */; }; 34F57AC0233ED11C00427BE9 /* hb-ot-metrics.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F57ABA233ED11B00427BE9 /* hb-ot-metrics.cc */; }; 34F57AC1233ED11C00427BE9 /* hb-ot-meta.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F57ABB233ED11B00427BE9 /* hb-ot-meta.h */; }; @@ -20,14 +24,12 @@ 34F64B7021FA5EC3008FBDBD /* hb-ot-shape-complex-thai.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4321FA5EC1008FBDBD /* hb-ot-shape-complex-thai.cc */; }; 34F64B7121FA5EC3008FBDBD /* hb-blob.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4421FA5EC1008FBDBD /* hb-blob.cc */; }; 34F64B7221FA5EC3008FBDBD /* hb-map.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4521FA5EC1008FBDBD /* hb-map.cc */; }; - 34F64B7321FA5EC3008FBDBD /* hb-ot-shape-complex-use-table.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4621FA5EC1008FBDBD /* hb-ot-shape-complex-use-table.cc */; }; 34F64B7421FA5EC3008FBDBD /* hb-ot-shape-complex-use.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4721FA5EC1008FBDBD /* hb-ot-shape-complex-use.cc */; }; 34F64B7521FA5EC3008FBDBD /* hb-buffer-serialize.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4821FA5EC1008FBDBD /* hb-buffer-serialize.cc */; }; 34F64B7621FA5EC3008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4921FA5EC1008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc */; }; 34F64B7721FA5EC3008FBDBD /* hb-aat-map.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4A21FA5EC1008FBDBD /* hb-aat-map.cc */; }; 34F64B7821FA5EC3008FBDBD /* hb-ot-shape-normalize.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4B21FA5EC1008FBDBD /* hb-ot-shape-normalize.cc */; }; 34F64B7921FA5EC3008FBDBD /* hb-unicode.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4C21FA5EC1008FBDBD /* hb-unicode.cc */; }; - 34F64B7A21FA5EC3008FBDBD /* hb-warning.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4D21FA5EC1008FBDBD /* hb-warning.cc */; }; 34F64B7B21FA5EC3008FBDBD /* hb-ot-shape-complex-myanmar.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4E21FA5EC1008FBDBD /* hb-ot-shape-complex-myanmar.cc */; }; 34F64B7C21FA5EC3008FBDBD /* hb-ot-shape-complex-hangul.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B4F21FA5EC1008FBDBD /* hb-ot-shape-complex-hangul.cc */; }; 34F64B7D21FA5EC3008FBDBD /* hb-ot-shape-fallback.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64B5021FA5EC1008FBDBD /* hb-ot-shape-fallback.cc */; }; @@ -67,6 +69,10 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 3448EB1626C208D3004A4705 /* hb-draw.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-draw.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-draw.cc"; sourceTree = ""; }; + 3448EB1726C208D3004A4705 /* hb-number.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-number.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-number.cc"; sourceTree = ""; }; + 3448EB1826C208D3004A4705 /* hb-ot-shape-complex-syllabic.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-syllabic.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-syllabic.cc"; sourceTree = ""; }; + 3448EB1926C208D3004A4705 /* hb-style.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-style.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-style.cc"; sourceTree = ""; }; 346E0AC51EB38F6300F3DE96 /* libHarfBuzzSharp.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libHarfBuzzSharp.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; 34F57AB9233ED11B00427BE9 /* hb-ot-meta.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-meta.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-meta.cc"; sourceTree = ""; }; 34F57ABA233ED11B00427BE9 /* hb-ot-metrics.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-metrics.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-metrics.cc"; sourceTree = ""; }; @@ -81,14 +87,12 @@ 34F64B4321FA5EC1008FBDBD /* hb-ot-shape-complex-thai.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-thai.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-thai.cc"; sourceTree = ""; }; 34F64B4421FA5EC1008FBDBD /* hb-blob.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-blob.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-blob.cc"; sourceTree = ""; }; 34F64B4521FA5EC1008FBDBD /* hb-map.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-map.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-map.cc"; sourceTree = ""; }; - 34F64B4621FA5EC1008FBDBD /* hb-ot-shape-complex-use-table.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-use-table.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-use-table.cc"; sourceTree = ""; }; 34F64B4721FA5EC1008FBDBD /* hb-ot-shape-complex-use.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-use.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-use.cc"; sourceTree = ""; }; 34F64B4821FA5EC1008FBDBD /* hb-buffer-serialize.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-buffer-serialize.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-buffer-serialize.cc"; sourceTree = ""; }; 34F64B4921FA5EC1008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-vowel-constraints.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-vowel-constraints.cc"; sourceTree = ""; }; 34F64B4A21FA5EC1008FBDBD /* hb-aat-map.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-aat-map.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-aat-map.cc"; sourceTree = ""; }; 34F64B4B21FA5EC1008FBDBD /* hb-ot-shape-normalize.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-normalize.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-normalize.cc"; sourceTree = ""; }; 34F64B4C21FA5EC1008FBDBD /* hb-unicode.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-unicode.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-unicode.cc"; sourceTree = ""; }; - 34F64B4D21FA5EC1008FBDBD /* hb-warning.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-warning.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-warning.cc"; sourceTree = ""; }; 34F64B4E21FA5EC1008FBDBD /* hb-ot-shape-complex-myanmar.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-myanmar.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-myanmar.cc"; sourceTree = ""; }; 34F64B4F21FA5EC1008FBDBD /* hb-ot-shape-complex-hangul.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-hangul.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-hangul.cc"; sourceTree = ""; }; 34F64B5021FA5EC1008FBDBD /* hb-ot-shape-fallback.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-fallback.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-fallback.cc"; sourceTree = ""; }; @@ -164,10 +168,12 @@ 34F64B4821FA5EC1008FBDBD /* hb-buffer-serialize.cc */, 34F64B6921FA5EC2008FBDBD /* hb-buffer.cc */, 34F64B5C21FA5EC2008FBDBD /* hb-common.cc */, + 3448EB1626C208D3004A4705 /* hb-draw.cc */, 34F64B5921FA5EC2008FBDBD /* hb-face.cc */, 34F64B6121FA5EC2008FBDBD /* hb-fallback-shape.cc */, 34F64B6A21FA5EC2008FBDBD /* hb-font.cc */, 34F64B4521FA5EC1008FBDBD /* hb-map.cc */, + 3448EB1726C208D3004A4705 /* hb-number.cc */, 34F64B3E21FA5EC1008FBDBD /* hb-ot-cff1-table.cc */, 34F64B5121FA5EC1008FBDBD /* hb-ot-cff2-table.cc */, 34F64B4121FA5EC1008FBDBD /* hb-ot-color.cc */, @@ -191,8 +197,8 @@ 34F64B5B21FA5EC2008FBDBD /* hb-ot-shape-complex-indic.cc */, 34F64B5721FA5EC1008FBDBD /* hb-ot-shape-complex-khmer.cc */, 34F64B4E21FA5EC1008FBDBD /* hb-ot-shape-complex-myanmar.cc */, + 3448EB1826C208D3004A4705 /* hb-ot-shape-complex-syllabic.cc */, 34F64B4321FA5EC1008FBDBD /* hb-ot-shape-complex-thai.cc */, - 34F64B4621FA5EC1008FBDBD /* hb-ot-shape-complex-use-table.cc */, 34F64B4721FA5EC1008FBDBD /* hb-ot-shape-complex-use.cc */, 34F64B4921FA5EC1008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc */, 34F64B5021FA5EC1008FBDBD /* hb-ot-shape-fallback.cc */, @@ -205,6 +211,7 @@ 34F64B5621FA5EC1008FBDBD /* hb-shape.cc */, 34F64B5A21FA5EC2008FBDBD /* hb-shaper.cc */, 34F64B6621FA5EC2008FBDBD /* hb-static.cc */, + 3448EB1926C208D3004A4705 /* hb-style.cc */, 34FEAB0322BD8FE2007299F0 /* hb-subset-cff-common.cc */, 34FEAB0722BD8FE2007299F0 /* hb-subset-cff1.cc */, 34FEAB0822BD8FE2007299F0 /* hb-subset-cff2.cc */, @@ -213,7 +220,6 @@ 34FEAB0422BD8FE2007299F0 /* hb-subset.cc */, 34FEAB0622BD8FE2007299F0 /* hb-ucd.cc */, 34F64B4C21FA5EC1008FBDBD /* hb-unicode.cc */, - 34F64B4D21FA5EC1008FBDBD /* hb-warning.cc */, ); name = src; sourceTree = ""; @@ -296,11 +302,12 @@ 34FEAB0C22BD8FE2007299F0 /* hb-subset-input.cc in Sources */, 34F64B7C21FA5EC3008FBDBD /* hb-ot-shape-complex-hangul.cc in Sources */, 34F64B9321FA5EC3008FBDBD /* hb-static.cc in Sources */, + 3448EB1C26C208D3004A4705 /* hb-ot-shape-complex-syllabic.cc in Sources */, 34F64B6E21FA5EC3008FBDBD /* hb-ot-color.cc in Sources */, 34F64B8821FA5EC3008FBDBD /* hb-ot-shape-complex-indic.cc in Sources */, 34F64B9021FA5EC3008FBDBD /* hb-ot-math.cc in Sources */, + 3448EB1B26C208D3004A4705 /* hb-number.cc in Sources */, 34F64B7421FA5EC3008FBDBD /* hb-ot-shape-complex-use.cc in Sources */, - 34F64B7321FA5EC3008FBDBD /* hb-ot-shape-complex-use-table.cc in Sources */, 34F64B6C21FA5EC3008FBDBD /* hb-ot-shape-complex-indic-table.cc in Sources */, 34F64B9121FA5EC3008FBDBD /* hb-ot-tag.cc in Sources */, 34F64B7621FA5EC3008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc in Sources */, @@ -328,17 +335,18 @@ 34F64B9721FA5EC3008FBDBD /* hb-font.cc in Sources */, 34F64B8E21FA5EC3008FBDBD /* hb-fallback-shape.cc in Sources */, 34F64B8321FA5EC3008FBDBD /* hb-shape.cc in Sources */, + 3448EB1D26C208D3004A4705 /* hb-style.cc in Sources */, 34F64B8921FA5EC3008FBDBD /* hb-common.cc in Sources */, 34FEAB0B22BD8FE2007299F0 /* hb-subset.cc in Sources */, 34F64B9621FA5EC3008FBDBD /* hb-buffer.cc in Sources */, 34F64B7721FA5EC3008FBDBD /* hb-aat-map.cc in Sources */, 34F64B7521FA5EC3008FBDBD /* hb-buffer-serialize.cc in Sources */, - 34F64B7A21FA5EC3008FBDBD /* hb-warning.cc in Sources */, 34F64B7F21FA5EC3008FBDBD /* hb-ot-shape-complex-hebrew.cc in Sources */, 34F64B8121FA5EC3008FBDBD /* hb-ot-shape.cc in Sources */, 34FEAB0A22BD8FE2007299F0 /* hb-subset-cff-common.cc in Sources */, 34F64B8721FA5EC3008FBDBD /* hb-shaper.cc in Sources */, 34F64B6B21FA5EC3008FBDBD /* hb-ot-cff1-table.cc in Sources */, + 3448EB1A26C208D3004A4705 /* hb-draw.cc in Sources */, 34F64B8521FA5EC3008FBDBD /* hb-set.cc in Sources */, 34F64B9521FA5EC3008FBDBD /* hb-ot-name.cc in Sources */, 34F64B9421FA5EC3008FBDBD /* hb-ot-map.cc in Sources */, diff --git a/native/tizen/libHarfBuzzSharp/config.h b/native/tizen/libHarfBuzzSharp/config.h index 2fa53a632..1617e51d6 100644 --- a/native/tizen/libHarfBuzzSharp/config.h +++ b/native/tizen/libHarfBuzzSharp/config.h @@ -13,28 +13,24 @@ /* Have cairo-ft support in cairo graphics library */ /* #undef HAVE_CAIRO_FT */ +/* Have chafa terminal graphics library */ +/* #undef HAVE_CHAFA */ + /* Have Core Text backend */ /* #undef HAVE_CORETEXT */ -/* Define to 1 if you have the declaration of `round', and to 0 if you don't. - */ -/* #undef HAVE_DECL_ROUND */ +/* define if the compiler supports basic C++11 syntax */ +#define HAVE_CXX11 1 /* Have DirectWrite library */ /* #undef HAVE_DIRECTWRITE */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ +#define HAVE_DLFCN_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_DWRITE_H */ -/* Have simple TrueType Layout backend */ -/* #undef HAVE_FALLBACK */ - -/* Have fontconfig library */ -/* #undef HAVE_FONTCONFIG */ - /* Have FreeType 2 library */ /* #undef HAVE_FREETYPE */ @@ -47,6 +43,9 @@ /* Define to 1 if you have the `FT_Set_Var_Blend_Coordinates' function. */ #define HAVE_FT_SET_VAR_BLEND_COORDINATES 1 +/* Have GDI library */ +/* #undef HAVE_GDI */ + /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 @@ -85,28 +84,17 @@ /* Define to 1 if you have the `newlocale' function. */ #define HAVE_NEWLOCALE 1 - -/* Define to 1 if you have the `posix_memalign' function. */ -#define HAVE_POSIX_MEMALIGN 1 - /* Have POSIX threads */ #define HAVE_PTHREAD 1 /* Have PTHREAD_PRIO_INHERIT. */ #define HAVE_PTHREAD_PRIO_INHERIT 1 -/* Define to 1 if you have the `round' function. */ -#define HAVE_ROUND 1 - /* Define to 1 if you have the header file. */ /* #undef HAVE_SCHED_H */ /* Have sched_yield */ /* #undef HAVE_SCHED_YIELD */ - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -/* #undef HAVE_SOLARIS_ATOMIC_OPS */ - /* Define to 1 if you have the header file. */ #define HAVE_STDBOOL_H 1 @@ -162,7 +150,7 @@ #define PACKAGE_NAME "HarfBuzz" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "HarfBuzz 2.6.1" +#define PACKAGE_STRING "HarfBuzz 2.8.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "harfbuzz" @@ -171,7 +159,7 @@ #define PACKAGE_URL "http://harfbuzz.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.6.1" +#define PACKAGE_VERSION "2.8.2" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ diff --git a/native/tizen/libHarfBuzzSharp/project_def.prop b/native/tizen/libHarfBuzzSharp/project_def.prop index f70e73aad..3c41cd7b0 100644 --- a/native/tizen/libHarfBuzzSharp/project_def.prop +++ b/native/tizen/libHarfBuzzSharp/project_def.prop @@ -19,10 +19,12 @@ USER_SRCS = $(harfbuzz_root)/src/hb-aat-layout.cc \ $(harfbuzz_root)/src/hb-buffer-serialize.cc \ $(harfbuzz_root)/src/hb-buffer.cc \ $(harfbuzz_root)/src/hb-common.cc \ + $(harfbuzz_root)/src/hb-draw.cc \ $(harfbuzz_root)/src/hb-face.cc \ $(harfbuzz_root)/src/hb-fallback-shape.cc \ $(harfbuzz_root)/src/hb-font.cc \ $(harfbuzz_root)/src/hb-map.cc \ + $(harfbuzz_root)/src/hb-number.cc \ $(harfbuzz_root)/src/hb-ot-cff1-table.cc \ $(harfbuzz_root)/src/hb-ot-cff2-table.cc \ $(harfbuzz_root)/src/hb-ot-color.cc \ @@ -42,8 +44,8 @@ USER_SRCS = $(harfbuzz_root)/src/hb-aat-layout.cc \ $(harfbuzz_root)/src/hb-ot-shape-complex-indic.cc \ $(harfbuzz_root)/src/hb-ot-shape-complex-khmer.cc \ $(harfbuzz_root)/src/hb-ot-shape-complex-myanmar.cc \ + $(harfbuzz_root)/src/hb-ot-shape-complex-syllabic.cc \ $(harfbuzz_root)/src/hb-ot-shape-complex-thai.cc \ - $(harfbuzz_root)/src/hb-ot-shape-complex-use-table.cc \ $(harfbuzz_root)/src/hb-ot-shape-complex-use.cc \ $(harfbuzz_root)/src/hb-ot-shape-complex-vowel-constraints.cc \ $(harfbuzz_root)/src/hb-ot-shape-fallback.cc \ @@ -56,6 +58,7 @@ USER_SRCS = $(harfbuzz_root)/src/hb-aat-layout.cc \ $(harfbuzz_root)/src/hb-shape.cc \ $(harfbuzz_root)/src/hb-shaper.cc \ $(harfbuzz_root)/src/hb-static.cc \ + $(harfbuzz_root)/src/hb-style.cc \ $(harfbuzz_root)/src/hb-subset-cff-common.cc \ $(harfbuzz_root)/src/hb-subset-cff1.cc \ $(harfbuzz_root)/src/hb-subset-cff2.cc \ @@ -63,5 +66,4 @@ USER_SRCS = $(harfbuzz_root)/src/hb-aat-layout.cc \ $(harfbuzz_root)/src/hb-subset-plan.cc \ $(harfbuzz_root)/src/hb-subset.cc \ $(harfbuzz_root)/src/hb-ucd.cc \ - $(harfbuzz_root)/src/hb-unicode.cc \ - $(harfbuzz_root)/src/hb-warning.cc + $(harfbuzz_root)/src/hb-unicode.cc diff --git a/native/tvos/libHarfBuzzSharp/config.h b/native/tvos/libHarfBuzzSharp/config.h index 30c48aefa..59a04737a 100644 --- a/native/tvos/libHarfBuzzSharp/config.h +++ b/native/tvos/libHarfBuzzSharp/config.h @@ -13,28 +13,24 @@ /* Have cairo-ft support in cairo graphics library */ /* #undef HAVE_CAIRO_FT */ +/* Have chafa terminal graphics library */ +/* #undef HAVE_CHAFA */ + /* Have Core Text backend */ /* #undef HAVE_CORETEXT */ -/* Define to 1 if you have the declaration of `round', and to 0 if you don't. - */ -/* #undef HAVE_DECL_ROUND */ +/* define if the compiler supports basic C++11 syntax */ +#define HAVE_CXX11 1 /* Have DirectWrite library */ /* #undef HAVE_DIRECTWRITE */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ +#define HAVE_DLFCN_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_DWRITE_H */ -/* Have simple TrueType Layout backend */ -/* #undef HAVE_FALLBACK */ - -/* Have fontconfig library */ -/* #undef HAVE_FONTCONFIG */ - /* Have FreeType 2 library */ /* #undef HAVE_FREETYPE */ @@ -47,6 +43,9 @@ /* Define to 1 if you have the `FT_Set_Var_Blend_Coordinates' function. */ /* #undef HAVE_FT_SET_VAR_BLEND_COORDINATES */ +/* Have GDI library */ +/* #undef HAVE_GDI */ + /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 @@ -65,54 +64,33 @@ /* Use hb-icu Unicode callbacks */ /* #undef HAVE_ICU_BUILTIN */ -/* Have Intel __sync_* atomic primitives */ -#define HAVE_INTEL_ATOMIC_PRIMITIVES 1 - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the `isatty' function. */ #define HAVE_ISATTY 1 -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - /* Define to 1 if you have the `mmap' function. */ #define HAVE_MMAP 1 /* Define to 1 if you have the `mprotect' function. */ #define HAVE_MPROTECT 1 -/* Define to 1 if you have the `newlocale' function. */ -#define HAVE_NEWLOCALE 1 - -/* Define to 1 if you have the `posix_memalign' function. */ -#define HAVE_POSIX_MEMALIGN 1 - /* Have POSIX threads */ #define HAVE_PTHREAD 1 /* Have PTHREAD_PRIO_INHERIT. */ #define HAVE_PTHREAD_PRIO_INHERIT 1 -/* Define to 1 if you have the `round' function. */ -#define HAVE_ROUND 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ - -/* Have sched_yield */ -/* #undef HAVE_SCHED_YIELD */ - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -/* #undef HAVE_SOLARIS_ATOMIC_OPS */ - /* Define to 1 if you have the header file. */ #define HAVE_STDBOOL_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 @@ -122,9 +100,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the `strtod_l' function. */ -#define HAVE_STRTOD_L 1 - /* Define to 1 if you have the `sysconf' function. */ #define HAVE_SYSCONF 1 @@ -149,9 +124,6 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ -/* Define to 1 if you have the header file. */ -#define HAVE_XLOCALE_H 1 - /* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" @@ -162,7 +134,7 @@ #define PACKAGE_NAME "HarfBuzz" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "HarfBuzz 2.6.1" +#define PACKAGE_STRING "HarfBuzz 2.8.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "harfbuzz" @@ -171,20 +143,17 @@ #define PACKAGE_URL "http://harfbuzz.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.6.1" +#define PACKAGE_VERSION "2.8.2" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ /* #undef PTHREAD_CREATE_JOINABLE */ -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #define STDC_HEADERS 1 -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/native/tvos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/tvos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj index 402ff2ff7..0b95cc28e 100644 --- a/native/tvos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj +++ b/native/tvos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 347B5D9426C209680024E341 /* hb-ot-shape-complex-syllabic.cc in Sources */ = {isa = PBXBuildFile; fileRef = 347B5D9026C209680024E341 /* hb-ot-shape-complex-syllabic.cc */; }; + 347B5D9526C209680024E341 /* hb-number.cc in Sources */ = {isa = PBXBuildFile; fileRef = 347B5D9126C209680024E341 /* hb-number.cc */; }; + 347B5D9626C209680024E341 /* hb-draw.cc in Sources */ = {isa = PBXBuildFile; fileRef = 347B5D9226C209680024E341 /* hb-draw.cc */; }; + 347B5D9726C209680024E341 /* hb-style.cc in Sources */ = {isa = PBXBuildFile; fileRef = 347B5D9326C209680024E341 /* hb-style.cc */; }; 34E064B22614BBE500CC0EDF /* libHarfBuzzSharp.h in Headers */ = {isa = PBXBuildFile; fileRef = 34E064B02614BBE500CC0EDF /* libHarfBuzzSharp.h */; settings = {ATTRIBUTES = (Public, ); }; }; 34E064B72614BC4000CC0EDF /* hb-aat-layout.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BC121FA5F50008FBDBD /* hb-aat-layout.cc */; }; 34E064B82614BC4000CC0EDF /* hb-aat-map.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BAD21FA5F4F008FBDBD /* hb-aat-map.cc */; }; @@ -42,7 +46,6 @@ 34E064D62614BC4000CC0EDF /* hb-ot-shape-complex-khmer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BBA21FA5F50008FBDBD /* hb-ot-shape-complex-khmer.cc */; }; 34E064D72614BC4000CC0EDF /* hb-ot-shape-complex-myanmar.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BB121FA5F4F008FBDBD /* hb-ot-shape-complex-myanmar.cc */; }; 34E064D82614BC4000CC0EDF /* hb-ot-shape-complex-thai.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BA621FA5F4F008FBDBD /* hb-ot-shape-complex-thai.cc */; }; - 34E064D92614BC4000CC0EDF /* hb-ot-shape-complex-use-table.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BA921FA5F4F008FBDBD /* hb-ot-shape-complex-use-table.cc */; }; 34E064DA2614BC4000CC0EDF /* hb-ot-shape-complex-use.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BAA21FA5F4F008FBDBD /* hb-ot-shape-complex-use.cc */; }; 34E064DB2614BC4000CC0EDF /* hb-ot-shape-complex-vowel-constraints.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BAC21FA5F4F008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc */; }; 34E064DC2614BC4000CC0EDF /* hb-ot-shape-fallback.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BB321FA5F4F008FBDBD /* hb-ot-shape-fallback.cc */; }; @@ -63,7 +66,6 @@ 34E064EB2614BC4000CC0EDF /* hb-subset.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3460E11022BD90090022F04C /* hb-subset.cc */; }; 34E064EC2614BC4000CC0EDF /* hb-ucd.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3460E11122BD90090022F04C /* hb-ucd.cc */; }; 34E064ED2614BC4000CC0EDF /* hb-unicode.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BAF21FA5F4F008FBDBD /* hb-unicode.cc */; }; - 34E064EE2614BC4000CC0EDF /* hb-warning.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BB021FA5F4F008FBDBD /* hb-warning.cc */; }; 34E064EF2614BC4000CC0EDF /* config.h in Sources */ = {isa = PBXBuildFile; fileRef = 34F64BFF21FA5F81008FBDBD /* config.h */; }; 34E064F02614BC4000CC0EDF /* libHarfBuzzSharp.h in Sources */ = {isa = PBXBuildFile; fileRef = 34E064B02614BBE500CC0EDF /* libHarfBuzzSharp.h */; }; /* End PBXBuildFile section */ @@ -76,6 +78,10 @@ 3460E11122BD90090022F04C /* hb-ucd.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ucd.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ucd.cc"; sourceTree = ""; }; 3460E11222BD90090022F04C /* hb-subset-cff1.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-subset-cff1.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-subset-cff1.cc"; sourceTree = ""; }; 3460E11322BD90090022F04C /* hb-subset-cff2.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-subset-cff2.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-subset-cff2.cc"; sourceTree = ""; }; + 347B5D9026C209680024E341 /* hb-ot-shape-complex-syllabic.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-syllabic.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-syllabic.cc"; sourceTree = ""; }; + 347B5D9126C209680024E341 /* hb-number.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-number.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-number.cc"; sourceTree = ""; }; + 347B5D9226C209680024E341 /* hb-draw.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-draw.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-draw.cc"; sourceTree = ""; }; + 347B5D9326C209680024E341 /* hb-style.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-style.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-style.cc"; sourceTree = ""; }; 34E064AE2614BBE500CC0EDF /* libHarfBuzzSharp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libHarfBuzzSharp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 34E064B02614BBE500CC0EDF /* libHarfBuzzSharp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libHarfBuzzSharp.h; sourceTree = ""; }; 34E064B12614BBE500CC0EDF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -92,14 +98,12 @@ 34F64BA621FA5F4F008FBDBD /* hb-ot-shape-complex-thai.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-thai.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-thai.cc"; sourceTree = ""; }; 34F64BA721FA5F4F008FBDBD /* hb-blob.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-blob.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-blob.cc"; sourceTree = ""; }; 34F64BA821FA5F4F008FBDBD /* hb-map.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-map.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-map.cc"; sourceTree = ""; }; - 34F64BA921FA5F4F008FBDBD /* hb-ot-shape-complex-use-table.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-use-table.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-use-table.cc"; sourceTree = ""; }; 34F64BAA21FA5F4F008FBDBD /* hb-ot-shape-complex-use.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-use.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-use.cc"; sourceTree = ""; }; 34F64BAB21FA5F4F008FBDBD /* hb-buffer-serialize.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-buffer-serialize.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-buffer-serialize.cc"; sourceTree = ""; }; 34F64BAC21FA5F4F008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-vowel-constraints.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-vowel-constraints.cc"; sourceTree = ""; }; 34F64BAD21FA5F4F008FBDBD /* hb-aat-map.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-aat-map.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-aat-map.cc"; sourceTree = ""; }; 34F64BAE21FA5F4F008FBDBD /* hb-ot-shape-normalize.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-normalize.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-normalize.cc"; sourceTree = ""; }; 34F64BAF21FA5F4F008FBDBD /* hb-unicode.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-unicode.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-unicode.cc"; sourceTree = ""; }; - 34F64BB021FA5F4F008FBDBD /* hb-warning.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-warning.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-warning.cc"; sourceTree = ""; }; 34F64BB121FA5F4F008FBDBD /* hb-ot-shape-complex-myanmar.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-myanmar.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-myanmar.cc"; sourceTree = ""; }; 34F64BB221FA5F4F008FBDBD /* hb-ot-shape-complex-hangul.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-hangul.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-hangul.cc"; sourceTree = ""; }; 34F64BB321FA5F4F008FBDBD /* hb-ot-shape-fallback.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-fallback.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-fallback.cc"; sourceTree = ""; }; @@ -152,6 +156,14 @@ ); sourceTree = ""; }; + 341E97BD1EB3CE10008E2876 /* Products */ = { + isa = PBXGroup; + children = ( + 34E064AE2614BBE500CC0EDF /* libHarfBuzzSharp.framework */, + ); + name = Products; + sourceTree = ""; + }; 34E064AF2614BBE500CC0EDF /* libHarfBuzzSharp */ = { isa = PBXGroup; children = ( @@ -161,14 +173,6 @@ path = libHarfBuzzSharp; sourceTree = ""; }; - 341E97BD1EB3CE10008E2876 /* Products */ = { - isa = PBXGroup; - children = ( - 34E064AE2614BBE500CC0EDF /* libHarfBuzzSharp.framework */, - ); - name = Products; - sourceTree = ""; - }; 34F64BA021FA5F43008FBDBD /* src */ = { isa = PBXGroup; children = ( @@ -178,10 +182,12 @@ 34F64BAB21FA5F4F008FBDBD /* hb-buffer-serialize.cc */, 34F64BCC21FA5F51008FBDBD /* hb-buffer.cc */, 34F64BBF21FA5F50008FBDBD /* hb-common.cc */, + 347B5D9226C209680024E341 /* hb-draw.cc */, 34F64BBC21FA5F50008FBDBD /* hb-face.cc */, 34F64BC421FA5F50008FBDBD /* hb-fallback-shape.cc */, 34F64BCD21FA5F51008FBDBD /* hb-font.cc */, 34F64BA821FA5F4F008FBDBD /* hb-map.cc */, + 347B5D9126C209680024E341 /* hb-number.cc */, 34F64BA121FA5F4F008FBDBD /* hb-ot-cff1-table.cc */, 34F64BB421FA5F4F008FBDBD /* hb-ot-cff2-table.cc */, 34F64BA421FA5F4F008FBDBD /* hb-ot-color.cc */, @@ -205,8 +211,8 @@ 34F64BBE21FA5F50008FBDBD /* hb-ot-shape-complex-indic.cc */, 34F64BBA21FA5F50008FBDBD /* hb-ot-shape-complex-khmer.cc */, 34F64BB121FA5F4F008FBDBD /* hb-ot-shape-complex-myanmar.cc */, + 347B5D9026C209680024E341 /* hb-ot-shape-complex-syllabic.cc */, 34F64BA621FA5F4F008FBDBD /* hb-ot-shape-complex-thai.cc */, - 34F64BA921FA5F4F008FBDBD /* hb-ot-shape-complex-use-table.cc */, 34F64BAA21FA5F4F008FBDBD /* hb-ot-shape-complex-use.cc */, 34F64BAC21FA5F4F008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc */, 34F64BB321FA5F4F008FBDBD /* hb-ot-shape-fallback.cc */, @@ -219,6 +225,7 @@ 34F64BB921FA5F50008FBDBD /* hb-shape.cc */, 34F64BBD21FA5F50008FBDBD /* hb-shaper.cc */, 34F64BC921FA5F51008FBDBD /* hb-static.cc */, + 347B5D9326C209680024E341 /* hb-style.cc */, 3460E10F22BD90090022F04C /* hb-subset-cff-common.cc */, 3460E11222BD90090022F04C /* hb-subset-cff1.cc */, 3460E11322BD90090022F04C /* hb-subset-cff2.cc */, @@ -227,7 +234,6 @@ 3460E11022BD90090022F04C /* hb-subset.cc */, 3460E11122BD90090022F04C /* hb-ucd.cc */, 34F64BAF21FA5F4F008FBDBD /* hb-unicode.cc */, - 34F64BB021FA5F4F008FBDBD /* hb-warning.cc */, ); name = src; sourceTree = ""; @@ -332,8 +338,10 @@ 34E064C82614BC4000CC0EDF /* hb-ot-math.cc in Sources */, 34E064C92614BC4000CC0EDF /* hb-ot-meta-table.hh in Sources */, 34E064CA2614BC4000CC0EDF /* hb-ot-meta.cc in Sources */, + 347B5D9526C209680024E341 /* hb-number.cc in Sources */, 34E064CB2614BC4000CC0EDF /* hb-ot-meta.h in Sources */, 34E064CC2614BC4000CC0EDF /* hb-ot-metrics.cc in Sources */, + 347B5D9726C209680024E341 /* hb-style.cc in Sources */, 34E064CD2614BC4000CC0EDF /* hb-ot-metrics.h in Sources */, 34E064CE2614BC4000CC0EDF /* hb-ot-metrics.hh in Sources */, 34E064CF2614BC4000CC0EDF /* hb-ot-name.cc in Sources */, @@ -346,11 +354,11 @@ 34E064D62614BC4000CC0EDF /* hb-ot-shape-complex-khmer.cc in Sources */, 34E064D72614BC4000CC0EDF /* hb-ot-shape-complex-myanmar.cc in Sources */, 34E064D82614BC4000CC0EDF /* hb-ot-shape-complex-thai.cc in Sources */, - 34E064D92614BC4000CC0EDF /* hb-ot-shape-complex-use-table.cc in Sources */, 34E064DA2614BC4000CC0EDF /* hb-ot-shape-complex-use.cc in Sources */, 34E064DB2614BC4000CC0EDF /* hb-ot-shape-complex-vowel-constraints.cc in Sources */, 34E064DC2614BC4000CC0EDF /* hb-ot-shape-fallback.cc in Sources */, 34E064DD2614BC4000CC0EDF /* hb-ot-shape-normalize.cc in Sources */, + 347B5D9626C209680024E341 /* hb-draw.cc in Sources */, 34E064DE2614BC4000CC0EDF /* hb-ot-shape.cc in Sources */, 34E064DF2614BC4000CC0EDF /* hb-ot-tag.cc in Sources */, 34E064E02614BC4000CC0EDF /* hb-ot-var.cc in Sources */, @@ -367,9 +375,9 @@ 34E064EB2614BC4000CC0EDF /* hb-subset.cc in Sources */, 34E064EC2614BC4000CC0EDF /* hb-ucd.cc in Sources */, 34E064ED2614BC4000CC0EDF /* hb-unicode.cc in Sources */, - 34E064EE2614BC4000CC0EDF /* hb-warning.cc in Sources */, 34E064EF2614BC4000CC0EDF /* config.h in Sources */, 34E064F02614BC4000CC0EDF /* libHarfBuzzSharp.h in Sources */, + 347B5D9426C209680024E341 /* hb-ot-shape-complex-syllabic.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -432,8 +440,8 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = appletvos; - TVOS_DEPLOYMENT_TARGET = 9.0; TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -491,9 +499,9 @@ GCC_WARN_UNUSED_VARIABLE = YES; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = appletvos; + TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; - TARGETED_DEVICE_FAMILY = 3; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; diff --git a/native/uwp/libHarfBuzzSharp/config.h b/native/uwp/libHarfBuzzSharp/config.h deleted file mode 100644 index 332b23afa..000000000 --- a/native/uwp/libHarfBuzzSharp/config.h +++ /dev/null @@ -1,155 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* The normal alignment of `struct{char;}', in bytes. */ -#define ALIGNOF_STRUCT_CHAR__ 1 - -/* Define to 1 if you have the `atexit' function. */ -#define HAVE_ATEXIT 1 - -/* Have cairo graphics library */ -/* #undef HAVE_CAIRO */ - -/* Have cairo-ft support in cairo graphics library */ -/* #undef HAVE_CAIRO_FT */ - -/* Have Core Text backend */ -/* #undef HAVE_CORETEXT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Have DirectWrite Library */ -/* #undef HAVE_DIRECTWRITE */ - -/* Have simple TrueType Layout backend */ -/* #undef HAVE_FALLBACK */ - -/* Have fontconfig library */ -/* #undef HAVE_FONTCONFIG */ - -/* Have FreeType 2 library */ -/* #undef HAVE_FREETYPE */ - -/* Define to 1 if you have the `getpagesize' function. */ -/* #undef HAVE_GETPAGESIZE */ - -/* Have glib2 library */ -/* #undef HAVE_GLIB */ - -/* Have gobject2 library */ -/* #undef HAVE_GOBJECT */ - -/* Have Graphite2 library */ -/* #undef HAVE_GRAPHITE2 */ - -/* Have ICU library */ -/* #undef HAVE_ICU */ - -/* Have Intel __sync_* atomic primitives */ -/* #undef HAVE_INTEL_ATOMIC_PRIMITIVES */ - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_INTTYPES_H 1 -#endif - -/* Define to 1 if you have the `isatty' function. */ -#define HAVE_ISATTY 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mmap' function. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `mprotect' function. */ -/* #undef HAVE_MPROTECT */ - -/* Have native OpenType Layout backend */ -#define HAVE_OT 1 - -/* Have POSIX threads */ -/* #undef HAVE_PTHREAD */ - -/* Have PTHREAD_PRIO_INHERIT. */ -/* #undef HAVE_PTHREAD_PRIO_INHERIT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ - -/* Have sched_yield */ -/* #undef HAVE_SCHED_YIELD */ - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -/* #undef HAVE_SOLARIS_ATOMIC_OPS */ - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1600) -#define HAVE_STDINT_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_STRINGS_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `sysconf' function. */ -/* #undef HAVE_SYSCONF */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Have Uniscribe library */ -/* #undef HAVE_UNISCRIBE */ - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_UNISTD_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_USP10_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "https://github.com/behdad/harfbuzz/issues/new" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "HarfBuzz" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "HarfBuzz 2.6.1" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "harfbuzz" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "http://harfbuzz.org/" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.6.1" - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef PTHREAD_CREATE_JOINABLE */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 diff --git a/native/uwp/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj b/native/uwp/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj index 229f59ed1..7d210526f 100644 --- a/native/uwp/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj +++ b/native/uwp/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj @@ -33,20 +33,15 @@ Release x64 - - - - - @@ -57,6 +52,7 @@ + @@ -72,6 +68,8 @@ + + @@ -85,10 +83,13 @@ + + + @@ -138,6 +139,7 @@ + @@ -152,10 +154,11 @@ + + - + - @@ -170,6 +173,7 @@ + @@ -189,6 +193,7 @@ + @@ -196,11 +201,12 @@ - + + @@ -212,6 +218,7 @@ + @@ -229,6 +236,7 @@ + @@ -362,7 +370,7 @@ NotUsing false - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) + HB_NO_GETENV;HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4146;4267;4244 @@ -377,7 +385,7 @@ NotUsing false - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) + HB_NO_GETENV;HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4146;4267;4244 @@ -392,7 +400,7 @@ NotUsing false - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) + HB_NO_GETENV;HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4146;4267;4244 @@ -407,7 +415,7 @@ NotUsing false - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) + HB_NO_GETENV;HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4146;4267;4244 @@ -422,7 +430,7 @@ NotUsing false - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) + HB_NO_GETENV;HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4146;4267;4244 @@ -437,7 +445,7 @@ NotUsing false - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) + HB_NO_GETENV;HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4146;4267;4244 @@ -452,7 +460,7 @@ NotUsing false - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) + HB_NO_GETENV;HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4146;4267;4244 @@ -467,7 +475,7 @@ NotUsing false - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) + HB_NO_GETENV;HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4146;4267;4244 diff --git a/native/watchos/libHarfBuzzSharp/config.h b/native/watchos/libHarfBuzzSharp/config.h index 30c48aefa..59a04737a 100644 --- a/native/watchos/libHarfBuzzSharp/config.h +++ b/native/watchos/libHarfBuzzSharp/config.h @@ -13,28 +13,24 @@ /* Have cairo-ft support in cairo graphics library */ /* #undef HAVE_CAIRO_FT */ +/* Have chafa terminal graphics library */ +/* #undef HAVE_CHAFA */ + /* Have Core Text backend */ /* #undef HAVE_CORETEXT */ -/* Define to 1 if you have the declaration of `round', and to 0 if you don't. - */ -/* #undef HAVE_DECL_ROUND */ +/* define if the compiler supports basic C++11 syntax */ +#define HAVE_CXX11 1 /* Have DirectWrite library */ /* #undef HAVE_DIRECTWRITE */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ +#define HAVE_DLFCN_H 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_DWRITE_H */ -/* Have simple TrueType Layout backend */ -/* #undef HAVE_FALLBACK */ - -/* Have fontconfig library */ -/* #undef HAVE_FONTCONFIG */ - /* Have FreeType 2 library */ /* #undef HAVE_FREETYPE */ @@ -47,6 +43,9 @@ /* Define to 1 if you have the `FT_Set_Var_Blend_Coordinates' function. */ /* #undef HAVE_FT_SET_VAR_BLEND_COORDINATES */ +/* Have GDI library */ +/* #undef HAVE_GDI */ + /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 @@ -65,54 +64,33 @@ /* Use hb-icu Unicode callbacks */ /* #undef HAVE_ICU_BUILTIN */ -/* Have Intel __sync_* atomic primitives */ -#define HAVE_INTEL_ATOMIC_PRIMITIVES 1 - /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the `isatty' function. */ #define HAVE_ISATTY 1 -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - /* Define to 1 if you have the `mmap' function. */ #define HAVE_MMAP 1 /* Define to 1 if you have the `mprotect' function. */ #define HAVE_MPROTECT 1 -/* Define to 1 if you have the `newlocale' function. */ -#define HAVE_NEWLOCALE 1 - -/* Define to 1 if you have the `posix_memalign' function. */ -#define HAVE_POSIX_MEMALIGN 1 - /* Have POSIX threads */ #define HAVE_PTHREAD 1 /* Have PTHREAD_PRIO_INHERIT. */ #define HAVE_PTHREAD_PRIO_INHERIT 1 -/* Define to 1 if you have the `round' function. */ -#define HAVE_ROUND 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ - -/* Have sched_yield */ -/* #undef HAVE_SCHED_YIELD */ - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -/* #undef HAVE_SOLARIS_ATOMIC_OPS */ - /* Define to 1 if you have the header file. */ #define HAVE_STDBOOL_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 @@ -122,9 +100,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the `strtod_l' function. */ -#define HAVE_STRTOD_L 1 - /* Define to 1 if you have the `sysconf' function. */ #define HAVE_SYSCONF 1 @@ -149,9 +124,6 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ -/* Define to 1 if you have the header file. */ -#define HAVE_XLOCALE_H 1 - /* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" @@ -162,7 +134,7 @@ #define PACKAGE_NAME "HarfBuzz" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "HarfBuzz 2.6.1" +#define PACKAGE_STRING "HarfBuzz 2.8.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "harfbuzz" @@ -171,20 +143,17 @@ #define PACKAGE_URL "http://harfbuzz.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.6.1" +#define PACKAGE_VERSION "2.8.2" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ /* #undef PTHREAD_CREATE_JOINABLE */ -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #define STDC_HEADERS 1 -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/native/watchos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj b/native/watchos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj index fed1a3015..c09352d32 100644 --- a/native/watchos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj +++ b/native/watchos/libHarfBuzzSharp/libHarfBuzzSharp.xcodeproj/project.pbxproj @@ -42,7 +42,6 @@ 342989BA2614C7390019CB69 /* hb-ot-shape-complex-khmer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64D2821FA6047008FBDBD /* hb-ot-shape-complex-khmer.cc */; }; 342989BB2614C7390019CB69 /* hb-ot-shape-complex-myanmar.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64D1F21FA6047008FBDBD /* hb-ot-shape-complex-myanmar.cc */; }; 342989BC2614C7390019CB69 /* hb-ot-shape-complex-thai.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64D1421FA6047008FBDBD /* hb-ot-shape-complex-thai.cc */; }; - 342989BD2614C7390019CB69 /* hb-ot-shape-complex-use-table.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64D1721FA6047008FBDBD /* hb-ot-shape-complex-use-table.cc */; }; 342989BE2614C7390019CB69 /* hb-ot-shape-complex-use.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64D1821FA6047008FBDBD /* hb-ot-shape-complex-use.cc */; }; 342989BF2614C7390019CB69 /* hb-ot-shape-complex-vowel-constraints.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64D1A21FA6047008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc */; }; 342989C02614C7390019CB69 /* hb-ot-shape-fallback.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64D2121FA6047008FBDBD /* hb-ot-shape-fallback.cc */; }; @@ -63,15 +62,22 @@ 342989CF2614C7390019CB69 /* hb-subset.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34FEAAF522BD8FAB007299F0 /* hb-subset.cc */; }; 342989D02614C7390019CB69 /* hb-ucd.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34FEAAF822BD8FAC007299F0 /* hb-ucd.cc */; }; 342989D12614C7390019CB69 /* hb-unicode.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64D1D21FA6047008FBDBD /* hb-unicode.cc */; }; - 342989D22614C7390019CB69 /* hb-warning.cc in Sources */ = {isa = PBXBuildFile; fileRef = 34F64D1E21FA6047008FBDBD /* hb-warning.cc */; }; 342989D32614C7390019CB69 /* config.h in Sources */ = {isa = PBXBuildFile; fileRef = 34F64C0521FA5FC6008FBDBD /* config.h */; }; 342989D42614C7390019CB69 /* libHarfBuzzSharp.h in Sources */ = {isa = PBXBuildFile; fileRef = 342989942614C6A00019CB69 /* libHarfBuzzSharp.h */; }; + 3497FC4C26C2094400A35CC6 /* hb-style.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3497FC4826C2094300A35CC6 /* hb-style.cc */; }; + 3497FC4D26C2094400A35CC6 /* hb-number.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3497FC4926C2094300A35CC6 /* hb-number.cc */; }; + 3497FC4E26C2094400A35CC6 /* hb-ot-shape-complex-syllabic.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3497FC4A26C2094300A35CC6 /* hb-ot-shape-complex-syllabic.cc */; }; + 3497FC4F26C2094400A35CC6 /* hb-draw.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3497FC4B26C2094400A35CC6 /* hb-draw.cc */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 342989922614C6A00019CB69 /* libHarfBuzzSharp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libHarfBuzzSharp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 342989942614C6A00019CB69 /* libHarfBuzzSharp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libHarfBuzzSharp.h; sourceTree = ""; }; 342989952614C6A00019CB69 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3497FC4826C2094300A35CC6 /* hb-style.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-style.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-style.cc"; sourceTree = ""; }; + 3497FC4926C2094300A35CC6 /* hb-number.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-number.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-number.cc"; sourceTree = ""; }; + 3497FC4A26C2094300A35CC6 /* hb-ot-shape-complex-syllabic.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-syllabic.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-syllabic.cc"; sourceTree = ""; }; + 3497FC4B26C2094400A35CC6 /* hb-draw.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-draw.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-draw.cc"; sourceTree = ""; }; 34F57ACD233ED14300427BE9 /* hb-ot-meta.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-meta.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-meta.cc"; sourceTree = ""; }; 34F57ACE233ED14400427BE9 /* hb-ot-metrics.hh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = "hb-ot-metrics.hh"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-metrics.hh"; sourceTree = ""; }; 34F57ACF233ED14400427BE9 /* hb-ot-metrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "hb-ot-metrics.h"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-metrics.h"; sourceTree = ""; }; @@ -86,14 +92,12 @@ 34F64D1421FA6047008FBDBD /* hb-ot-shape-complex-thai.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-thai.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-thai.cc"; sourceTree = ""; }; 34F64D1521FA6047008FBDBD /* hb-blob.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-blob.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-blob.cc"; sourceTree = ""; }; 34F64D1621FA6047008FBDBD /* hb-map.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-map.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-map.cc"; sourceTree = ""; }; - 34F64D1721FA6047008FBDBD /* hb-ot-shape-complex-use-table.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-use-table.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-use-table.cc"; sourceTree = ""; }; 34F64D1821FA6047008FBDBD /* hb-ot-shape-complex-use.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-use.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-use.cc"; sourceTree = ""; }; 34F64D1921FA6047008FBDBD /* hb-buffer-serialize.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-buffer-serialize.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-buffer-serialize.cc"; sourceTree = ""; }; 34F64D1A21FA6047008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-vowel-constraints.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-vowel-constraints.cc"; sourceTree = ""; }; 34F64D1B21FA6047008FBDBD /* hb-aat-map.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-aat-map.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-aat-map.cc"; sourceTree = ""; }; 34F64D1C21FA6047008FBDBD /* hb-ot-shape-normalize.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-normalize.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-normalize.cc"; sourceTree = ""; }; 34F64D1D21FA6047008FBDBD /* hb-unicode.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-unicode.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-unicode.cc"; sourceTree = ""; }; - 34F64D1E21FA6047008FBDBD /* hb-warning.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-warning.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-warning.cc"; sourceTree = ""; }; 34F64D1F21FA6047008FBDBD /* hb-ot-shape-complex-myanmar.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-myanmar.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-myanmar.cc"; sourceTree = ""; }; 34F64D2021FA6047008FBDBD /* hb-ot-shape-complex-hangul.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-complex-hangul.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-complex-hangul.cc"; sourceTree = ""; }; 34F64D2121FA6047008FBDBD /* hb-ot-shape-fallback.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ot-shape-fallback.cc"; path = "../../../externals/skia/third_party/externals/harfbuzz/src/hb-ot-shape-fallback.cc"; sourceTree = ""; }; @@ -178,10 +182,12 @@ 34F64D1921FA6047008FBDBD /* hb-buffer-serialize.cc */, 34F64D3A21FA6048008FBDBD /* hb-buffer.cc */, 34F64D2D21FA6048008FBDBD /* hb-common.cc */, + 3497FC4B26C2094400A35CC6 /* hb-draw.cc */, 34F64D2A21FA6048008FBDBD /* hb-face.cc */, 34F64D3221FA6048008FBDBD /* hb-fallback-shape.cc */, 34F64D3B21FA6048008FBDBD /* hb-font.cc */, 34F64D1621FA6047008FBDBD /* hb-map.cc */, + 3497FC4926C2094300A35CC6 /* hb-number.cc */, 34F64D0F21FA6047008FBDBD /* hb-ot-cff1-table.cc */, 34F64D2221FA6047008FBDBD /* hb-ot-cff2-table.cc */, 34F64D1221FA6047008FBDBD /* hb-ot-color.cc */, @@ -205,8 +211,8 @@ 34F64D2C21FA6048008FBDBD /* hb-ot-shape-complex-indic.cc */, 34F64D2821FA6047008FBDBD /* hb-ot-shape-complex-khmer.cc */, 34F64D1F21FA6047008FBDBD /* hb-ot-shape-complex-myanmar.cc */, + 3497FC4A26C2094300A35CC6 /* hb-ot-shape-complex-syllabic.cc */, 34F64D1421FA6047008FBDBD /* hb-ot-shape-complex-thai.cc */, - 34F64D1721FA6047008FBDBD /* hb-ot-shape-complex-use-table.cc */, 34F64D1821FA6047008FBDBD /* hb-ot-shape-complex-use.cc */, 34F64D1A21FA6047008FBDBD /* hb-ot-shape-complex-vowel-constraints.cc */, 34F64D2121FA6047008FBDBD /* hb-ot-shape-fallback.cc */, @@ -219,6 +225,7 @@ 34F64D2721FA6047008FBDBD /* hb-shape.cc */, 34F64D2B21FA6048008FBDBD /* hb-shaper.cc */, 34F64D3721FA6048008FBDBD /* hb-static.cc */, + 3497FC4826C2094300A35CC6 /* hb-style.cc */, 34FEAAF922BD8FAC007299F0 /* hb-subset-cff-common.cc */, 34FEAAF722BD8FAC007299F0 /* hb-subset-cff1.cc */, 34FEAAFA22BD8FAC007299F0 /* hb-subset-cff2.cc */, @@ -227,7 +234,6 @@ 34FEAAF522BD8FAB007299F0 /* hb-subset.cc */, 34FEAAF822BD8FAC007299F0 /* hb-ucd.cc */, 34F64D1D21FA6047008FBDBD /* hb-unicode.cc */, - 34F64D1E21FA6047008FBDBD /* hb-warning.cc */, ); name = src; sourceTree = ""; @@ -332,6 +338,7 @@ 342989AC2614C7390019CB69 /* hb-ot-math.cc in Sources */, 342989AD2614C7390019CB69 /* hb-ot-meta-table.hh in Sources */, 342989AE2614C7390019CB69 /* hb-ot-meta.cc in Sources */, + 3497FC4D26C2094400A35CC6 /* hb-number.cc in Sources */, 342989AF2614C7390019CB69 /* hb-ot-meta.h in Sources */, 342989B02614C7390019CB69 /* hb-ot-metrics.cc in Sources */, 342989B12614C7390019CB69 /* hb-ot-metrics.h in Sources */, @@ -344,9 +351,11 @@ 342989B82614C7390019CB69 /* hb-ot-shape-complex-indic-table.cc in Sources */, 342989B92614C7390019CB69 /* hb-ot-shape-complex-indic.cc in Sources */, 342989BA2614C7390019CB69 /* hb-ot-shape-complex-khmer.cc in Sources */, + 3497FC4E26C2094400A35CC6 /* hb-ot-shape-complex-syllabic.cc in Sources */, + 3497FC4C26C2094400A35CC6 /* hb-style.cc in Sources */, + 3497FC4F26C2094400A35CC6 /* hb-draw.cc in Sources */, 342989BB2614C7390019CB69 /* hb-ot-shape-complex-myanmar.cc in Sources */, 342989BC2614C7390019CB69 /* hb-ot-shape-complex-thai.cc in Sources */, - 342989BD2614C7390019CB69 /* hb-ot-shape-complex-use-table.cc in Sources */, 342989BE2614C7390019CB69 /* hb-ot-shape-complex-use.cc in Sources */, 342989BF2614C7390019CB69 /* hb-ot-shape-complex-vowel-constraints.cc in Sources */, 342989C02614C7390019CB69 /* hb-ot-shape-fallback.cc in Sources */, @@ -367,7 +376,6 @@ 342989CF2614C7390019CB69 /* hb-subset.cc in Sources */, 342989D02614C7390019CB69 /* hb-ucd.cc in Sources */, 342989D12614C7390019CB69 /* hb-unicode.cc in Sources */, - 342989D22614C7390019CB69 /* hb-warning.cc in Sources */, 342989D32614C7390019CB69 /* config.h in Sources */, 342989D42614C7390019CB69 /* libHarfBuzzSharp.h in Sources */, ); @@ -435,9 +443,9 @@ SDKROOT = watchos; TARGETED_DEVICE_FAMILY = 4; VALIDATE_PRODUCT = YES; - WATCHOS_DEPLOYMENT_TARGET = 2.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; + WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Debug; }; @@ -496,9 +504,9 @@ SDKROOT = watchos; TARGETED_DEVICE_FAMILY = 4; VALIDATE_PRODUCT = YES; - WATCHOS_DEPLOYMENT_TARGET = 2.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; + WATCHOS_DEPLOYMENT_TARGET = 2.0; }; name = Release; }; diff --git a/native/windows/libHarfBuzzSharp/config.h b/native/windows/libHarfBuzzSharp/config.h deleted file mode 100644 index 332b23afa..000000000 --- a/native/windows/libHarfBuzzSharp/config.h +++ /dev/null @@ -1,155 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* The normal alignment of `struct{char;}', in bytes. */ -#define ALIGNOF_STRUCT_CHAR__ 1 - -/* Define to 1 if you have the `atexit' function. */ -#define HAVE_ATEXIT 1 - -/* Have cairo graphics library */ -/* #undef HAVE_CAIRO */ - -/* Have cairo-ft support in cairo graphics library */ -/* #undef HAVE_CAIRO_FT */ - -/* Have Core Text backend */ -/* #undef HAVE_CORETEXT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Have DirectWrite Library */ -/* #undef HAVE_DIRECTWRITE */ - -/* Have simple TrueType Layout backend */ -/* #undef HAVE_FALLBACK */ - -/* Have fontconfig library */ -/* #undef HAVE_FONTCONFIG */ - -/* Have FreeType 2 library */ -/* #undef HAVE_FREETYPE */ - -/* Define to 1 if you have the `getpagesize' function. */ -/* #undef HAVE_GETPAGESIZE */ - -/* Have glib2 library */ -/* #undef HAVE_GLIB */ - -/* Have gobject2 library */ -/* #undef HAVE_GOBJECT */ - -/* Have Graphite2 library */ -/* #undef HAVE_GRAPHITE2 */ - -/* Have ICU library */ -/* #undef HAVE_ICU */ - -/* Have Intel __sync_* atomic primitives */ -/* #undef HAVE_INTEL_ATOMIC_PRIMITIVES */ - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1800) -#define HAVE_INTTYPES_H 1 -#endif - -/* Define to 1 if you have the `isatty' function. */ -#define HAVE_ISATTY 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mmap' function. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `mprotect' function. */ -/* #undef HAVE_MPROTECT */ - -/* Have native OpenType Layout backend */ -#define HAVE_OT 1 - -/* Have POSIX threads */ -/* #undef HAVE_PTHREAD */ - -/* Have PTHREAD_PRIO_INHERIT. */ -/* #undef HAVE_PTHREAD_PRIO_INHERIT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SCHED_H */ - -/* Have sched_yield */ -/* #undef HAVE_SCHED_YIELD */ - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -/* #undef HAVE_SOLARIS_ATOMIC_OPS */ - -/* Define to 1 if you have the header file. */ -#if !defined (_MSC_VER) || (_MSC_VER >= 1600) -#define HAVE_STDINT_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_STRINGS_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `sysconf' function. */ -/* #undef HAVE_SYSCONF */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Have Uniscribe library */ -/* #undef HAVE_UNISCRIBE */ - -/* Define to 1 if you have the header file. */ -#ifndef _MSC_VER -#define HAVE_UNISTD_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#define HAVE_USP10_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LT_OBJDIR ".libs/" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "https://github.com/behdad/harfbuzz/issues/new" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "HarfBuzz" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "HarfBuzz 2.6.1" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "harfbuzz" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "http://harfbuzz.org/" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.6.1" - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -/* #undef PTHREAD_CREATE_JOINABLE */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 diff --git a/native/windows/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj b/native/windows/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj index da08a34d8..553038ced 100644 --- a/native/windows/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj +++ b/native/windows/libHarfBuzzSharp/libHarfBuzzSharp.vcxproj @@ -26,19 +26,14 @@ x64 - - - - - @@ -49,6 +44,7 @@ + @@ -64,6 +60,8 @@ + + @@ -77,10 +75,13 @@ + + + @@ -130,6 +131,7 @@ + @@ -144,10 +146,11 @@ + + - + - @@ -162,6 +165,7 @@ + @@ -181,6 +185,7 @@ + @@ -188,11 +193,12 @@ - + + @@ -204,6 +210,7 @@ + @@ -221,6 +228,7 @@ + @@ -324,7 +332,7 @@ Level3 Disabled - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) + HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4267;4244 MultiThreadedDebug @@ -340,7 +348,7 @@ Level3 Disabled - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) + HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4267;4244 MultiThreadedDebug @@ -355,7 +363,7 @@ Level3 Disabled - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) + HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4267;4244 MultiThreadedDebug @@ -372,7 +380,7 @@ MaxSpeed true true - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) + HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4267;4244 MultiThreaded @@ -391,7 +399,7 @@ MaxSpeed true true - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) + HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4267;4244 MultiThreaded @@ -410,7 +418,7 @@ MaxSpeed true true - HAVE_CONFIG_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) + HAVE_ATEXIT;HAVE_ISATTY;HAVE_STDBOOL_H;HB_EXTERN=__declspec (dllexport) extern;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;HARFBUZZ_EXPORTS;%(PreprocessorDefinitions) $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) 4267;4244 MultiThreaded diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index db2adad40..44cc18857 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -23,9 +23,9 @@ variables: MONO_VERSION_MACOS: '6_12_7' MONO_VERSION_LINUX: '' XCODE_VERSION: 12.4 - DOTNET_VERSION_PREVIOUS: 3.1.410 - DOTNET_VERSION: 5.0.301 - DOTNET_VERSION_PREVIEW: 6.0.100-preview.7.21377.3 + DOTNET_VERSION_PREVIOUS: 3.1.412 + DOTNET_VERSION: 5.0.400 + DOTNET_VERSION_PREVIEW: 6.0.100-preview.7.21379.14 VS_VERSION_PREVIEW: 16/pre CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2019 @@ -37,7 +37,7 @@ variables: NUGET_DIFF_PRERELEASE: false ENABLE_CODE_COVERAGE: true EMSCRIPTEN_VERSION: 2.0.12 - XHARNESS_VERSION: 1.0.0-prerelease.21314.1 + XHARNESS_VERSION: 1.0.0-prerelease.21404.1 resources: repositories: diff --git a/scripts/install-maui.ps1 b/scripts/install-maui.ps1 index e470bf806..00580cafd 100644 --- a/scripts/install-maui.ps1 +++ b/scripts/install-maui.ps1 @@ -11,7 +11,6 @@ Write-Host "Installing maui-check..." Write-Host "Installing Maui..." & maui-check ` - --preview ` --verbose --ci --fix --non-interactive ` --skip androidsdk ` --skip xcode ` diff --git a/tests/Tests/HBBufferTest.cs b/tests/Tests/HBBufferTest.cs index 95321cccf..416225e68 100644 --- a/tests/Tests/HBBufferTest.cs +++ b/tests/Tests/HBBufferTest.cs @@ -9,7 +9,7 @@ namespace HarfBuzzSharp.Tests { private const string SimpleText = "1234"; - private const string SerializedSimpleText = "gid25=0+772|gid26=1+772|gid27=2+772|gid28=3+772"; + private const string SerializedSimpleText = "[gid25=0+772|gid26=1+772|gid27=2+772|gid28=3+772]"; [SkippableFact] public void ShouldHaveCorrectContentType()