diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-08-14 12:12:48 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-14 12:12:48 +0100 |
commit | b6323af2602e6a5cd4920d4af06b5c2f3949b9d0 (patch) | |
tree | 7d427f015930068f8d06e8f5aa622635ac3b61ca /dev-cpp/catch | |
parent | 4b61f038fc5ecca26609a997fcc662c7cf9e0498 (diff) |
gentoo auto-resync : 14:08:2023 - 12:12:48
Diffstat (limited to 'dev-cpp/catch')
-rw-r--r-- | dev-cpp/catch/Manifest | 1 | ||||
-rw-r--r-- | dev-cpp/catch/files/catch-3.0.1-gcc13.patch | 61 |
2 files changed, 0 insertions, 62 deletions
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest index e68f96ecbbd5..d386041fe624 100644 --- a/dev-cpp/catch/Manifest +++ b/dev-cpp/catch/Manifest @@ -1,6 +1,5 @@ AUX catch-1.12.2-glibc-2.34-sigstksz.patch 2667 BLAKE2B 890af64dcf7fb85d02a00d22b3c297ffcf6c6cc5ce4ef21310cdc030587cb2d26841040ae73a15bca0c86be1813de49667904648baf89df34779fb6e97b18e19 SHA512 bc524945b7570fad29482bafdc0f7d35a180dc3a000a5e2cdc14c5fbc54684cabfa0448d53418c122a99fca6955fda5afbac25c46fc1e7c6aa16f4ad687bac76 AUX catch-2.13.8-musl-tests.patch 854 BLAKE2B c593febfdd8d18912a0ceac2d63c3af21ed917df0b8ba416fe6d40adee5c2f5472c282e5c325fbd98ece23b27ef6b1975bfc4855808c8e7df86ee08c06a79845 SHA512 7a54bc2c06204203da6277866f793adcf14edcff915a12f3ad75b0b5d919dc06bcc5798188d3b002a0a872e2d8589178123c9960a25d0ff42b7be227be52fddf -AUX catch-3.0.1-gcc13.patch 3163 BLAKE2B a67e75852c879bddd585011c31a337f0d77edd85210726c573f16d9aae137edc260738e85d05ae1af8e46b2958126889e810865010c40fe083c6d260c6c8016d SHA512 654cc9ce82d07dacbf469e5d8a937343d9844c07b010332236ffdb11dc652dcf8dcaee00a877278aab00997386d2e6aec3cf10fbf04c2d65f6b2ab5d989029c1 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844 DIST Catch2-2.13.8.tar.gz 661711 BLAKE2B 973cc73c1d158140645003e76c0baf85a65252041fdcae3c6ecb1857021f2d24d8e879fec5f00368f4f458e69b450603a1613ac587417725980f1dbfe3ff2e65 SHA512 68a45efa47beb3c85d2d7b8a8eba89b8ec1664b4a72bb223227fef1632778aeaf5cf5cc09f40e47aef50426c8661c7d6a69c2dab0b88fbbf7d9a6b2974d6e32e DIST Catch2-3.4.0.tar.gz 1112790 BLAKE2B 0e3680b6e9d01d7661243097ec4a8e20d06a145acfe381cedc8eb2507c5df1bfb2b2907a9ae2771ffd94b66a0aa8f746aae4419ed4f469bea27c3bfca366ca3e SHA512 3b452378201ac53c9ffba7801231aa3b32c5fb496f01d670fcee25baf95f405e565ae2aafba49ea5694f906fc61a8b04592c68b9fb12839767070587a48c89fa 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> - |