[Libreoffice-commits] core.git: 2 commits - configure.ac external/harfbuzz

[Libreoffice Gerrit user]

 configure.ac                                  |    2 -
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |    4 +++
 external/harfbuzz/harfbuzz-ios.patch          |   29 ++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit c5bef7505a6b761cf586abb4316776069ce0e887
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Aug 27 14:36:36 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Mon Aug 27 14:39:11 2018 +0300

    Disable mariadb for iOS, too
    
    Change-Id: Iee7b31f1b1a498b99f027cc9f5aeb60360213e51

diff --git a/configure.ac b/configure.ac
index 26f66b92d1a3..88571f0308f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8316,7 +8316,7 @@ AC_SUBST(PYTHON_VERSION_MAJOR)
 AC_SUBST(PYTHON_VERSION_MINOR)
 
 ENABLE_MARIADBC=TRUE
-if test "$_os" = "Android"; then
+if test "$_os" = "Android" -o "$_os" = "iOS"; then
     ENABLE_MARIADBC=
 fi
 MARIADBC_MAJOR=1
commit a6b5dda58ca2e7c52f946bba12e79780f9a1fd00
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Aug 27 13:54:00 2018 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Mon Aug 27 14:39:10 2018 +0300

    Make harfbuzz build for iOS
    
    Change-Id: Ifc28ac50a453eef8aa2f31d02ac513db0222eb4e

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)