1 files changed, 62 insertions, 70 deletions
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index ad40b98753..1c6eb992f0 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -19,7 +19,7 @@ darwin: SHAPERS += coretext
 #SHAPERS += fallback
 
 DEFINES += HAVE_CONFIG_H
-DEFINES += HB_NO_UNICODE_FUNCS HB_DISABLE_DEPRECATED
+DEFINES += HB_NO_UNICODE_FUNCS
 DEFINES += HB_NDEBUG
 DEFINES += HB_EXTERN=
 
@@ -28,62 +28,60 @@ DEFINES += HAVE_ATEXIT
 unix: DEFINES += HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD
 win32: DEFINES += HB_NO_WIN1256
 
-#Workaround https://code.google.com/p/android/issues/detail?id=194631
-android: DEFINES += _POSIX_C_SOURCE=200112L
-
 # Harfbuzz-NG inside Qt uses the Qt atomics (inline code only)
 INCLUDEPATH += $$QT.core.includes
 DEFINES += QT_NO_VERSION_TAGGING
 
 SOURCES += \
+    $$PWD/src/hb-aat-layout.cc \
+    $$PWD/src/hb-aat-map.cc \
     $$PWD/src/hb-blob.cc \
     $$PWD/src/hb-buffer.cc \
     $$PWD/src/hb-buffer-serialize.cc \
-    $$PWD/src/hb-common.cc \
     $$PWD/src/hb-face.cc \
+    $$PWD/src/hb-fallback-shape.cc \
     $$PWD/src/hb-font.cc \
-    $$PWD/src/hb-ot-tag.cc \
+    $$PWD/src/hb-map.cc \
+    $$PWD/src/hb-number.cc \
     $$PWD/src/hb-set.cc \
     $$PWD/src/hb-shape.cc \
     $$PWD/src/hb-shape-plan.cc \
     $$PWD/src/hb-shaper.cc \
+    $$PWD/src/hb-subset.cc \
+    $$PWD/src/hb-subset-cff-common.cc \
+    $$PWD/src/hb-subset-cff1.cc \
+    $$PWD/src/hb-subset-cff2.cc \
+    $$PWD/src/hb-subset-input.cc \
+    $$PWD/src/hb-subset-plan.cc \
     $$PWD/src/hb-unicode.cc \
-    $$PWD/src/hb-warning.cc
+    $$PWD/hb-dummy.cc
+
+OTHER_FILES += \
+    $$PWD/src/harfbuzz.cc
 
 HEADERS += \
-    $$PWD/src/hb-atomic-private.hh \
-    $$PWD/src/hb-buffer-private.hh \
+    $$PWD/src/hb-atomic.hh \
+    $$PWD/src/hb-algs.hh \
+    $$PWD/src/hb-buffer.hh \
     $$PWD/src/hb-buffer-deserialize-json.hh \
     $$PWD/src/hb-buffer-deserialize-text.hh \
-    $$PWD/src/hb-cache-private.hh \
+    $$PWD/src/hb-cache.hh \
     $$PWD/src/hb-debug.hh \
