<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/079e12c081207a6834e4521a0f6a621da7f3ccdf">https://github.com/macports/macports-ports/commit/079e12c081207a6834e4521a0f6a621da7f3ccdf</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 079e12c jsoncpp: update release to 1.9.2 and devel to 20191115-9e0d70aa
</span>079e12c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 079e12c081207a6834e4521a0f6a621da7f3ccdf
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Nov 15 15:18:04 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> jsoncpp: update release to 1.9.2 and devel to 20191115-9e0d70aa
</span>---
devel/jsoncpp/Portfile | 28 ++++++++++++----------
devel/jsoncpp/files/patch-fix-build.diff | 2 +-
.../files/patch-src_test_lib_json_main.cpp.diff | 13 ++++++++++
3 files changed, 30 insertions(+), 13 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 792e79b..419beb3 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;'>@@ -20,11 +20,11 @@ subport jsoncpp-devel {}
</span> if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup open-source-parsers jsoncpp 1.9.1
</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:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup open-source-parsers jsoncpp 1.9.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 34374a13fadc93e42b26c60282029a5c1f113023 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6bc246534c35df7c9b200869b6e8536c9b0024e6c11f3023541f7fdd88794168 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 211398
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts jsoncpp-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,23 +32,27 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup open-source-parsers jsoncpp 645cd0412c100d633a882da30d6245a30a8a4c82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191108-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 bc8355c0595eece43fa020429b1f6d1cf4030fe6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 98ddd41a7c6e3559bf98c4e660a2c230e16c18786602333c39440ee05e9739c6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 209887
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup open-source-parsers jsoncpp 9e0d70aa66e6ba993dd05723ca64c26ab00f3572
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191115-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a042fb54f4678217ae95a17ee82999b61fba3612 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 56086ac6c879abc80278e0288161b2f71fc63f6d37b17e0e84104300505a6a3a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 211430
</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:#ffe0e0;'>- # temporary patch to fix build errors, mostly in how [[deprecated]] is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix-build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix variable type to be same as others
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-src_test_lib_json_main.cpp.diff
</span> patch.pre_args -p1
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# temporary patch to fix build errors
</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
configure.args-append \
<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><span style='display:block; white-space:pre;color:#808080;'>index 26da389..f89711d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jsoncpp/files/patch-fix-build.diff
</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;'>@@ -2,7 +2,7 @@ diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
</span> index d2d41aa..2155d29 100644
--- a/src/jsontestrunner/main.cpp
+++ b/src/jsontestrunner/main.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,9 +56,11 @@ static Json::String readInputTestFile(const char* path) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,9 +58,11 @@
</span> return "";
fseek(file, 0, SEEK_END);
long const size = ftell(file);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-src_test_lib_json_main.cpp.diff b/devel/jsoncpp/files/patch-src_test_lib_json_main.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7b3571c
</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-src_test_lib_json_main.cpp.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;'>+diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 87be515..174fa53 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/test_lib_json/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/test_lib_json/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,7 +123,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto index = s.find_last_of("eE");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (index == s.npos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int hasSign = (s[index + 1] == '+' || s[index + 1] == '-') ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned hasSign = (s[index + 1] == '+' || s[index + 1] == '-') ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto exponentStartIndex = index + 1 + hasSign;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Json::String normalized = s.substr(0, exponentStartIndex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto indexDigit = s.find_first_not_of('0', exponentStartIndex);
</span></pre><pre style='margin:0'>
</pre>