<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/88eed39ee0195509e3ce88dacf1e34fd286d06b3">https://github.com/macports/macports-ports/commit/88eed39ee0195509e3ce88dacf1e34fd286d06b3</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 88eed39ee01 jsoncpp: Update to 1.9.3
</span>88eed39ee01 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 88eed39ee0195509e3ce88dacf1e34fd286d06b3
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jun 5 01:17:55 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> jsoncpp: Update to 1.9.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The ccache workaround is needed for the stable version too.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The compiler blacklist is not needed anymore.
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/60326
</span>---
devel/jsoncpp/Portfile | 23 +++++++++-------------
...ccache.devel.diff => patch-disable-ccache.diff} | 0
devel/jsoncpp/files/patch-fix-build.release.diff | 14 ++++++-------
3 files changed, 15 insertions(+), 22 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 ba7929b975d..7a4737efcbb 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;'>@@ -3,14 +3,10 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span>
# require C++11
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# some older Clang say they support C++11 when they don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 900}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> name jsoncpp
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,17 +22,16 @@ 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.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 34374a13fadc93e42b26c60282029a5c1f113023 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6bc246534c35df7c9b200869b6e8536c9b0024e6c11f3023541f7fdd88794168 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 211398
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup open-source-parsers jsoncpp 1.9.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 71a6751a4e0c77b43d9ef550d8ccbeb5f9877762 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1395f7f7aa52c9d0d9f30168a8048d0df2c1aacba64ad28d8ae8727d0a22e2ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 212977
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts jsoncpp-devel
# temporary patch to fix build errors
patchfiles-append patch-fix-build.release.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span>
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,12 +48,12 @@ if {${subport} eq ${name}} {
</span> 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;'>- # disable CCACHE discovery and use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-disable-ccache.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# disable CCACHE discovery and use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-disable-ccache.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> configure.args-append \
-DBUILD_SHARED_LIBS=ON \
-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-disable-ccache.devel.diff b/devel/jsoncpp/files/patch-disable-ccache.diff
</span>similarity index 100%
rename from devel/jsoncpp/files/patch-disable-ccache.devel.diff
rename to devel/jsoncpp/files/patch-disable-ccache.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jsoncpp/files/patch-fix-build.release.diff b/devel/jsoncpp/files/patch-fix-build.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f89711d6154..9c478ffb877 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jsoncpp/files/patch-fix-build.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jsoncpp/files/patch-fix-build.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d2d41aa..2155d29 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/jsontestrunner/main.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/jsontestrunner/main.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/jsontestrunner/main.cpp.orig 2020-05-29 08:50:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/jsontestrunner/main.cpp 2020-06-05 00:53:08.000000000 -0500
</span> @@ -58,9 +58,11 @@
return "";
fseek(file, 0, SEEK_END);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- long const size = ftell(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto const size = ftell(file);
</span> + if (size == -1)
+ return "";
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t const usize = static_cast<unsigned long>(size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto const usize = static_cast<size_t>(size);
</span> fseek(file, 0, SEEK_SET);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- char* buffer = new char[size + 1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char* buffer = new char[usize + 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto buffer = new char[size + 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto buffer = new char[usize + 1];
</span> buffer[size] = 0;
Json::String text;
if (fread(buffer, 1, usize, file) == usize)
</pre><pre style='margin:0'>
</pre>