[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/files/

[gentoo-commits] repo/gentoo:master commit in: sci-libs/gmsh/files/

[Andrew Ammerlaan]

commit:     4bf71f99aac901a36aa3aa609a3ce8ef69218b7b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Mar 13 10:07:24 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 09:59:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf71f99

sci-libs/gmsh: remove unused patch(es)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/24532
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch | 80 ------------------------------
 1 file changed, 80 deletions(-)

diff --git a/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch b/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch
deleted file mode 100644
index 3f16ef476d7f..000000000000
--- a/sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-https://gitlab.onelab.info/gmsh/gmsh/-/commit/e7cd675083f72c6c01701cb0f16d1639aca121ba
-https://bugs.gentoo.org/800536
-
-From: Tristan Carel <tristan.carel@epfl.ch>
-Date: Wed, 28 Jul 2021 10:55:40 +0200
-Subject: [PATCH] Fix symbol conflict in picojson with GCC 11 internal macro
-
-Build issue on MacOS with GCC 11 from brew:
-```
-/usr/local/Cellar/gcc/11.1.0_1/lib/gcc/11/gcc/x86_64-apple-darwin20/11.1.0/include/serializeintrin.h:37: note: macro "_serialize" defined here
-   37 | #define _serialize()    __builtin_ia32_serialize ()
-      |
-```
---- a/Common/picojson.h
-+++ b/Common/picojson.h
-@@ -186,8 +186,8 @@ public:
- private:
-   template <typename T> value(const T *); // intentionally defined to block implicit conversion of pointer to bool
-   template <typename Iter> static void _indent(Iter os, int indent);
--  template <typename Iter> void _serialize(Iter os, int indent) const;
--  std::string _serialize(int indent) const;
-+  template <typename Iter> void serialize_(Iter os, int indent) const;
-+  std::string serialize_(int indent) const;
-   void clear();
- };
- 
-@@ -549,11 +549,11 @@ template <typename Iter> void serialize_str(const std::string &s, Iter oi) {
- }
- 
- template <typename Iter> void value::serialize(Iter oi, bool prettify) const {
--  return _serialize(oi, prettify ? 0 : -1);
-+  return serialize_(oi, prettify ? 0 : -1);
- }
- 
- inline std::string value::serialize(bool prettify) const {
--  return _serialize(prettify ? 0 : -1);
-+  return serialize_(prettify ? 0 : -1);
- }
- 
- template <typename Iter> void value::_indent(Iter oi, int indent) {
-@@ -563,7 +563,7 @@ template <typename Iter> void value::_indent(Iter oi, int indent) {
-   }
- }
- 
--template <typename Iter> void value::_serialize(Iter oi, int indent) const {
-+template <typename Iter> void value::serialize_(Iter oi, int indent) const {
-   switch (type_) {
-   case string_type:
-     serialize_str(*u_.string_, oi);
-@@ -580,7 +580,7 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
-       if (indent != -1) {
-         _indent(oi, indent);
-       }
--      i->_serialize(oi, indent);
-+      i->serialize_(oi, indent);
-     }
-     if (indent != -1) {
-       --indent;
-@@ -608,7 +608,7 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
-       if (indent != -1) {
-         *oi++ = ' ';
-       }
--      i->second._serialize(oi, indent);
-+      i->second.serialize_(oi, indent);
-     }
-     if (indent != -1) {
-       --indent;
-@@ -628,9 +628,9 @@ template <typename Iter> void value::_serialize(Iter oi, int indent) const {
-   }
- }
- 
--inline std::string value::_serialize(int indent) const {
-+inline std::string value::serialize_(int indent) const {
-   std::string s;
--  _serialize(std::back_inserter(s), indent);
-+  serialize_(std::back_inserter(s), indent);
-   return s;
- }
- 
-GitLab