-    $$PWD/src/hb-dsalgs.hh \
-    $$PWD/src/hb-face-private.hh \
-    $$PWD/src/hb-font-private.hh \
-    $$PWD/src/hb-mutex-private.hh \
-    $$PWD/src/hb-object-private.hh \
-    $$PWD/src/hb-open-file-private.hh \
-    $$PWD/src/hb-open-type-private.hh \
-    $$PWD/src/hb-ot-cbdt-table.hh \
-    $$PWD/src/hb-ot-cmap-table.hh \
-    $$PWD/src/hb-ot-glyf-table.hh \
-    $$PWD/src/hb-ot-head-table.hh \
-    $$PWD/src/hb-ot-hhea-table.hh \
-    $$PWD/src/hb-ot-hmtx-table.hh \
-    $$PWD/src/hb-ot-maxp-table.hh \
-    $$PWD/src/hb-ot-name-table.hh \
-    $$PWD/src/hb-ot-os2-table.hh \
-    $$PWD/src/hb-ot-post-table.hh \
-    $$PWD/src/hb-private.hh \
-    $$PWD/src/hb-set-digest-private.hh \
-    $$PWD/src/hb-set-private.hh \
-    $$PWD/src/hb-shape-plan-private.hh \
-    $$PWD/src/hb-shaper-impl-private.hh \
+    $$PWD/src/hb-face.hh \
+    $$PWD/src/hb-font.hh \
+    $$PWD/src/hb-mutex.hh \
+    $$PWD/src/hb-object.hh \
+    $$PWD/src/hb-open-file.hh \
+    $$PWD/src/hb-open-type.hh \
+    $$PWD/src/hb-set-digest.hh \
+    $$PWD/src/hb-set.hh \
+    $$PWD/src/hb-shape-plan.hh \
+    $$PWD/src/hb-shaper-impl.hh \
     $$PWD/src/hb-shaper-list.hh \
-    $$PWD/src/hb-shaper-private.hh \
+    $$PWD/src/hb-shaper.hh \
     $$PWD/src/hb-string-array.hh \
-    $$PWD/src/hb-unicode-private.hh \
-    $$PWD/src/hb-utf-private.hh
+    $$PWD/src/hb-unicode.hh \
+    $$PWD/src/hb-utf.hh
 
 HEADERS += \
     $$PWD/src/hb.h \
