<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/63a3caff522c92cabf6282777790ce21b9d00ef6">https://github.com/macports/macports-ports/commit/63a3caff522c92cabf6282777790ce21b9d00ef6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 63a3caff522 rapidjson: Remove wrong assignment operator
</span>63a3caff522 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 63a3caff522c92cabf6282777790ce21b9d00ef6
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jan 17 23:46:19 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> rapidjson: Remove wrong assignment operator
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some compilers complained when compiling code that includes
</span><span style='display:block; white-space:pre;color:#404040;'> <rapidjson/document.h>.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70842
</span>---
devel/rapidjson/Portfile | 3 ++-
devel/rapidjson/files/patch-access_fix.diff | 25 +++++++++------------
.../files/remove-assignment-operator.patch | 26 ++++++++++++++++++++++
3 files changed, 38 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson/Portfile b/devel/rapidjson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 121fa1d8805..506681435c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/rapidjson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/rapidjson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup cmake 1.1
</span> github.setup Tencent rapidjson 1.1.0 v
# Change github.tarball_from to 'releases' or 'archive' next update
github.tarball_from tarball
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
checksums rmd160 34724d9db66afadc3273f26d77efae8cb0322980 \
sha256 f3987b47054748cf099a22001d0cbd6963aaccbdce789e800558822c1b2d8356 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,7 @@ long_description RapidJSON is a fast, unicode-friendly, self-cont
</span> homepage https://rapidjson.org/
patchfiles-append patch-flags.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ remove-assignment-operator.patch \
</span> patch-test-CmakeLists.txt.diff \
patch-access_fix.diff \
patch-base.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson/files/patch-access_fix.diff b/devel/rapidjson/files/patch-access_fix.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6128301dda5..a1de5c6247f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/rapidjson/files/patch-access_fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/rapidjson/files/patch-access_fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ac0fc79c76fc92783d2a5267082a1f8f9c28df22 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Gustav <sir.gustav.the.coder@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 18 May 2020 14:06:39 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fixes issue #1718
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/rapidjson/writer.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: ‘const size_t rapidjson::Writer<rapidjson::BasicOStreamWrapper<std::basic_ostream<char> >, rapidjson::UTF8<>, rapidjson::UTF8<>, rapidjson::CrtAllocator, 0>::kDefaultLevelDepth’ is protected within this context
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/rapidjson/writer.h b/include/rapidjson/writer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e7fb873a4..51dd86d58 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/rapidjson/writer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/rapidjson/writer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -283,6 +283,8 @@ class Writer {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os_->Flush();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/Tencent/rapidjson/issues/1718
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/Tencent/rapidjson/pull/1720
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/rapidjson/writer.h.orig 2016-08-25 02:59:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/rapidjson/writer.h 2025-01-17 23:30:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,6 +251,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool RawValue(const Ch* json, size_t length, Type type) { Prefix(type); return EndValue(WriteRawValue(json, length)); }
</span>
+ static const size_t kDefaultLevelDepth = 32;
+
protected:
//! Information for each nested level
struct Level {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -291,8 +293,6 @@ class Writer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -259,8 +261,6 @@
</span> bool inArray; //!< true if in array, otherwise in object
};
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson/files/remove-assignment-operator.patch b/devel/rapidjson/files/remove-assignment-operator.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8d29eeb91b9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/rapidjson/files/remove-assignment-operator.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: cannot assign to non-static data member 'length' with const-qualified type 'const SizeType' (aka 'const unsigned int')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/Tencent/rapidjson/issues/718
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/Tencent/rapidjson/pull/719
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/rapidjson/document.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/rapidjson/document.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,8 +316,6 @@ struct GenericStringRef {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! implicit conversion to plain CharType pointer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ operator const Ch *() const { return s; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -328,6 +326,8 @@ struct GenericStringRef {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! Disallow construction from non-const array
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<SizeType N>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GenericStringRef(CharType (&str)[N]) /* = delete */;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //! Copy assignment operator not permitted - immutable type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! Mark a character pointer as constant string
</span></pre><pre style='margin:0'>
</pre>