<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/093f4115b164ace2b0a77a64cd6803d79bf73608">https://github.com/macports/macports-ports/commit/093f4115b164ace2b0a77a64cd6803d79bf73608</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 093f4115b164ace2b0a77a64cd6803d79bf73608
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Wed Jul 10 16:19:53 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-duckdb: update to 1.0.0-1
</span>---
R/R-duckdb/Portfile | 12 ++++--------
R/R-duckdb/files/patch-fix-cmath.diff | 29 -----------------------------
2 files changed, 4 insertions(+), 37 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-duckdb/Portfile b/R/R-duckdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 43d1cdcc69c..5a8121c41f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-duckdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-duckdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup legacysupport 1.1
</span> # _SC_PHYS_PAGES
legacysupport.newest_darwin_requires_legacy 15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran duckdb duckdb 1.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran duckdb duckdb 1.0.0-1
</span> revision 0
categories-append databases
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,18 +15,14 @@ license MIT
</span> description DBI package for the DuckDB database management system
long_description {*}${description}
homepage https://github.com/duckdb/duckdb-r
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e5e356ef1c0f554960a928ec620b1a6609d5e176 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a57eda804033f16a003443acb9939b1faa032822ff3ffb563bcd1cc7dcca0c22 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4398683
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 eb62a83d8e04c981bf7e779fddd9cf833480ca0f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 987edcdcae91dcbc9d554f039425cd23b6e5787e7681f311c9966926744d4ca9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4400667
</span>
depends_lib-append port:R-DBI
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/duckdb/duckdb-r/issues/152
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Partly fixed, but a patch still needed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-cmath.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${os.platform} eq "darwin" && ${os.major} < 16} {
patchfiles-append patch-Makevars.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-duckdb/files/patch-fix-cmath.diff b/R/R-duckdb/files/patch-fix-cmath.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e57fde98c26..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-duckdb/files/patch-fix-cmath.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/rfuns.cpp 2024-06-04 13:44:27.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/rfuns.cpp 2024-06-15 03:49:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,7 +247,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ValidityMask::AllValid(validity_entry)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // all valid: check with isnan()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (; base_idx < next; base_idx++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- result_data[base_idx] = isnan(data[base_idx]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ result_data[base_idx] = std::isnan(data[base_idx]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (ValidityMask::NoneValid(validity_entry)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // None valid:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -260,7 +260,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (; base_idx < next; base_idx++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ValidityMask::RowIsValid(validity_entry, base_idx - start)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- D_ASSERT(mask.RowIsValid(base_idx));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- result_data[base_idx] = isnan(data[base_idx]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ result_data[base_idx] = std::isnan(data[base_idx]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result_data[base_idx] = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -292,7 +292,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto result_data = ConstantVector::GetData<bool>(result);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto ldata = ConstantVector::GetData<double>(input);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *result_data = ConstantVector::IsNull(input) || isnan(*ldata);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *result_data = ConstantVector::IsNull(input) || std::isnan(*ldata);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>