summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2022-03-13 11:07:24 +0100
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2022-03-26 10:59:13 +0100
commit4bf71f99aac901a36aa3aa609a3ce8ef69218b7b (patch)
tree401df8cb4154430f93327144e2a6e1ee3b5c2df5 /sci-libs/gmsh
parentwww-client/chromium: stable channel bump to 99.0.4844.84 (diff)
downloadgentoo-4bf71f99aac901a36aa3aa609a3ce8ef69218b7b.tar.gz
gentoo-4bf71f99aac901a36aa3aa609a3ce8ef69218b7b.tar.bz2
gentoo-4bf71f99aac901a36aa3aa609a3ce8ef69218b7b.zip
sci-libs/gmsh: remove unused patch(es)
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/24532 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sci-libs/gmsh')
-rw-r--r--sci-libs/gmsh/files/gmsh-4.8.4-gcc11.patch80
1 files changed, 0 insertions, 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