diff options
Diffstat (limited to 'dev-cpp')
5 files changed, 0 insertions, 254 deletions
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest index f1bdb358c437..f38b35af77fe 100644 --- a/dev-cpp/nlohmann_json/Manifest +++ b/dev-cpp/nlohmann_json/Manifest @@ -1,5 +1,4 @@ DIST nlohmann_json-3.10.2.tar.gz 7054440 BLAKE2B e7da213fb75d528b1f5425822f5b598e882f232a67670aaae2d8f89c76e72ee23fa3344d1acfef2b0338a6a423d17b231b7e047ff064c984c2ec7783b721a22c SHA512 9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed -DIST nlohmann_json-3.11.2.tar.gz 8097673 BLAKE2B ebb67966739a330e0cfb8495a6eb58e87732655856a6d4e843072ed5e485cafbb8a75d8803859d0365b814deda7429448ecc473de414de4b23d3a3c455dc2511 SHA512 70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0 DIST nlohmann_json-3.11.3.tar.gz 8053705 BLAKE2B 872f67e44d3003c9d8c9e5ca4674a357883d7341e3943a7694812af8c853fe5da65fbbe0cc986b634c7cbca12082a064fcf8e40d4d06e6b990f031ea47c21db5 SHA512 7df19b621de34f08d5d5c0a25e8225975980841ef2e48536abcf22526ed7fb99f88ad954a2cb823115db59ccc88d1dbe74fe6c281b5644b976b33fb78db9d717 DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612e9a82efea2a3e5b1c15740c1c531d859e60dc5daeb85209b4fe363fd8fb84e3bbf01a2578c74538ba3e769726494047979f5a4d468d SHA512 d9af8419b837c592ec7519cd5772651c761078a9c43cf2a309cee55c323aee0df0c233fb58a07d5ee2e77492ac8b16398de234b387eae037a60e3c9ba5b08891 DIST nlohmann_json-testdata-3.1.0.tar.gz 115036393 BLAKE2B 809be0728a0b9d007fcc752911bdf6f7e548d6e3ec59871ea2b16d87d8248ca4dd2f681a1d0f82c618463294188ad41d6d965b8bdc39c70fdcf4b939d4121e9c SHA512 db6c411b37f2154f5dd1ed90f4e8fa0907f4a736cd0ff79943bcacf9da422285ff142bb6a7dc6022b236090083166ac1ab197be3f480d8dc50b26a91a9477821 diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13-2.patch b/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13-2.patch deleted file mode 100644 index a2931880dbcd..000000000000 --- a/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a49829bd984c0282be18fcec070df0c31bf77dd5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@gentoo.org> -Date: Tue, 21 Feb 2023 12:59:21 +0100 -Subject: [PATCH] tests/unit-iterators2: use std::ranges::equals for range - comparisons -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes a build error on GCC 13: - - /home/arsen/nlohmann_json/tests/src/unit-iterators2.cpp: In function ‘void _DOCTEST_ANON_FUNC_2()’: - /home/arsen/nlohmann_json/tests/src/unit-iterators2.cpp:946:32: error: no match for ‘operator==’ (operand types are ‘doctest::detail::Expression_lhs<std::ranges::reverse_view<std::ranges::ref_view<nlohmann::json_abi_v3_11_2::basic_json<> > >&>’ and ‘nlohmann::json_abi_v3_11_2::json’ {aka ‘nlohmann::json_abi_v3_11_2::basic_json<>’}) - 946 | CHECK(reversed == j_expected); - | ^~ ~~~~~~~~~~ - | | - | nlohmann::json_abi_v3_11_2::json {aka nlohmann::json_abi_v3_11_2::basic_json<>} - -Bug: https://bugs.gentoo.org/895692 -Closes: #3927 ---- -Forwarded: https://github.com/nlohmann/json/pull/3950 - - tests/src/unit-iterators2.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/src/unit-iterators2.cpp b/tests/src/unit-iterators2.cpp -index 27926084..72a5d9dc 100644 ---- a/tests/src/unit-iterators2.cpp -+++ b/tests/src/unit-iterators2.cpp -@@ -943,7 +943,7 @@ TEST_CASE("iterators 2") - json j_expected{5, 4, 3, 2, 1}; - - auto reversed = j | std::views::reverse; -- CHECK(reversed == j_expected); -+ CHECK(std::ranges::equal(reversed, j_expected)); - } - - SECTION("transform") --- -2.39.2 - diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch b/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch deleted file mode 100644 index 5205e67a3c2c..000000000000 --- a/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://github.com/nlohmann/json/issues/3927 -https://github.com/nlohmann/json/pull/3895 - -From a5b09d50b786638ed9deb09ef13860a3cb64eb6b Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyich@gmail.com> -Date: Tue, 20 Dec 2022 22:08:12 +0000 -Subject: [PATCH] custom allocators: define missing 'rebind' type - -`gcc-13` added an assert to standard headers to make sure custom -allocators have intended implementation of rebind type instead -of inherited rebind. gcc change: - https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7 - -Without the fix build fails on this week's `gcc-13` as: - - In file included from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34, - from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/basic_string.h:39, - from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/string:54, - from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/locale_classes.h:40, - from <<NIX>>-gcc-13.0.0/include/c++/13.0.0/locale:41, - from tests/src/unit-regression2.cpp:19: - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<my_allocator<unsigned char>, unsigned char, void>': - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11: required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = my_allocator<unsigned char>; _Up = unsigned char]' - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8: required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = my_allocator<unsigned char>]' - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits<my_allocator<unsigned char>, unsigned char>::rebind<unsigned char>' - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base<unsigned char, my_allocator<unsigned char> >' - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11: required from 'class std::vector<unsigned char, my_allocator<unsigned char> >' - tests/src/unit-regression2.cpp:807:63: required from here - <<NIX>>-gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A - 70 | _Tp>::value, - | ^~~~~ - -The change adds trivial `rebind` definition with expected return type -and satisfies conversion requirements. ---- a/tests/src/unit-allocator.cpp -+++ b/tests/src/unit-allocator.cpp -@@ -20,11 +20,20 @@ struct bad_allocator : std::allocator<T> - { - using std::allocator<T>::allocator; - -+ bad_allocator() = default; -+ template<class U> bad_allocator(const bad_allocator<U>& /*unused*/) { } -+ - template<class... Args> - void construct(T* /*unused*/, Args&& ... /*unused*/) - { - throw std::bad_alloc(); - } -+ -+ template <class U> -+ struct rebind -+ { -+ using other = bad_allocator<U>; -+ }; - }; - } // namespace - ---- a/tests/src/unit-regression2.cpp -+++ b/tests/src/unit-regression2.cpp -@@ -187,6 +187,15 @@ class my_allocator : public std::allocator<T> - { - public: - using std::allocator<T>::allocator; -+ -+ my_allocator() = default; -+ template<class U> my_allocator(const my_allocator<U>& /*unused*/) { } -+ -+ template <class U> -+ struct rebind -+ { -+ using other = my_allocator<U>; -+ }; - }; - - ///////////////////////////////////////////////////////////////////// - diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild deleted file mode 100644 index c99929f0867e..000000000000 --- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -#DOCS_BUILDER="mkdocs" -# Needs unpackaged plantuml-markdown too -# ... but plantuml (Python bindings anyway) need network access to generate bits at runtime. -#DOCS_DEPEND="dev-python/mkdocs-material-extensions dev-python/mkdocs-minify-plugin" -#DOCS_DIR="doc/mkdocs" -inherit cmake - -# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version -TEST_VERSION="3.1.0" -DESCRIPTION="JSON for Modern C++" -HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/" -SRC_URI=" - https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )" -S="${WORKDIR}/json-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DOCS=( ChangeLog.md README.md ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.11.2-gcc13.patch - "${FILESDIR}"/${PN}-3.11.2-gcc13-2.patch -) - -src_prepare() { - if use test ; then - ln -s "${WORKDIR}"/json_test_data-${TEST_VERSION} "${S}"/json_test_data || die - fi - - cmake_src_prepare -} - -src_configure() { - # Tests are built by default so we can't group the test logic below - local mycmakeargs=( - -DJSON_MultipleHeaders=ON - -DJSON_BuildTests=$(usex test) - ) - - # Define test data directory here to avoid unused var QA warning, bug #747826 - use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data ) - - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}"/tests || die - - # git_required: - # Skip certain tests needing git per upstream - # https://github.com/nlohmann/json/issues/2189 - # - # cmake_fetch_content_configure, cmake_fetch_content2_configure: - # Needs network (bug #865027, bug #865105) - local myctestargs=( - -E "(git_required|cmake_fetch_content_configure|cmake_fetch_content2_configure|cmake_fetch_content_build|cmake_fetch_content2_build)" - ) - - cmake_src_test -} diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild deleted file mode 100644 index 86bb5e2e2106..000000000000 --- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -#DOCS_BUILDER="mkdocs" -# Needs unpackaged plantuml-markdown too -# ... but plantuml (Python bindings anyway) need network access to generate bits at runtime. -#DOCS_DEPEND="dev-python/mkdocs-material-extensions dev-python/mkdocs-minify-plugin" -#DOCS_DIR="doc/mkdocs" -inherit cmake - -# Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version -TEST_VERSION="3.1.0" -DESCRIPTION="JSON for Modern C++" -HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/" -SRC_URI=" - https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/nlohmann/json_test_data/archive/v${TEST_VERSION}.tar.gz -> ${PN}-testdata-${TEST_VERSION}.tar.gz )" -S="${WORKDIR}/json-${PV}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DOCS=( ChangeLog.md README.md ) - -src_prepare() { - if use test ; then - ln -s "${WORKDIR}"/json_test_data-${TEST_VERSION} "${S}"/json_test_data || die - fi - - cmake_src_prepare -} - -src_configure() { - # Tests are built by default so we can't group the test logic below - local mycmakeargs=( - -DJSON_MultipleHeaders=ON - -DJSON_BuildTests=$(usex test) - ) - - # Define test data directory here to avoid unused var QA warning, bug #747826 - use test && mycmakeargs+=( -DJSON_TestDataDirectory="${S}"/json_test_data ) - - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}"/tests || die - - # git_required: - # Skip certain tests needing git per upstream - # https://github.com/nlohmann/json/issues/2189 - # - # cmake_fetch_content_configure, cmake_fetch_content2_configure: - # Needs network (bug #865027, bug #865105) - local myctestargs=( - -E "(git_required|cmake_fetch_content_configure|cmake_fetch_content2_configure|cmake_fetch_content_build|cmake_fetch_content2_build)" - ) - - cmake_src_test -} |