[gentoo-commits] repo/gentoo:master commit in: dev-cpp/nlohmann_json/files/, dev-cpp/nlohmann_json/

[Sam James]

commit:     b9ebc9717b4378c3bc28b82dfe4cfc268de4d4e3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 04:39:00 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 04:39:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ebc971

dev-cpp/nlohmann_json: (partially) fix build w/ gcc 13

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/nlohmann_json-3.11.2-gcc13.patch         | 76 ++++++++++++++++++++++
 .../nlohmann_json/nlohmann_json-3.11.2-r1.ebuild   | 69 ++++++++++++++++++++
 2 files changed, 145 insertions(+)

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
new file mode 100644
index 000000000000..5205e67a3c2c
--- /dev/null
+++ b/dev-cpp/nlohmann_json/files/nlohmann_json-3.11.2-gcc13.patch
@@ -0,0 +1,76 @@
+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@×××××.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
new file mode 100644
index 000000000000..a3d79580696a
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.2-r1.ebuild
@@ -0,0 +1,69 @@
+# 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 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS=( ChangeLog.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.11.2-gcc13.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
+}