<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1dc8eb414bc4477e347f3cbd9e97bcf8119119bf">https://github.com/macports/macports-ports/commit/1dc8eb414bc4477e347f3cbd9e97bcf8119119bf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1dc8eb414bc4477e347f3cbd9e97bcf8119119bf
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Jun 7 21:10:54 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> rapidjson: apply upstream patches to header files
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/Tencent/rapidjson/commit/d88be8ef1649eca4602348d1aab5c16c36f83d4f
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/Tencent/rapidjson/commit/ac0fc79c76fc92783d2a5267082a1f8f9c28df22
</span>---
devel/rapidjson/Portfile | 5 ++++-
devel/rapidjson/files/patch-access_fix.diff | 31 +++++++++++++++++++++++++++++
devel/rapidjson/files/patch-base.diff | 13 ++++++++++++
3 files changed, 48 insertions(+), 1 deletion(-)
<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 9672911c8d5..d8b228ba609 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;'>@@ -5,6 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
github.setup Tencent rapidjson 1.1.0 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
checksums rmd160 34724d9db66afadc3273f26d77efae8cb0322980 \
sha256 f3987b47054748cf099a22001d0cbd6963aaccbdce789e800558822c1b2d8356 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +26,9 @@ 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:#ffe0e0;'>- patch-test-CmakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-test-CmakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-access_fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-base.diff
</span>
installs_libs no
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6128301dda5
</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/patch-access_fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ac0fc79c76fc92783d2a5267082a1f8f9c28df22 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Gustav <sir.gustav.the.coder@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 18 May 2020 14:06:39 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fixes issue #1718
</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;'>+ include/rapidjson/writer.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/rapidjson/writer.h b/include/rapidjson/writer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e7fb873a4..51dd86d58 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/rapidjson/writer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/rapidjson/writer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -283,6 +283,8 @@ class Writer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os_->Flush();
</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;'>++ static const size_t kDefaultLevelDepth = 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! Information for each nested level
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct Level {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -291,8 +293,6 @@ class Writer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool inArray; //!< true if in array, otherwise in object
</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;'>+- static const size_t kDefaultLevelDepth = 32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool WriteNull() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PutReserve(*os_, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 'l'); return true;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/rapidjson/files/patch-base.diff b/devel/rapidjson/files/patch-base.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b388eca15f1
</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/patch-base.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://github.com/Tencent/rapidjson/commit/d88be8ef1649eca4602348d1aab5c16c36f83d4f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/rapidjson/prettywriter.h.orig 2016-08-25 00:59:05
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/rapidjson/prettywriter.h 2023-06-01 20:41:42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> Base;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> Base;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef typename Base::Ch Ch;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! Constructor
</span></pre><pre style='margin:0'>
</pre>