summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2022-07-17 21:34:54 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2022-07-17 21:34:54 +0000
commit1b8f84bcdb1627fd80d28eded151948c504f0812 (patch)
treeafe7c60df2b2a750d5f93b95062fbda5f0678e5a /Build/source
parentea754d8138c914e69555b2cf181ac05cdbe9b8fd (diff)
harfbuzz: add a patch for older gcc (Andreas Scherer)
git-svn-id: svn://tug.org/texlive/trunk@63923 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/libs/harfbuzz/ChangeLog4
-rw-r--r--Build/source/libs/harfbuzz/TLpatches/0001-Fix-harfbuzz-4.4.1-for-older-g52
-rw-r--r--Build/source/libs/harfbuzz/TLpatches/ChangeLog4
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-cplusplus.hh15
4 files changed, 69 insertions, 6 deletions
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 <andreas_github@freenet.de>
+
+ Add a patch 0001-Fix-harfbuzz-4.4.1-for-older-g for older gcc.
+
2022-06-30 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
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 <andreas_github@freenet.de>
+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<typename T>
+-struct std::hash<hb::shared_ptr<T>>
++struct hash<hb::shared_ptr<T>>
+ {
+- std::size_t operator()(const hb::shared_ptr<T>& v) const noexcept
++ size_t operator()(const hb::shared_ptr<T>& v) const noexcept
+ {
+- std::size_t h = std::hash<decltype (v.get ())>{}(v.get ());
++ size_t h = hash<decltype (v.get ())>{}(v.get ());
+ return h;
+ }
+ };
+
+ template<typename T>
+-struct std::hash<hb::unique_ptr<T>>
++struct hash<hb::unique_ptr<T>>
+ {
+- std::size_t operator()(const hb::unique_ptr<T>& v) const noexcept
++ size_t operator()(const hb::unique_ptr<T>& v) const noexcept
+ {
+- std::size_t h = std::hash<decltype (v.get ())>{}(v.get ());
++ size_t h = hash<decltype (v.get ())>{}(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 <andreas_github@freenet.de>
+
+ Add 0001-Fix-harfbuzz-4.4.1-for-older-g for older gcc.
+
2022-06-30 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
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<typename T>
-struct std::hash<hb::shared_ptr<T>>
+struct hash<hb::shared_ptr<T>>
{
- std::size_t operator()(const hb::shared_ptr<T>& v) const noexcept
+ size_t operator()(const hb::shared_ptr<T>& v) const noexcept
{
- std::size_t h = std::hash<decltype (v.get ())>{}(v.get ());
+ size_t h = hash<decltype (v.get ())>{}(v.get ());
return h;
}
};
template<typename T>
-struct std::hash<hb::unique_ptr<T>>
+struct hash<hb::unique_ptr<T>>
{
- std::size_t operator()(const hb::unique_ptr<T>& v) const noexcept
+ size_t operator()(const hb::unique_ptr<T>& v) const noexcept
{
- std::size_t h = std::hash<decltype (v.get ())>{}(v.get ());
+ size_t h = hash<decltype (v.get ())>{}(v.get ());
return h;
}
};
+} // namespace std
#endif /* __cplusplus */