summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2022-07-18 15:41:40 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2022-07-18 15:41:40 +0000
commit804f535c8409d1d45102157d3b27bea688a51b81 (patch)
tree67ab24045933228eaed0353a36f364002ed9243f /Build
parenta166e260c128434fabe0cf9b0d8765735e2e4517 (diff)
[Harfbuzz] Add and apply second patch for older g++.
Try to fix namespace/template conundrum around 'dispatch_recurse_func'. Note that the Harfbuzz code is absolutely horrible: Inside 'namespace OT' it says 'using Layout::GSUB::SubstLookup', but later it uses 'OT::SubstLookup'. What an utter mess! git-svn-id: svn://tug.org/texlive/trunk@63927 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/harfbuzz/TLpatches/0001-Fix-harfbuzz-4.4.1-for-older-g.patch (renamed from Build/source/libs/harfbuzz/TLpatches/0001-Fix-harfbuzz-4.4.1-for-older-g)4
-rw-r--r--Build/source/libs/harfbuzz/TLpatches/0002-Fix-dispatch_recurse_func-for-older-g.patch62
-rw-r--r--Build/source/libs/harfbuzz/TLpatches/ChangeLog6
3 files changed, 68 insertions, 4 deletions
diff --git a/Build/source/libs/harfbuzz/TLpatches/0001-Fix-harfbuzz-4.4.1-for-older-g b/Build/source/libs/harfbuzz/TLpatches/0001-Fix-harfbuzz-4.4.1-for-older-g.patch
index 7d1480a7a76..ed778de2df6 100644
--- a/Build/source/libs/harfbuzz/TLpatches/0001-Fix-harfbuzz-4.4.1-for-older-g
+++ b/Build/source/libs/harfbuzz/TLpatches/0001-Fix-harfbuzz-4.4.1-for-older-g.patch
@@ -1,7 +1,7 @@
-From c59b380364076c90aac01bc1a996e954cda5d6ab Mon Sep 17 00:00:00 2001
+From d4005a1970a82222198d0a106ee54a71707d059b Mon Sep 17 00:00:00 2001
From: Andreas Scherer <andreas_github@freenet.de>
Date: Sun, 17 Jul 2022 19:46:50 +0200
-Subject: [PATCH] Fix harfbuzz 4.4.1 for older g++.
+Subject: [PATCH 1/2] Fix harfbuzz 4.4.1 for older g++.
---
libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh | 15 +++++++++------
diff --git a/Build/source/libs/harfbuzz/TLpatches/0002-Fix-dispatch_recurse_func-for-older-g.patch b/Build/source/libs/harfbuzz/TLpatches/0002-Fix-dispatch_recurse_func-for-older-g.patch
new file mode 100644
index 00000000000..96104282eb9
--- /dev/null
+++ b/Build/source/libs/harfbuzz/TLpatches/0002-Fix-dispatch_recurse_func-for-older-g.patch
@@ -0,0 +1,62 @@
+From 72135e7c1af4812dc5e856d94ff1ba3fda867365 Mon Sep 17 00:00:00 2001
+From: Andreas Scherer <andreas_github@freenet.de>
+Date: Mon, 18 Jul 2022 17:24:20 +0200
+Subject: [PATCH 2/2] Fix 'dispatch_recurse_func' for older g++.
+
+---
+ libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gpos-table.hh | 6 +++++-
+ libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh | 7 +++++--
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gpos-table.hh b/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gpos-table.hh
+index 064d31cdf..59795cbba 100644
+--- a/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gpos-table.hh
++++ b/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gpos-table.hh
+@@ -35,6 +35,9 @@ namespace OT {
+
+ using Layout::GPOS_impl::PosLookup;
+
++namespace Layout {
++namespace GPOS_impl {
++
+ // TODO(garretrieger): Move into new layout directory.
+ /* Out-of-class implementation for methods recursing */
+ #ifndef HB_NO_OT_LAYOUT
+@@ -68,7 +71,8 @@ inline bool PosLookup::dispatch_recurse_func<hb_ot_apply_context_t> (hb_ot_apply
+ }
+ #endif
+
++} /* namespace GPOS_impl */
++} /* namespace Layout */
+ } /* namespace OT */
+
+-
+ #endif /* HB_OT_LAYOUT_GPOS_TABLE_HH */
+diff --git a/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh b/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh
+index 462542025..9e7f40c07 100644
+--- a/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh
++++ b/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh
+@@ -36,6 +36,9 @@ 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,8 +85,8 @@ inline bool SubstLookup::dispatch_recurse_func<hb_ot_apply_context_t> (hb_ot_app
+ }
+ #endif
+
+-
++} /* namespace GSUB */
++} /* namespace Layout */
+ } /* namespace OT */
+
+-
+ #endif /* HB_OT_LAYOUT_GSUB_TABLE_HH */
+--
+2.37.1
+
diff --git a/Build/source/libs/harfbuzz/TLpatches/ChangeLog b/Build/source/libs/harfbuzz/TLpatches/ChangeLog
index 8ff5918232d..0f4a2c04e81 100644
--- a/Build/source/libs/harfbuzz/TLpatches/ChangeLog
+++ b/Build/source/libs/harfbuzz/TLpatches/ChangeLog
@@ -1,6 +1,8 @@
-2022-07/18 Andreas Scherer <andreas_github@freenet.de>
+2022-07-18 Andreas Scherer <andreas_github@freenet.de>
- Add 0001-Fix-harfbuzz-4.4.1-for-older-g for older gcc.
+ * 0001-Fix-harfbuzz-4.4.1-for-older-g.patch,
+ * 0002-Fix-dispatch_recurse_func-for-older-g.patch:
+ Try to fix namespace/template conundrum for g++ 5 and 6.
2022-06-30 Akira Kakuto <kakuto@jcom.zaq.ne.jp>