|
@@ -0,0 +1,56 @@
|
|
|
+From 79eb0f74860fb6309e3162b4f17f98481c05a318 Mon Sep 17 00:00:00 2001
|
|
|
+From: Kleis Auke Wolthuizen <github@kleisauke.nl>
|
|
|
+Date: Wed, 6 Jul 2022 13:29:55 +0200
|
|
|
+Subject: [PATCH] [GSUB] Fix build on GCC < 7
|
|
|
+
|
|
|
+[Retrieved (and backported) from:
|
|
|
+https://github.com/harfbuzz/harfbuzz/commit/79eb0f74860fb6309e3162b4f17f98481c05a318]
|
|
|
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
|
+---
|
|
|
+ src/OT/Layout/GSUB/GSUB.hh | 5 +++--
|
|
|
+ src/hb-ot-layout-gsub-table.hh | 8 ++++----
|
|
|
+ 2 files changed, 7 insertions(+), 6 deletions(-)
|
|
|
+
|
|
|
+diff --git a/src/OT/Layout/GSUB/GSUB.hh b/src/OT/Layout/GSUB/GSUB.hh
|
|
|
+index 372862e2bb..750dca1da3 100644
|
|
|
+--- a/src/OT/Layout/GSUB/GSUB.hh
|
|
|
++++ b/src/OT/Layout/GSUB/GSUB.hh
|
|
|
+@@ -5,9 +5,10 @@
|
|
|
+ #include "Common.hh"
|
|
|
+ #include "SubstLookup.hh"
|
|
|
+
|
|
|
+-using OT::Layout::GSUB::SubstLookup;
|
|
|
+-
|
|
|
+ namespace OT {
|
|
|
++
|
|
|
++using Layout::GSUB::SubstLookup;
|
|
|
++
|
|
|
+ namespace Layout {
|
|
|
+
|
|
|
+ /*
|
|
|
+diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh
|
|
|
+index 1eca613b6a..50301ff1d9 100644
|
|
|
+--- a/src/hb-ot-layout-gsub-table.hh
|
|
|
++++ b/src/hb-ot-layout-gsub-table.hh
|
|
|
+@@ -32,9 +32,8 @@
|
|
|
+ #include "OT/Layout/GSUB/GSUB.hh"
|
|
|
+
|
|
|
+ namespace OT {
|
|
|
+-
|
|
|
+-using Layout::GSUB::SubstLookup;
|
|
|
+-using Layout::GSUB::ExtensionSubst;
|
|
|
++namespace Layout {
|
|
|
++namespace GSUB {
|
|
|
+
|
|
|
+ // TODO(garretrieger): Move into the new layout directory.
|
|
|
+ /* Out-of-class implementation for methods recursing */
|
|
|
+@@ -82,7 +81,8 @@ inline bool SubstLookup::dispatch_recurse_func<hb_ot_apply_context_t> (hb_ot_app
|
|
|
+ }
|
|
|
+ #endif
|
|
|
+
|
|
|
+-
|
|
|
++} /* namespace GSUB */
|
|
|
++} /* namespace Layout */
|
|
|
+ } /* namespace OT */
|
|
|
+
|
|
|
+
|