<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/378923080c59da256358534cd7a70b843200812c">https://github.com/macports/macports-ports/commit/378923080c59da256358534cd7a70b843200812c</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 3789230 jtc: update to 1.75b
</span>3789230 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 378923080c59da256358534cd7a70b843200812c
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Thu Dec 26 10:29:41 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> jtc: update to 1.75b
</span>---
textproc/jtc/Portfile | 12 ++++--------
textproc/jtc/files/patch-json-hpp.diff | 20 --------------------
textproc/jtc/files/patch-jtc-cpp.diff | 11 -----------
textproc/jtc/files/patch-streamstr-hpp.diff | 11 -----------
4 files changed, 4 insertions(+), 50 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/jtc/Portfile b/textproc/jtc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d8d632..9e7ed9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/jtc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/jtc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ldn-softdev jtc 1.74
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ldn-softdev jtc 1.75b
</span> github.tarball_from archive
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ long_description jtc stand for: JSON test console, but it's a legacy name, \
</span> insert new elements, remove, copy, move, compare, \
transform and swap around).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 84ec627b6b0b34ab68bbac9cbf126949e18c7538 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 25a6da6d6d647f900a77d8271444015a62bee7ddef3140612e511312944d454c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 171694
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3226c0deb0fd2d5b44f0e7474f151e53a4b01e2d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 602cc3ff02734f32e17d4abd66a071ea22d72bd08ad59450792452626f2467aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 195789
</span>
compiler.cxx_standard 2014
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,10 +36,6 @@ compiler.blacklist-append {clang < 602}
</span> installs_libs no
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-jtc-cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-json-hpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-streamstr-hpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.cmd ${configure.cxx}
build.args -o jtc -Wall -std=c++14 -Ofast
build.target jtc.cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/jtc/files/patch-json-hpp.diff b/textproc/jtc/files/patch-json-hpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c1e794e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/jtc/files/patch-json-hpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Json.hpp.orig 2019-10-10 13:05:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Json.hpp 2019-10-10 13:05:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3723,7 +3723,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool Json::iterator::is_original_(const Jnode & jn, const WalkStep &ws) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // match first-seen jsons: keep track of matched jsons in the namespaces
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const Jnode not_original;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const Jnode not_original{};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string prefix = ws.stripped.front() + "\n"; // prevent clashing with user's NS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(json().ojn_ptr_ == nullptr) { // first time, prepare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3748,7 +3748,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool Json::iterator::is_duplicate_(const Jnode & jn, const WalkStep &ws) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // match duplicate jsons: keep track of matched jsons in the namespaces
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const Jnode original;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const Jnode original{};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string prefix = ws.stripped.front() + "\n"; // prevent clashing with user's NS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(json().djn_ptr_ == nullptr) { // first time, prepare
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/jtc/files/patch-jtc-cpp.diff b/textproc/jtc/files/patch-jtc-cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ca69630..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/jtc/files/patch-jtc-cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- jtc.cpp.orig 2019-10-09 15:05:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ jtc.cpp 2019-10-10 09:22:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,7 +239,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opt_[CHR(OPT_TMP)].hits() == opt_[CHR(OPT_WLK)].hits();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // ready jinp_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jinp_.tab(opt_[CHR(OPT_IND)].hits() > 0 or not opt_[CHR(OPT_RAW)]?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- abs(opt_[CHR(OPT_IND)]): 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ abs(static_cast<int>(opt_[CHR(OPT_IND)])): 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .raw(opt_[CHR(OPT_RAW)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .quote_solidus(opt_[CHR(OPT_QUT)].hits() % 2 == 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/jtc/files/patch-streamstr-hpp.diff b/textproc/jtc/files/patch-streamstr-hpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 776dc96..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/jtc/files/patch-streamstr-hpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./lib/Streamstr.hpp.orig 2019-10-09 15:09:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./lib/Streamstr.hpp 2019-10-09 15:08:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t offset = len <= cur_? hb_.size(): cur_ + hb_.size() - len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string s(&hb_[offset], hb_.size() - offset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- offset = len <= cur_? cur_ - len: 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- s += {&hb_[offset], cur_ - offset};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s += std::string{&hb_[offset], cur_ - offset};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char & chr(size_t offset = 0) const {
</span></pre><pre style='margin:0'>
</pre>