<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8bd22b87b8e3939f99f79d7d93099cf0a4d36bd1">https://github.com/macports/macports-ports/commit/8bd22b87b8e3939f99f79d7d93099cf0a4d36bd1</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 8bd22b8 jsoncpp-devel: update to 20190826-fd940255
</span>8bd22b8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8bd22b87b8e3939f99f79d7d93099cf0a4d36bd1
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Sep 1 07:27:34 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> jsoncpp-devel: update to 20190826-fd940255
</span>---
devel/jsoncpp/Portfile | 14 +++---
devel/jsoncpp/files/patch-fix-build.diff | 74 ++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/Portfile b/devel/jsoncpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30ea217..73a14e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jsoncpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jsoncpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,17 +32,21 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup open-source-parsers jsoncpp 645250b6690785be60ab6780ce4b58698d884d11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190711-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 83f09e5315eb913eb9867d0b082f90bac195e29f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 79c71d0816dd11e32e76561a4481c30352a1ea922c1cddce81608a2621c18dfe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 203119
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup open-source-parsers jsoncpp fd940255ced7773489f818e62d7074fbcfda81cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190826-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d359292b9b13f824265e82922127772034bd1d84 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8060e04b5048466b43e9f93f7f6d1c3b967ce16bc6f87a04d72d527a80307644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 202850
</span> revision 0
conflicts jsoncpp
long_description ${description}: \
This port follows the GIT master version of ${name}, which is typically updated every few days to weeks.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix build errors, mostly in how [[deprecated]] is used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
cmake.out_of_source yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-fix-build.diff b/devel/jsoncpp/files/patch-fix-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3500da5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jsoncpp/files/patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,74 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/json/reader.h b/include/json/reader.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 947fc00..1a7368e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/json/reader.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/json/reader.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * \deprecated Use CharReader and CharReaderBuilder.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class [[deprecated("deprecated Use CharReader and CharReaderBuilder.")]] JSON_API Reader {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class JSON_API [[deprecated("deprecated Use CharReader and CharReaderBuilder.")]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Reader {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef char Char;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef const Char* Location;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/json/writer.h b/include/json/writer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3280141..4dd0f9a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/json/writer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/json/writer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,7 +145,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** \brief Abstract class for writers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * \deprecated Use StreamWriter. (And really, this is an implementation detail.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class [[deprecated("Use StreamWriter instead")]] JSON_API Writer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class JSON_API [[deprecated("Use StreamWriter instead")]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Writer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual ~Writer();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -165,8 +166,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma warning(push)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma warning(disable : 4996) // Deriving from deprecated class
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class [[deprecated("Use StreamWriterBuilder instead")]] JSON_API FastWriter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : public Writer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class JSON_API [[deprecated("Use StreamWriterBuilder instead")]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FastWriter : public Writer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FastWriter();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~FastWriter() override = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,7 +226,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma warning(push)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma warning(disable : 4996) // Deriving from deprecated class
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class [[deprecated("Use StreamWriterBuilder instead")]] JSON_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class JSON_API [[deprecated("Use StreamWriterBuilder instead")]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StyledWriter : public Writer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StyledWriter();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -294,7 +295,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma warning(push)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma warning(disable : 4996) // Deriving from deprecated class
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class [[deprecated("Use StreamWriterBuilder instead")]] JSON_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class JSON_API [[deprecated("Use StreamWriterBuilder instead")]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StyledStreamWriter {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d2d41aa..2155d29 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/jsontestrunner/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/jsontestrunner/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,9 +56,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fseek(file, 0, SEEK_END);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long const size = ftell(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (size == -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t const usize = static_cast<unsigned long>(size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fseek(file, 0, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char* buffer = new char[size + 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char* buffer = new char[usize + 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buffer[size] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Json::String text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fread(buffer, 1, usize, file) == usize)
</span></pre><pre style='margin:0'>
</pre>