<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/50e1f563d456396c83f3f5c18114243152eff8d4">https://github.com/macports/macports-ports/commit/50e1f563d456396c83f3f5c18114243152eff8d4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 50e1f563d456396c83f3f5c18114243152eff8d4
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Mon Apr 3 00:54:01 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-openxlsx2: update to 0.6, drop now unneeded patch
</span>---
R/R-openxlsx2/Portfile | 13 +++++--------
R/R-openxlsx2/files/patch-isfinite.diff | 11 -----------
2 files changed, 5 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-openxlsx2/Portfile b/R/R-openxlsx2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ee303593a5b..08adff6c04a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-openxlsx2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-openxlsx2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup github JanMarvin openxlsx2 0.5.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup github JanMarvin openxlsx2 0.6 v
</span> revision 0
categories-append office
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,9 +11,9 @@ license MIT
</span> description Read, write and edit xlsx files
long_description {*}${description}
homepage https://janmarvin.github.io/openxlsx2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 623e340a92b24cb2f6c95d51a2e3df8ff494599d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 507de13c4f7688ce3ec6a2b80fe55b55705778dcd49bd72bc925b6c82891b631 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6431813
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2d0830f0bd450652363a28988b27f8a2cd1b839f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 68e95e80be13f8424cbd94afdb4766676b2bbc1250effb15319054f24fc20d56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6431234
</span>
depends_lib-append port:R-magrittr \
port:R-R6 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,6 @@ depends_lib-append port:R-magrittr \
</span> port:R-stringi \
port:R-zip
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/JanMarvin/openxlsx2/issues/565
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-isfinite.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_test-append port:R-covr \
port:R-ggplot2 \
port:R-knitr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,5 +31,5 @@ depends_test-append port:R-covr \
</span> port:R-testthat \
port:R-waldo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# One test fails on 32-bit, apparently due to precision: https://github.com/JanMarvin/openxlsx2/issues/566
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# One test fails on 32-bit, apparently due to rounding: https://github.com/JanMarvin/openxlsx2/issues/566
</span> test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-openxlsx2/files/patch-isfinite.diff b/R/R-openxlsx2/files/patch-isfinite.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 092872c83a6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-openxlsx2/files/patch-isfinite.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;'>---- src/helper_functions.cpp.orig 2023-02-26 22:27:18.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/helper_functions.cpp 2023-03-27 02:20:49.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -289,7 +289,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- res = R_strtod(x.c_str(), &endp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (isBlankString(endp) && isfinite(res)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (isBlankString(endp) && std::isfinite(res)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>