<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/4728b0035f9aba233baf7c3780c11482bc0e84fc">https://github.com/macports/macports-ports/commit/4728b0035f9aba233baf7c3780c11482bc0e84fc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4728b0035f9aba233baf7c3780c11482bc0e84fc
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Jul 1 21:16:35 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-tzdb: fix build on 10.7–10.11
</span>---
R/R-tzdb/Portfile | 9 ++++++++-
R/R-tzdb/files/patch-cxx_std.diff | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-tzdb/Portfile b/R/R-tzdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fafaff72c43..ddd56e527e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-tzdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-tzdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup R 1.0
</span>
# Revert to GitHub once updated there.
R.setup cran r-lib tzdb 0.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append devel
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,6 +18,13 @@ checksums rmd160 ad91d284b08c90f1b223adee9264dbd64842809b \
</span>
depends_lib-append port:R-cpp11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {(${os.major} > 10) && (${os.major} < 16)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cxx_std.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_test-append port:R-covr \
port:R-testthat
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-tzdb/files/patch-cxx_std.diff b/R/R-tzdb/files/patch-cxx_std.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c7927d73af9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-tzdb/files/patch-cxx_std.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makevars.orig 2023-05-12 20:31:07.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makevars 2023-07-01 21:09:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# We no longer specify `CXX_STD = CXX11` since modern versions of R require
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# C++11 as a minimum. This also allows more modern compilers to use C++14, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# has constexpr benefits.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# CXX11 is required. Using a newer standard breaks build on 10.7–10.11:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# https://github.com/r-lib/tzdb/issues/34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -DINSTALL=dummy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # To keep some problematic code from running on windows if INSTALL isn't defined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +25,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Because of these issues, we instead default to using an uncompressed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # text version of the database that we ship with tzdb.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXX_STD = CXX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CXXFLAGS = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I../inst/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINSTALL=dummy \
</span></pre><pre style='margin:0'>
</pre>