@@ -103,52 +101,67 @@ contains(SHAPERS, opentype) {
     DEFINES += HAVE_OT
 
     SOURCES += \
+        $$PWD/src/hb-ot-cff1-table.cc \
+        $$PWD/src/hb-ot-cff2-table.cc \
+        $$PWD/src/hb-ot-color.cc \
+        $$PWD/src/hb-ot-face.cc \
         $$PWD/src/hb-ot-font.cc \
         $$PWD/src/hb-ot-layout.cc \
         $$PWD/src/hb-ot-map.cc \
         $$PWD/src/hb-ot-math.cc \
+        $$PWD/src/hb-ot-meta.cc \
+        $$PWD/src/hb-ot-metrics.cc \
+        $$PWD/src/hb-ot-name.cc \
         $$PWD/src/hb-ot-shape.cc \
+        $$PWD/src/hb-ot-tag.cc \
         $$PWD/src/hb-ot-shape-complex-arabic.cc \
         $$PWD/src/hb-ot-shape-complex-default.cc \
         $$PWD/src/hb-ot-shape-complex-hangul.cc \
         $$PWD/src/hb-ot-shape-complex-hebrew.cc \
         $$PWD/src/hb-ot-shape-complex-indic.cc \
         $$PWD/src/hb-ot-shape-complex-indic-table.cc \
+        $$PWD/src/hb-ot-shape-complex-khmer.cc \
         $$PWD/src/hb-ot-shape-complex-myanmar.cc \
         $$PWD/src/hb-ot-shape-complex-thai.cc \
-        $$PWD/src/hb-ot-shape-complex-tibetan.cc \
         $$PWD/src/hb-ot-shape-complex-use.cc \
         $$PWD/src/hb-ot-shape-complex-use-table.cc \
+        $$PWD/src/hb-ot-shape-complex-vowel-constraints.cc \
         $$PWD/src/hb-ot-shape-fallback.cc \
         $$PWD/src/hb-ot-shape-normalize.cc \
-	$$PWD/src/hb-ot-var.cc
+        $$PWD/src/hb-ot-var.cc
 
     HEADERS += \
+        $$PWD/src/hb-ot-cmap-table.hh \
+        $$PWD/src/hb-ot-color-cbdt-table.hh \
+        $$PWD/src/hb-ot-glyf-table.hh \
+        $$PWD/src/hb-ot-head-table.hh \
+        $$PWD/src/hb-ot-hhea-table.hh \
+        $$PWD/src/hb-ot-hmtx-table.hh \
         $$PWD/src/hb-ot-kern-table.hh \
-        $$PWD/src/hb-ot-layout-common-private.hh \
+        $$PWD/src/hb-ot-layout.hh \
         $$PWD/src/hb-ot-layout-gdef-table.hh \
         $$PWD/src/hb-ot-layout-gpos-table.hh \
-        $$PWD/src/hb-ot-layout-gsubgpos-private.hh \
         $$PWD/src/hb-ot-layout-gsub-table.hh \
         $$PWD/src/hb-ot-layout-jstf-table.hh \
-        $$PWD/src/hb-ot-layout-math-table.hh \
-        $$PWD/src/hb-ot-layout-private.hh \
-        $$PWD/src/hb-ot-map-private.hh \
+        $$PWD/src/hb-ot-map.hh \
         $$PWD/src/hb-ot-math-table.hh \
+        $$PWD/src/hb-ot-maxp-table.hh \
+        $$PWD/src/hb-ot-name-table.hh \
+        $$PWD/src/hb-ot-os2-table.hh \
+        $$PWD/src/hb-ot-post-table.hh \
         $$PWD/src/hb-ot-post-macroman.hh \
+        $$PWD/src/hb-ot-shape.hh \
+        $$PWD/src/hb-ot-shape-complex-arabic.hh \
         $$PWD/src/hb-ot-shape-complex-arabic-fallback.hh \
-        $$PWD/src/hb-ot-shape-complex-arabic-private.hh \
         $$PWD/src/hb-ot-shape-complex-arabic-table.hh \
 #        $$PWD/src/hb-ot-shape-complex-arabic-win1256.hh \ # disabled with HB_NO_WIN1256
+        $$PWD/src/hb-ot-shape-complex-indic.hh \
         $$PWD/src/hb-ot-shape-complex-indic-machine.hh \
-        $$PWD/src/hb-ot-shape-complex-indic-private.hh \
         $$PWD/src/hb-ot-shape-complex-myanmar-machine.hh \
-        $$PWD/src/hb-ot-shape-complex-private.hh \
+        $$PWD/src/hb-ot-shape-complex-use.hh \
         $$PWD/src/hb-ot-shape-complex-use-machine.hh \
-        $$PWD/src/hb-ot-shape-complex-use-private.hh \
-        $$PWD/src/hb-ot-shape-fallback-private.hh \
-        $$PWD/src/hb-ot-shape-normalize-private.hh \
-        $$PWD/src/hb-ot-shape-private.hh \
+        $$PWD/src/hb-ot-shape-fallback.hh \
+        $$PWD/src/hb-ot-shape-normalize.hh \
         $$PWD/src/hb-ot-var-avar-table.hh \
         $$PWD/src/hb-ot-var-fvar-table.hh \
         $$PWD/src/hb-ot-var-hvar-table.hh \
@@ -160,30 +173,9 @@ contains(SHAPERS, opentype) {
         $$PWD/src/hb-ot-layout.h \
         $$PWD/src/hb-ot-math.h \
         $$PWD/src/hb-ot-shape.h \
-        $$PWD/src/hb-ot-tag.h \
         $$PWD/src/hb-ot-var.h
 }
 
-contains(SHAPERS, coretext) {
-    DEFINES += HAVE_CORETEXT
-
-    SOURCES += \
-        $$PWD/src/hb-coretext.cc
-
-    HEADERS += \
-        $$PWD/src/hb-coretext.h
-
-    uikit: \
-        # On iOS/tvOS/watchOS CoreText and CoreGraphics are stand-alone frameworks
-        LIBS_PRIVATE += -framework CoreText -framework CoreGraphics
-    else: \
-        # On Mac OS they are part of the ApplicationServices umbrella framework,
-        # even in 10.8 where they were also made available stand-alone.
-        LIBS_PRIVATE += -framework ApplicationServices
-
-    CONFIG += watchos_coretext
-}
-
 contains(SHAPERS, fallback)|isEmpty(SHAPERS) {
     DEFINES += HAVE_FALLBACK