diff options
| author | Tor Lillqvist <tml@iki.fi> | 2018-08-27 13:54:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2018-08-27 14:39:10 +0300 |
| commit | a6b5dda58ca2e7c52f946bba12e79780f9a1fd00 (patch) | |
| tree | c7feaf5230cbdc25d478911810e1f590f0c23ff1 /external | |
| parent | 91e6d9c757ee16a3219b57aca9b6b00b99a840f1 (diff) | |
Make harfbuzz build for iOS
Change-Id: Ifc28ac50a453eef8aa2f31d02ac513db0222eb4e
Diffstat (limited to 'external')
| -rw-r--r-- | external/harfbuzz/UnpackedTarball_harfbuzz.mk | 4 | ||||
| -rw-r--r-- | external/harfbuzz/harfbuzz-ios.patch | 29 |
2 files changed, 33 insertions, 0 deletions
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 74c990c0c1aa..3a20f31e101f 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -26,4 +26,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ )) endif +$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ + external/harfbuzz/harfbuzz-ios.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/harfbuzz/harfbuzz-ios.patch b/external/harfbuzz/harfbuzz-ios.patch new file mode 100644 index 000000000000..215800e5ab57 --- /dev/null +++ b/external/harfbuzz/harfbuzz-ios.patch @@ -0,0 +1,29 @@ +--- src/hb-coretext.cc ++++ src/hb-coretext.cc +@@ -167,7 +167,7 @@ + if (CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSText")) || + CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSDisplay"))) + { +-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080 ++#if !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1080) + # define kCTFontUIFontSystem kCTFontSystemFontType + # define kCTFontUIFontEmphasizedSystem kCTFontEmphasizedSystemFontType + #endif +@@ -217,7 +217,7 @@ + } + + CFURLRef original_url = nullptr; +-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 ++#if !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) + ATSFontRef atsFont; + FSRef fsref; + OSStatus status; +@@ -240,7 +240,7 @@ + * process in Blink. This can be detected by the new file URL location + * that the newly found font points to. */ + CFURLRef new_url = nullptr; +-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060 ++#if !defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) + atsFont = CTFontGetPlatformFont (new_ct_font, NULL); + status = ATSFontGetFileReference (atsFont, &fsref); + if (status == noErr) |