CVS commit: pkgsrc/textproc/rapidjson

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 11 12:04:14 UTC 2025

Modified Files:
        pkgsrc/textproc/rapidjson: Makefile distinfo
        pkgsrc/textproc/rapidjson/patches: patch-include_rapidjson_document.h
Added Files:
        pkgsrc/textproc/rapidjson/patches: patch-CMakeLists.txt
            patch-example_CMakeLists.txt

Log Message:
rapidjson: use upstream patch for cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/rapidjson/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/rapidjson/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/rapidjson/patches/patch-CMakeLists.txt \
    pkgsrc/textproc/rapidjson/patches/patch-example_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/rapidjson/patches/patch-include_rapidjson_document.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/rapidjson/Makefile
diff -u pkgsrc/textproc/rapidjson/Makefile:1.12 pkgsrc/textproc/rapidjson/Makefile:1.13
--- pkgsrc/textproc/rapidjson/Makefile:1.12     Mon Aug 11 08:34:16 2025
+++ pkgsrc/textproc/rapidjson/Makefile  Mon Aug 11 12:04:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2025/08/11 08:34:16 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2025/08/11 12:04:14 wiz Exp $
 
 DISTNAME=      rapidjson-1.1.0
 PKGREVISION=   2
@@ -17,13 +17,13 @@ USE_CXX_FEATURES=   c++11
 
 CMAKE_CONFIGURE_ARGS+=         -DRAPIDJSON_BUILD_TESTS=OFF
 CMAKE_CONFIGURE_ARGS+=         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-CMAKE_CONFIGURE_ARGS+=         -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 PKGCONFIG_OVERRIDE+=   RapidJSON.pc.in
 BUILDLINK_TRANSFORM+=  rm:-march=native rm:-Werror
 
 post-install:
        rm ${DESTDIR}${PREFIX}/include/rapidjson/*.orig
+       rm ${DESTDIR}${PREFIX}/share/doc/RapidJSON/examples/CMakeLists.txt.orig
 
 .include "../../devel/cmake/build.mk"
 #.include "../../devel/googletest/buildlink3.mk"

Index: pkgsrc/textproc/rapidjson/distinfo
diff -u pkgsrc/textproc/rapidjson/distinfo:1.4 pkgsrc/textproc/rapidjson/distinfo:1.5
--- pkgsrc/textproc/rapidjson/distinfo:1.4      Tue Jun 18 10:06:21 2024
+++ pkgsrc/textproc/rapidjson/distinfo  Mon Aug 11 12:04:14 2025
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2024/06/18 10:06:21 markd Exp $
+$NetBSD: distinfo,v 1.5 2025/08/11 12:04:14 wiz Exp $
 
 BLAKE2s (rapidjson-1.1.0.tar.gz) = 2208432721a51dd2a1b7345cb7d80599c63e348ae6d1aa6269bfbcaf6651b3fe
 SHA512 (rapidjson-1.1.0.tar.gz) = 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
 Size (rapidjson-1.1.0.tar.gz) = 1019402 bytes
-SHA1 (patch-include_rapidjson_document.h) = f41d8af1456316510fe81219ae3926cd406917a3
+SHA1 (patch-CMakeLists.txt) = 66095e409f9ba394fa9a10f6d3c039174e93d071
+SHA1 (patch-example_CMakeLists.txt) = c7e1fff4b43c1e027cf49206d30b82b14b08aeb5
+SHA1 (patch-include_rapidjson_document.h) = 419be598d5076ef07f08c6190ba6e47729df4152

Index: pkgsrc/textproc/rapidjson/patches/patch-include_rapidjson_document.h
diff -u pkgsrc/textproc/rapidjson/patches/patch-include_rapidjson_document.h:1.1 pkgsrc/textproc/rapidjson/patches/patch-include_rapidjson_document.h:1.2
--- pkgsrc/textproc/rapidjson/patches/patch-include_rapidjson_document.h:1.1    Tue Jun 18 10:06:21 2024
+++ pkgsrc/textproc/rapidjson/patches/patch-include_rapidjson_document.h        Mon Aug 11 12:04:14 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-include_rapidjson_document.h,v 1.1 2024/06/18 10:06:21 markd Exp $
+$NetBSD: patch-include_rapidjson_document.h,v 1.2 2025/08/11 12:04:14 wiz Exp $
 
 From Fedora
 From 1257fe9096b70cc278f9d6e4029776b50df5d5cf Mon Sep 17 00:00:00 2001
@@ -13,7 +13,7 @@ Subject: [PATCH 2/7] Explicitly disable 
 
 diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h
 index e3e20dfb..b0f1f70b 100644
---- include/rapidjson/document.h
+--- include/rapidjson/document.h.orig  2016-08-25 07:59:05.000000000 +0000
 +++ include/rapidjson/document.h
 @@ -316,8 +316,6 @@ struct GenericStringRef {
  
@@ -23,8 +23,8 @@ index e3e20dfb..b0f1f70b 100644
 -
      //! implicit conversion to plain CharType pointer
      operator const Ch *() const { return s; }
-
-@@ -326,6 +324,8 @@ private:
+ 
+@@ -328,6 +326,8 @@ private:
      //! Disallow construction from non-const array
      template<SizeType N>
      GenericStringRef(CharType (&str)[N]) /* = delete */;

Added files:

Index: pkgsrc/textproc/rapidjson/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/rapidjson/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon Aug 11 12:04:14 2025
+++ pkgsrc/textproc/rapidjson/patches/patch-CMakeLists.txt      Mon Aug 11 12:04:14 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/08/11 12:04:14 wiz Exp $
+
+https://github.com/Tencent/rapidjson/commit/ebd87cb468fb4cb060b37e579718c4a4125416c1
+
+--- CMakeLists.txt.orig        2016-08-25 07:59:05.000000000 +0000
++++ CMakeLists.txt
+@@ -1,11 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+-if(POLICY CMP0025)
+-  # detect Apple's Clang
+-  cmake_policy(SET CMP0025 NEW)
+-endif()
+-if(POLICY CMP0054)
+-  cmake_policy(SET CMP0054 NEW)
+-endif()
++CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
+ 
+ SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
+ 
Index: pkgsrc/textproc/rapidjson/patches/patch-example_CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/rapidjson/patches/patch-example_CMakeLists.txt:1.1
--- /dev/null   Mon Aug 11 12:04:14 2025
+++ pkgsrc/textproc/rapidjson/patches/patch-example_CMakeLists.txt      Mon Aug 11 12:04:14 2025
@@ -0,0 +1,12 @@
+$NetBSD: patch-example_CMakeLists.txt,v 1.1 2025/08/11 12:04:14 wiz Exp $
+
+https://github.com/Tencent/rapidjson/issues/2159
+
+--- example/CMakeLists.txt.orig        2025-08-11 12:02:17.451054788 +0000
++++ 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)