diff options
Diffstat (limited to 'dev-cpp/nlohmann_json')
| -rw-r--r-- | dev-cpp/nlohmann_json/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch | 131 | ||||
| -rw-r--r-- | dev-cpp/nlohmann_json/metadata.xml | 12 | ||||
| -rw-r--r-- | dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild | 45 | ||||
| -rw-r--r-- | dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild | 45 | ||||
| -rw-r--r-- | dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild | 49 |
6 files changed, 285 insertions, 0 deletions
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest new file mode 100644 index 000000000000..e64f5eccd1a1 --- /dev/null +++ b/dev-cpp/nlohmann_json/Manifest @@ -0,0 +1,3 @@ +DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a +DIST nlohmann_json-3.7.0.tar.gz 118868542 BLAKE2B 25191628b737ea5614de85d0fcb4425fcb2d37e6890626e6ba22949430a1c5f827ff17d1cd8245c8e98d0deda617d8268c55caff3017a6b4a2f730e524599311 SHA512 35510a0ee59d847ff9fcd4f4026ef936abb89675884fdd2db808f8349a55073206f764cd4f797deb1b6493ea0e04889505f49483e5b88798011dd5db87e7c87d +DIST nlohmann_json-3.7.3.tar.gz 119013476 BLAKE2B c10648cacdaf6f82aa2b1db49a412165eb9f3d00fd2b2232531077209c2add27dfebfb9dcd62e6923769411a471778a18a347b524e2ed3cf6f008883333ab8cd SHA512 c416b1e14f1fd695fc30a56127ca6440de4b334858ced54a6424d9d093e4665e74b7048f9ab7253ac02ac870e64a2868c78e6c2d6de80d1bd49e50a850cec865 diff --git a/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch b/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch new file mode 100644 index 000000000000..1cdb6d594eca --- /dev/null +++ b/dev-cpp/nlohmann_json/files/nlohmann_json-3.7.3-gcc-10.patch @@ -0,0 +1,131 @@ +From ec955f08b47ab7cb81f6e4a4c3e7b331ddf50f71 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com> +Date: Sun, 12 Apr 2020 22:32:39 +0300 +Subject: [PATCH 1/2] Templatize basic_json ctor from json_ref + +--- + include/nlohmann/detail/meta/type_traits.hpp | 13 ++++++++++++ + include/nlohmann/json.hpp | 8 ++++---- + single_include/nlohmann/json.hpp | 21 ++++++++++++++++---- + 3 files changed, 34 insertions(+), 8 deletions(-) + +diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp +index 280f69534..dd0b3084f 100644 +--- a/include/nlohmann/detail/meta/type_traits.hpp ++++ b/include/nlohmann/detail/meta/type_traits.hpp +@@ -41,6 +41,19 @@ template<typename> struct is_basic_json : std::false_type {}; + NLOHMANN_BASIC_JSON_TPL_DECLARATION + struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {}; + ++////////////////////// ++// jspn_ref helpers // ++////////////////////// ++ ++template <typename> ++class json_ref; ++ ++template<typename> ++struct is_json_ref : std::false_type {}; ++ ++template <typename T> ++struct is_json_ref<json_ref<T>> : std::true_type {}; ++ + ////////////////////////// + // aliases for detected // + ////////////////////////// +diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp +index 336d69fe7..0598efc8c 100644 +--- a/include/nlohmann/json.hpp ++++ b/include/nlohmann/json.hpp +@@ -1773,10 +1773,10 @@ class basic_json + // other constructors and destructor // + /////////////////////////////////////// + +- /// @private +- basic_json(const detail::json_ref<basic_json>& ref) +- : basic_json(ref.moved_or_copied()) +- {} ++ template <typename JsonRef, ++ detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>, ++ std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 > ++ basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {} + + /*! + @brief copy constructor +diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp +index 09464f3b2..8927180e6 100644 +--- a/single_include/nlohmann/json.hpp ++++ b/single_include/nlohmann/json.hpp +@@ -2794,6 +2794,19 @@ template<typename> struct is_basic_json : std::false_type {}; + NLOHMANN_BASIC_JSON_TPL_DECLARATION + struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {}; + ++////////////////////// ++// jspn_ref helpers // ++////////////////////// ++ ++template <typename> ++class json_ref; ++ ++template<typename> ++struct is_json_ref : std::false_type {}; ++ ++template <typename T> ++struct is_json_ref<json_ref<T>> : std::true_type {}; ++ + ////////////////////////// + // aliases for detected // + ////////////////////////// +@@ -16632,10 +16645,10 @@ class basic_json + // other constructors and destructor // + /////////////////////////////////////// + +- /// @private +- basic_json(const detail::json_ref<basic_json>& ref) +- : basic_json(ref.moved_or_copied()) +- {} ++ template <typename JsonRef, ++ detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>, ++ std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 > ++ basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {} + + /*! + @brief copy constructor + +From 70be9751cd60e622ce6463f41d47c02fc2d83cbc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com> +Date: Sun, 12 Apr 2020 23:42:26 +0300 +Subject: [PATCH 2/2] typo fix + +--- + include/nlohmann/detail/meta/type_traits.hpp | 2 +- + single_include/nlohmann/json.hpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp +index dd0b3084f..13e92cb48 100644 +--- a/include/nlohmann/detail/meta/type_traits.hpp ++++ b/include/nlohmann/detail/meta/type_traits.hpp +@@ -42,7 +42,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION + struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {}; + + ////////////////////// +-// jspn_ref helpers // ++// json_ref helpers // + ////////////////////// + + template <typename> +diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp +index 8927180e6..294e7509b 100644 +--- a/single_include/nlohmann/json.hpp ++++ b/single_include/nlohmann/json.hpp +@@ -2795,7 +2795,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION + struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {}; + + ////////////////////// +-// jspn_ref helpers // ++// json_ref helpers // + ////////////////////// + + template <typename> + diff --git a/dev-cpp/nlohmann_json/metadata.xml b/dev-cpp/nlohmann_json/metadata.xml new file mode 100644 index 000000000000..99a2fc432801 --- /dev/null +++ b/dev-cpp/nlohmann_json/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>media-video@gentoo.org</email> + <name>Gentoo Video project</name> + </maintainer> + <upstream> + <remote-id type="github">nlohmann/json</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata> diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild new file mode 100644 index 000000000000..3f251a81fd24 --- /dev/null +++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +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" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND="doc? ( app-doc/doxygen )" + +DOCS=( ChangeLog.md README.md ) + +S=${WORKDIR}/json-${PV} + +src_configure() { + local mycmakeargs=( + -DJSON_BuildTests=$(usex test) + -DJSON_MultipleHeaders=ON + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && emake -C doc +} + +src_test() { + emake check +} + +src_install() { + cmake_src_install + use doc && dodoc -r doc/html +} diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild new file mode 100644 index 000000000000..6c95f15b7348 --- /dev/null +++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +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" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND="doc? ( app-doc/doxygen )" + +DOCS=( ChangeLog.md README.md ) + +S=${WORKDIR}/json-${PV} + +src_configure() { + local mycmakeargs=( + -DJSON_BuildTests=$(usex test) + -DJSON_MultipleHeaders=ON + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && emake -C doc +} + +src_test() { + emake check +} + +src_install() { + cmake_src_install + use doc && dodoc -r doc/html +} diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild new file mode 100644 index 000000000000..c99fd51237eb --- /dev/null +++ b/dev-cpp/nlohmann_json/nlohmann_json-3.7.3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +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" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND="doc? ( app-doc/doxygen )" + +DOCS=( ChangeLog.md README.md ) + +S=${WORKDIR}/json-${PV} + +PATCHES=( + "${FILESDIR}"/${PN}-3.7.3-gcc-10.patch +) + +src_configure() { + local mycmakeargs=( + -DJSON_BuildTests=$(usex test) + -DJSON_MultipleHeaders=ON + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && emake -C doc +} + +src_test() { + emake check +} + +src_install() { + cmake_src_install + use doc && dodoc -r doc/html +} |