summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2023-08-13 15:35:43 +0200
committerConrad Kostecki <conikost@gentoo.org>2023-08-14 07:57:41 +0200
commit0ae599c3f2e22102e1244750e2e4df0517c1cdab (patch)
tree8c2c26fd092f5025dbb9fc2b840176a0563a50c9 /dev-cpp/catch/files
parentapp-misc/jq: remove unused patch (diff)
downloadgentoo-0ae599c3f2e22102e1244750e2e4df0517c1cdab.tar.gz
gentoo-0ae599c3f2e22102e1244750e2e4df0517c1cdab.tar.bz2
gentoo-0ae599c3f2e22102e1244750e2e4df0517c1cdab.zip
dev-cpp/catch: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/32291 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'dev-cpp/catch/files')
-rw-r--r--dev-cpp/catch/files/catch-3.0.1-gcc13.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/dev-cpp/catch/files/catch-3.0.1-gcc13.patch b/dev-cpp/catch/files/catch-3.0.1-gcc13.patch
deleted file mode 100644
index 88431c2704d6..000000000000
--- a/dev-cpp/catch/files/catch-3.0.1-gcc13.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://github.com/catchorg/Catch2/pull/2611
-
-From 12a93b20b9aec1df537781c9c0712ec24d31d739 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 8 Jan 2023 02:03:32 +0000
-Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
-
-GCC 13 (as usual for new compiler releases) shuffles around some
-internal includes and so <cstdint> is no longer transitively included.
-
-Explicitly include <cstdint> for uint64_t.
-
-```
-FAILED: src/CMakeFiles/Catch2.dir/catch2/internal/catch_clara.cpp.o
-/usr/lib/ccache/bin/g++-13 -I/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1/src/catch2/.. -I/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1_build/generated-includes -O2 -pipe
--march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type -D_GLIBCXX_ASSERTIONS -ggdb3 -fdiagnostics-color=always
--ffile-prefix-map=/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1=. -Wall -Wc++20-compat -Wcast-align -Wcatch-value -Wdeprecated -Wexceptions -Wextra -Wextra-semi -Wfloat-equal -Winit-self
--Wmisleading-indentation -Wmismatched-new-delete -Wmismatched-tags -Wmissing-braces -Wmissing-declarations -Wmissing-noreturn -Wnull-dereference -Wold-style-cast -Woverloaded-virtual -Wparentheses
--Wpedantic -Wreorder -Wshadow -Wstrict-aliasing -Wsuggest-override -Wundef -Wuninitialized -Wunreachable-code -Wunused -Wunused-function -Wunused-parameter -Wvla -MD -MT
-src/CMakeFiles/Catch2.dir/catch2/internal/catch_clara.cpp.o -MF src/CMakeFiles/Catch2.dir/catch2/internal/catch_clara.cpp.o.d -o src/CMakeFiles/Catch2.dir/catch2/internal/catch_clara.cpp.o -c
-/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1/src/catch2/internal/catch_clara.cpp
-In file included from /var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1/src/catch2/internal/catch_clara.cpp:12:
-/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1/src/catch2/../catch2/internal/catch_string_manip.hpp:47:14: error: 'uint64_t' in namespace 'std' does not name a type; did you mean 'wint_t'?
- 47 | std::uint64_t m_count;
- | ^~~~~~~~
- | wint_t
-/var/tmp/portage/dev-cpp/catch-3.0.1/work/Catch2-3.0.1/src/catch2/../catch2/internal/catch_string_manip.hpp:51:42: error: expected ')' before 'count'
- 51 | constexpr pluralise(std::uint64_t count, StringRef label):
- | ~ ^~~~~~
- | )
-```
---- a/src/catch2/catch_test_case_info.hpp
-+++ b/src/catch2/catch_test_case_info.hpp
-@@ -15,6 +15,7 @@
- #include <catch2/internal/catch_unique_ptr.hpp>
-
-
-+#include <cstdint>
- #include <string>
- #include <vector>
-
---- a/src/catch2/internal/catch_string_manip.hpp
-+++ b/src/catch2/internal/catch_string_manip.hpp
-@@ -10,6 +10,7 @@
-
- #include <catch2/internal/catch_stringref.hpp>
-
-+#include <cstdint>
- #include <string>
- #include <iosfwd>
- #include <vector>
---- a/src/catch2/internal/catch_xmlwriter.cpp
-+++ b/src/catch2/internal/catch_xmlwriter.cpp
-@@ -11,6 +11,7 @@
- #include <catch2/internal/catch_enforce.hpp>
- #include <catch2/internal/catch_xmlwriter.hpp>
-
-+#include <cstdint>
- #include <iomanip>
- #include <type_traits>
-