CVS commit: pkgsrc/textproc/rapidjson

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Jun 18 10:06:21 UTC 2024

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

Log Message:
rapidjson: Removed non-compiling assignment operator - via Fedora.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/rapidjson/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/rapidjson/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.9 pkgsrc/textproc/rapidjson/Makefile:1.10
--- pkgsrc/textproc/rapidjson/Makefile:1.9      Mon Mar  6 09:11:10 2023
+++ pkgsrc/textproc/rapidjson/Makefile  Tue Jun 18 10:06:21 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2023/03/06 09:11:10 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2024/06/18 10:06:21 markd Exp $
 
 DISTNAME=      rapidjson-1.1.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Tencent/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,8 +11,9 @@ HOMEPAGE=     https://rapidjson.org/
 COMMENT=       Fast JSON parser/generator with SAX/DOM style API
 LICENSE=       modified-bsd
 
-USE_LANGUAGES= c++11
-#TEST_TARGET=  test
+USE_LANGUAGES=         c++
+USE_CXX_FEATURES=      c++11
+#TEST_TARGET=          test
 
 CMAKE_ARGS+=           -DRAPIDJSON_BUILD_TESTS=OFF
 CMAKE_ARGS+=           -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
@@ -20,6 +21,9 @@ CMAKE_ARGS+=          -DCMAKE_DISABLE_FIND_PACKA
 PKGCONFIG_OVERRIDE+=   RapidJSON.pc.in
 BUILDLINK_TRANSFORM+=  rm:-march=native rm:-Werror
 
+post-install:
+       rm ${DESTDIR}${PREFIX}/include/rapidjson/*.orig
+
 .include "../../devel/cmake/build.mk"
 #.include "../../devel/googletest/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/rapidjson/distinfo
diff -u pkgsrc/textproc/rapidjson/distinfo:1.3 pkgsrc/textproc/rapidjson/distinfo:1.4
--- pkgsrc/textproc/rapidjson/distinfo:1.3      Tue Oct 26 11:23:19 2021
+++ pkgsrc/textproc/rapidjson/distinfo  Tue Jun 18 10:06:21 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:23:19 nia Exp $
+$NetBSD: distinfo,v 1.4 2024/06/18 10:06:21 markd 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

Added files:

Index: pkgsrc/textproc/rapidjson/patches/patch-include_rapidjson_document.h
diff -u /dev/null pkgsrc/textproc/rapidjson/patches/patch-include_rapidjson_document.h:1.1
--- /dev/null   Tue Jun 18 10:06:21 2024
+++ pkgsrc/textproc/rapidjson/patches/patch-include_rapidjson_document.h        Tue Jun 18 10:06:21 2024
@@ -0,0 +1,35 @@
+$NetBSD: patch-include_rapidjson_document.h,v 1.1 2024/06/18 10:06:21 markd Exp $
+
+From Fedora
+From 1257fe9096b70cc278f9d6e4029776b50df5d5cf Mon Sep 17 00:00:00 2001
+From: Janusz Chorko <janusz.chorko%apdu.pl@localhost>
+Date: Fri, 26 Aug 2016 21:17:38 +0200
+Subject: [PATCH 1/7] Removed non-compiling assignment operator. Fixed #718
+
+From f9d9e50caca4673f194115b059fe5daef77163fd Mon Sep 17 00:00:00 2001
+From: Janusz Chorko <janusz.chorko%apdu.pl@localhost>
+Date: Fri, 26 Aug 2016 21:26:50 +0200
+Subject: [PATCH 2/7] Explicitly disable copy assignment operator
+
+diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h
+index e3e20dfb..b0f1f70b 100644
+--- include/rapidjson/document.h
++++ 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; }
+
+@@ -326,6 +324,8 @@ private:
+     //! Disallow construction from non-const array
+     template<SizeType N>
+     GenericStringRef(CharType (&str)[N]) /* = delete */;
++    //! Copy assignment operator not permitted - immutable type
++    GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */;
+ };
+ 
+ //! Mark a character pointer as constant string