diff options
Diffstat (limited to 'dev-libs/rapidjson')
| -rw-r--r-- | dev-libs/rapidjson/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/rapidjson/files/rapidjson-1.1.0-gcc14-const.patch | 20 | ||||
| -rw-r--r-- | dev-libs/rapidjson/rapidjson-1.1.0-r4.ebuild | 59 | ||||
| -rw-r--r-- | dev-libs/rapidjson/rapidjson-9999.ebuild | 20 |
4 files changed, 92 insertions, 11 deletions
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest index 789ac075aaa6..d93a47b864a0 100644 --- a/dev-libs/rapidjson/Manifest +++ b/dev-libs/rapidjson/Manifest @@ -1,8 +1,10 @@ AUX rapidjson-1.1.0-gcc-7.patch 1393 BLAKE2B 71affc72ebbf714788e243b75f9157e9423dcc34eb43efb3479125e2e269c6fcdcfc4d9e9334979b3f5463d97e241dfa3f335d893729282109ce6c768023ec92 SHA512 4f24f37a3c106698b871438675f2b06f2389d724ab8484a616586b5810aec5d8bd11eed759772affa627493314d3f47757af3a54519f3659df1d218cd12c3cd9 +AUX rapidjson-1.1.0-gcc14-const.patch 799 BLAKE2B 877a9d1a0c0234c87102c4796553f3d9334946ac07f0eaa5e347d533cd586485f7ac29e25b6401afd0d388f16ea4319828320f640b3ed1944014b6de03f34661 SHA512 da5868dcc910c55614532a54181a6d545854a83423b21e0e969b213cc3549a14fa999b5af49285a196b9da8aacfe02663af53b366838003cdb2511d65db56a87 AUX rapidjson-1.1.0-system_gtest.patch 1274 BLAKE2B 69e69c60b5a2d2e913e1bf64cc62a5a1f6d3e3089be292d5d24a9ead77b58a714fa5e14ead14c091405575353bbe1bbd195c4fb29a81fa4012354c628ad50eba SHA512 456fafdc4b27b7df2ff243d6a8492a4e3f0d4076dc4a04c8d2c79e1757846070bccb6298dd07213ecc2e29a16bbe9f73126f429e36b4d2145d2a783dab664511 AUX rapidjson-1.1.0-valgrind_optional.patch 816 BLAKE2B 95dc0748bad3042ac912ab57d423ada4c8ce3e19fb8a1b3fb2e9a0b9958355c5dd29325e3b238a34f9fe5ec1b6dbf7ba51e836211d1e9e1644f6ea2fddedbbd2 SHA512 b4841d4f7f19e264950fc56a0521bcf4268b8ab23c806d02cefe21d9f937eee90d9a7bb53e4522f24729a08d800e46b2a41be6d613ea2f06166b42eafafb315c AUX rapidjson-1.1.1-valgrind_optional.patch 870 BLAKE2B 6a08f2d33af7e29a60452d3cd9816b38b42a37e405997bb558481066af41244e15e9f1e2a3a2f50b9efbd2414b4e76d45507e58beeb811b82d9e6c47d3475bfa SHA512 b15a54c6b287d715289e3a758d1a9b768a2c0d5e0bea5626231dfe6c824febb8b12d30f654e6b29a72d79ad541af5948c6f6297bff9a67d762aaeb50b29e9ef1 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff EBUILD rapidjson-1.1.0-r3.ebuild 1469 BLAKE2B 320c7dc1a88df37f78982b043c76c0541b90dbc9ea85c0c9a2acfa4e03297e42e024478b3c3c8d911225ae513370d87352e13053c7f2710004bfe2f8368c1fb0 SHA512 4c60dd94172e55ef044171bf59e9f863b62d2280439ae8d6f510a036f5e67dd489463a68988b5f4f0596d528587dfe8a3c7b657d963556a01099c1e16423bdcb -EBUILD rapidjson-9999.ebuild 1470 BLAKE2B d314474a59b32d56526babda7e9b1b0cfc8a10f33aad6c995412449f4baed76f9841da593662fac1b8a8341d9938889e279ea04d66cefc4e8ebd69151a8e94d1 SHA512 b12cb90eacfdcf667464dbc77529b47302802c0f7cf25d55f13a0912f7230cfbcce311a75152427ba1dc9dc7157fe173a8faada2594ad63a530ba678f019ea93 +EBUILD rapidjson-1.1.0-r4.ebuild 1525 BLAKE2B 30876c70714bc181e622f88bf6874d53005aee6eb26c2a427669cd8b60bd766295f2470acdeb30c952365b9675806814e8693b26a97ad904676fd3d96be16867 SHA512 c72c196391092892b5014dd78ce47361f7dee32173703daf2bec4d265e79e72d1f7a6391f6053ac0c2ba7c5ef84bd30d99fd48d7ac0a28c2e8ba2a26c4e0e722 +EBUILD rapidjson-9999.ebuild 1500 BLAKE2B 8adff918581c8bd2fca72b3ca553fefa1855e88358dc1cdb7088abb60c41db525583a17ad714e562b64dfd9c104d6ba1cef0360c580e20a76ffa8e079d4559c0 SHA512 fc4bb9ce0f6fe86b7b0ff0f4165d751773f42af1ddc69494d0151af253e0e77bcb75c0db3d05089a105843d18adf8c29792d50085762f567de14d7d0a6f6e8d2 MISC metadata.xml 396 BLAKE2B d177f4924bccb6e3900f0c431d7924334b0b22fb29463afbaaef3f0277aaa762829d1967c5159fee70785cbd650e00386e7085e74ed46f5636a4566f21247e6e SHA512 29f756f76db339ccf8367aef394335a2ffd158f83d6f6babb48ec3eda39b078125b10741e8cd5e87ea136bac243b0df77816efb7ae1ce01ee0507ed0c8e82ae1 diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-gcc14-const.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-gcc14-const.patch new file mode 100644 index 000000000000..0bc9e73b5683 --- /dev/null +++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-gcc14-const.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/914583 +https://github.com/Tencent/rapidjson/commit/3b2441b87f99ab65f37b141a7b548ebadb607b96 +https://github.com/Tencent/rapidjson/issues/718 + +From 3b2441b87f99ab65f37b141a7b548ebadb607b96 Mon Sep 17 00:00:00 2001 +From: Janusz Chorko <janusz.chorko@apdu.pl> +Date: Fri, 26 Aug 2016 21:17:38 +0200 +Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718 + +--- a/include/rapidjson/document.h ++++ b/include/rapidjson/document.h +@@ -316,8 +316,6 @@ struct GenericStringRef { + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } + diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r4.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r4.ebuild new file mode 100644 index 000000000000..e25d9ba5a30c --- /dev/null +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r4.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API" +HOMEPAGE="https://rapidjson.org/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/miloyip/rapidjson.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + S="${WORKDIR}/rapidjson-${PV}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="doc examples test" +RESTRICT="!test? ( test )" + +BDEPEND=" + doc? ( app-doc/doxygen ) + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${P}-gcc-7.patch" + "${FILESDIR}/${P}-system_gtest.patch" + "${FILESDIR}/${P}-valgrind_optional.patch" + "${FILESDIR}/${P}-gcc14-const.patch" +) + +src_prepare() { + cmake_src_prepare + + sed -i -e 's| -march=native||g' CMakeLists.txt || die + sed -i -e 's| -Werror||g' CMakeLists.txt example/CMakeLists.txt test/unittest/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DRAPIDJSON_BUILD_CXX11=OFF # latest gtest requires C++14 or later + -DRAPIDJSON_BUILD_DOC=$(usex doc) + -DRAPIDJSON_BUILD_EXAMPLES=$(usex examples) + -DRAPIDJSON_BUILD_TESTS=$(usex test) + -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF + ) + use test && mycmakeargs+=( + -DVALGRIND_EXECUTABLE= + ) + cmake_src_configure +} diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild index a003c49ec84e..a22be37589bc 100644 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild +++ b/dev-libs/rapidjson/rapidjson-9999.ebuild @@ -1,32 +1,32 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API" HOMEPAGE="https://rapidjson.org/" -LICENSE="MIT" -IUSE="doc examples test" -RESTRICT="!test? ( test )" -SLOT="0" - if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/miloyip/rapidjson.git" EGIT_SUBMODULES=() inherit git-r3 else SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" S="${WORKDIR}/rapidjson-${PV}" fi -DEPEND=" +LICENSE="MIT" +SLOT="0" +IUSE="doc examples test" +RESTRICT="!test? ( test )" + +BDEPEND=" doc? ( app-doc/doxygen ) - test? ( dev-cpp/gtest )" -RDEPEND="" + test? ( dev-cpp/gtest ) +" PATCHES=( "${FILESDIR}/${PN}-1.1.0-system_gtest.patch" |