[gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidjson/, dev-libs/rapidjson/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidjson/, dev-libs/rapidjson/files/

[Sam James]

commit:     5f504adc4d5a1a6afd5f3efcf757944bce825a16
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Fri May 16 21:46:52 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 21 19:52:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f504adc

dev-libs/rapidjson: fix build with cmake 4

Closes: https://bugs.gentoo.org/951839
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Part-of: https://github.com/gentoo/gentoo/pull/42122
Closes: https://github.com/gentoo/gentoo/pull/42122
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../rapidjson/files/rapidjson-1.1.0-cmake4.patch   | 19 +++++++
 dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild       | 60 ++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-cmake4.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-cmake4.patch
new file mode 100644
index 000000000000..dc28481a239e
--- /dev/null
+++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-cmake4.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/951839
+https://github.com/Tencent/rapidjson/issues/2159 fixed in git already
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
+ if(POLICY CMP0025)
+   # detect Apple's Clang
+   cmake_policy(SET CMP0025 NEW)
+--- a/example/CMakeLists.txt
++++ b/example/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.5)
+ 
+ if(POLICY CMP0054)
+   cmake_policy(SET CMP0054 NEW)

diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild
new file mode 100644
index 000000000000..e63ba7b610b0
--- /dev/null
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 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 ~s390 ~sparc ~x86"
+	S="${WORKDIR}/rapidjson-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? ( app-text/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"
+	"${FILESDIR}/${P}-cmake4.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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidjson/, dev-libs/rapidjson/files/

[Sam James]

commit:     db9c0e8b3b0977da11be5b8d79bf13c5d3f8a120
Author:     Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Tue Jun 24 15:20:13 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct  9 07:00:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db9c0e8b

dev-libs/rapidjson: fix build if USE="doc"

by applying the upstream patch to expand the glob.
Affter the minimum required CMake version was raised from 2.8 to 3.5 in
the last commit, Ninja reports:

> ninja: error: 'doc/Doxyfile*', needed by 'doc/html', missing and no known rule to make it

Closes: https://bugs.gentoo.org/956433
Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42735
Closes: https://github.com/gentoo/gentoo/pull/42735
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/rapidjson-1.1.0-doc-build.patch          | 41 ++++++++++++++++++++++
 dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild       |  1 +
 2 files changed, 42 insertions(+)

diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-doc-build.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-doc-build.patch
new file mode 100644
index 000000000000..6e5f70c72c5e
--- /dev/null
+++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-doc-build.patch
@@ -0,0 +1,41 @@
+https://github.com/Tencent/rapidjson/commit/bbdf5d1d4b40891c82e5c1946d32dfc841926066
+
+From bbdf5d1d4b40891c82e5c1946d32dfc841926066 Mon Sep 17 00:00:00 2001
+From: Christopher Warrington <chwarr@microsoft.com>
+Date: Tue, 5 Sep 2017 16:58:09 -0700
+Subject: [PATCH] Fix Windows doc build MSBuild error MSB6001
+
+When using a MSBuild-based CMake generator like 'Visual Studio 15 2017
+Win64', the doc build was failing with the error 'MSB6001: Invalid
+command line switch for "cmd.exe". Illegal characters in path.'
+
+This was due to the dependency on Doxyfile*, which wasn't expanded by
+CMake.
+
+The fix is to expand this glob in CMake before specifying the custom
+command's dependencies.
+
+Partial fix for https://github.com/miloyip/rapidjson/issues/622
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index c1f165a3..c5345ba6 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -10,11 +10,13 @@ ELSE()
+     CONFIGURE_FILE(Doxyfile.in Doxyfile @ONLY)
+     CONFIGURE_FILE(Doxyfile.zh-cn.in Doxyfile.zh-cn @ONLY)
+ 
++    file(GLOB DOXYFILES ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile*)
++    
+     add_custom_command(OUTPUT html
+         COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+         COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.zh-cn
+         COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/html
+-        DEPENDS ${MARKDOWN_DOC} ${SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile*
++        DEPENDS ${MARKDOWN_DOC} ${SOURCES} ${DOXYFILES}
+         WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../
+         )
+ 
+-- 
+2.45.2
+

diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild
index d127af34fca5..75d7d6cc093e 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-valgrind_optional.patch"
 	"${FILESDIR}/${P}-gcc14-const.patch"
 	"${FILESDIR}/${P}-cmake4.patch"
+	"${FILESDIR}/${P}-doc-build.patch"
 )
 
 src_prepare() {