diff options
Diffstat (limited to 'dev-cpp/catch')
| -rw-r--r-- | dev-cpp/catch/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/catch/catch-3.0.1.ebuild | 6 | ||||
| -rw-r--r-- | dev-cpp/catch/files/catch-3.0.1-gcc13.patch | 61 |
3 files changed, 68 insertions, 2 deletions
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest index b7041bd67022..d17cfddad267 100644 --- a/dev-cpp/catch/Manifest +++ b/dev-cpp/catch/Manifest @@ -1,11 +1,12 @@ 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.0.1.tar.gz 1020413 BLAKE2B 91c207bb67b9d97191fcd5b3f50df66c7d671aabb4deb989b6d838eba205e981d6dc51fb82d7c13d65751746215abc769a0274da9ee0512a53c4afbeb3540efb SHA512 065094c19cdf98b40f96a390e887542f895495562a91cdc28d68ce03690866d846ec87d320405312a2b97eacaa5351d3e55f0012bb9de40073c8d4444d82b0a1 EBUILD catch-1.12.2-r1.ebuild 896 BLAKE2B 185ad88f37e5fc1b66d865be02c20989fd215c5ff50a63c6e91ea3fdc1af497b1f499693e24e66b980c367d387aaa328feffb3e11a37513e0191a43236e6c0d8 SHA512 b076e9b7b233dd067b55592382798d7ad7a85666e46a287ba5de688cbbedc9c6226b39a5c448821bb2fb6ba90c654cb33d111aded9e4a38d82d8d3f402bae1f2 EBUILD catch-1.9999.ebuild 794 BLAKE2B 905f186ecb29ac1d24caeb62b50c3d2fa9f66753a5e67dafe629a0e75dd1f97e59bf9296e3ecbec7e9dfe40ea7f3ceabb892a2397dc920ab021ffdf356b17aa7 SHA512 3f19e38f17bdda9dec4362ac063f1d542b7d97bce48e0c854a8adf4aba12cd745c2dda6be6f2cddc5ef0b93d4eb72bdf09a14ab66764fc78c6330d3da5d5b01e EBUILD catch-2.13.8.ebuild 1012 BLAKE2B be333f775e98a1f82628a9183e10ac4cc5a6dbc1c334c8884f5873088d4d8af2de91bec3676eb898876cd6e667d6ef9b1a14a12147f12c34a1eb50ec1b77df7b SHA512 00fc4467df4a80b480262b0b8b07ab8867a42318fd574519a883bf5b4f10c65234ab14cfe71d00dd2ce75ae6dc47977fef3c625d449950bef905b22971a6c983 -EBUILD catch-3.0.1.ebuild 995 BLAKE2B b22d59ee9a26e08a4b5b904852f31cab4a667e275f8e7bb34c26030f0d1d49a49c4965b7e1c26f7ee3194d79a93bc903e31effd42991e6c4d9e7c18b6cfa9f48 SHA512 81705c11ce090836a3d4ecca1189349a84a4720ff824936bf870c45a4f59d950d1e355dd16d2af855f2dd1c6d21b8fdd83f7e6c3237986b0a2fa0873f240859e +EBUILD catch-3.0.1.ebuild 1047 BLAKE2B 76b6c9cb867584c112199270c2fcb9db56e224ac732acdc844af73c14b0475735d0f7907c07e05c76e57bd1c71606012199f37ccf0ca6192aca118a901f93252 SHA512 c0b1b10af087a47ad654ee5ab72c50e6fdec1330f0bfe59aa4470e111a612917aa36abee31648ca47b4c01871da08b377538d751689a67abcb1f578084e73599 EBUILD catch-9999.ebuild 1001 BLAKE2B 1b889c57cfbffa4b0afb68c8945bc682ac857a3201a0a2870a8fb8412dd386e2af5a6f4cabcaeab9baeffb18f869033d4c22468b5e9b68c6005de1e1f5ac1757 SHA512 885f95f3d4d569e754e7c9579e432c8a2e78998d9ff1121dbbbdd5d2d9755778fd210f0337421c382c4125ddb42284c763993c78fef86ee1e919c56c5e56f6bb MISC metadata.xml 325 BLAKE2B 170690d843389d8befc37befe36d57a20f791f6520a08a8eafae196c6ada323a9afb00f58b55d0df30aa67f3e96430a46c3ee0355911b2289056e8bed48509ff SHA512 d2e3d74294189b3c639a16084b7a3745af6854f295c529fc2dc76d05ed6d7ac7e84c8a760f47f07f0744cdd257b5bf851a900ae48482efceea4a8d6ac6ace7c4 diff --git a/dev-cpp/catch/catch-3.0.1.ebuild b/dev-cpp/catch/catch-3.0.1.ebuild index 7a139467f1bb..f9a931f7a5ff 100644 --- a/dev-cpp/catch/catch-3.0.1.ebuild +++ b/dev-cpp/catch/catch-3.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,6 +28,10 @@ RESTRICT="!test? ( test )" BDEPEND="test? ( ${PYTHON_DEPS} )" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.1-gcc13.patch +) + pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/dev-cpp/catch/files/catch-3.0.1-gcc13.patch b/dev-cpp/catch/files/catch-3.0.1-gcc13.patch new file mode 100644 index 000000000000..88431c2704d6 --- /dev/null +++ b/dev-cpp/catch/files/catch-3.0.1-gcc13.patch @@ -0,0 +1,61 @@ +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> + |