From 1b8f84bcdb1627fd80d28eded151948c504f0812 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Sun, 17 Jul 2022 21:34:54 +0000 Subject: harfbuzz: add a patch for older gcc (Andreas Scherer) git-svn-id: svn://tug.org/texlive/trunk@63923 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/harfbuzz/ChangeLog | 4 ++ .../TLpatches/0001-Fix-harfbuzz-4.4.1-for-older-g | 52 ++++++++++++++++++++++ Build/source/libs/harfbuzz/TLpatches/ChangeLog | 4 ++ .../libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh | 15 ++++--- 4 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 Build/source/libs/harfbuzz/TLpatches/0001-Fix-harfbuzz-4.4.1-for-older-g (limited to 'Build/source/libs/harfbuzz') diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index 613b395353d..6e5f3ce6239 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,7 @@ +2022-07/18 Andreas Scherer + + Add a patch 0001-Fix-harfbuzz-4.4.1-for-older-g for older gcc. + 2022-06-30 Akira Kakuto Import harfbuzz-4.4.1. 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 new file mode 100644 index 00000000000..7d1480a7a76 --- /dev/null +++ b/Build/source/libs/harfbuzz/TLpatches/0001-Fix-harfbuzz-4.4.1-for-older-g @@ -0,0 +1,52 @@ +From c59b380364076c90aac01bc1a996e954cda5d6ab Mon Sep 17 00:00:00 2001 +From: Andreas Scherer +Date: Sun, 17 Jul 2022 19:46:50 +0200 +Subject: [PATCH] Fix harfbuzz 4.4.1 for older g++. + +--- + libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh b/libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh +index 86d045208..c79d15506 100644 +--- a/libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh ++++ b/libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh +@@ -166,26 +166,29 @@ HB_DEFINE_VTABLE (unicode_funcs); + + } // namespace hb + ++namespace std { ++ + template +-struct std::hash> ++struct hash> + { +- std::size_t operator()(const hb::shared_ptr& v) const noexcept ++ size_t operator()(const hb::shared_ptr& v) const noexcept + { +- std::size_t h = std::hash{}(v.get ()); ++ size_t h = hash{}(v.get ()); + return h; + } + }; + + template +-struct std::hash> ++struct hash> + { +- std::size_t operator()(const hb::unique_ptr& v) const noexcept ++ size_t operator()(const hb::unique_ptr& v) const noexcept + { +- std::size_t h = std::hash{}(v.get ()); ++ size_t h = hash{}(v.get ()); + return h; + } + }; + ++} // namespace std + + #endif /* __cplusplus */ + +-- +2.37.1 + diff --git a/Build/source/libs/harfbuzz/TLpatches/ChangeLog b/Build/source/libs/harfbuzz/TLpatches/ChangeLog index fe4d45965c5..8ff5918232d 100644 --- a/Build/source/libs/harfbuzz/TLpatches/ChangeLog +++ b/Build/source/libs/harfbuzz/TLpatches/ChangeLog @@ -1,3 +1,7 @@ +2022-07/18 Andreas Scherer + + Add 0001-Fix-harfbuzz-4.4.1-for-older-g for older gcc. + 2022-06-30 Akira Kakuto Imported harfbuzz-4.4.1 source tree from: diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh index 86d04520800..c79d1550649 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh @@ -166,26 +166,29 @@ HB_DEFINE_VTABLE (unicode_funcs); } // namespace hb +namespace std { + template -struct std::hash> +struct hash> { - std::size_t operator()(const hb::shared_ptr& v) const noexcept + size_t operator()(const hb::shared_ptr& v) const noexcept { - std::size_t h = std::hash{}(v.get ()); + size_t h = hash{}(v.get ()); return h; } }; template -struct std::hash> +struct hash> { - std::size_t operator()(const hb::unique_ptr& v) const noexcept + size_t operator()(const hb::unique_ptr& v) const noexcept { - std::size_t h = std::hash{}(v.get ()); + size_t h = hash{}(v.get ()); return h; } }; +} // namespace std #endif /* __cplusplus */ -- cgit v1.2.3