<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/0c486664ba83dbb0b8ac84212c5039350e46fe20">https://github.com/macports/macports-ports/commit/0c486664ba83dbb0b8ac84212c5039350e46fe20</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0c486664ba83dbb0b8ac84212c5039350e46fe20
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue Jul 11 14:50:50 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-RcppSpdlog: update to 0.0.14
</span>---
R/R-RcppSpdlog/Portfile | 12 ++----
...inl.h-fix-for-missing-pthread_threadid_np.patch | 43 ----------------------
2 files changed, 4 insertions(+), 51 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RcppSpdlog/Portfile b/R/R-RcppSpdlog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a5c5e45d2c2..94b705114cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-RcppSpdlog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-RcppSpdlog/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 cran eddelbuettel RcppSpdlog 0.0.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran eddelbuettel RcppSpdlog 0.0.14
</span> revision 0
categories-append devel
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,16 +11,12 @@ license GPL-2+
</span> description R and C++ interfaces to spdlog C++ header library for logging
long_description {*}${description}
homepage https://dirk.eddelbuettel.com/code/rcpp.spdlog.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 81441343d2af333e7c2ab45490732fd6a33779be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 73dc2c33ec7a9d5b8ffa7270cc2f32a9c75cd98ce990126e86018c43009c8984 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 269513
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2f9c2988620d5abd5a02ce9fe27ede1cfcf91587 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8cb4fdf7cbaa001064b074f7339d0b3c53c13723d6bc7af6f873989cc5afc3d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 274527
</span>
depends_lib-append port:R-Rcpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/67212
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/gabime/spdlog/pull/2715
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-os-inl.h-fix-for-missing-pthread_threadid_np.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_test-append port:R-simplermarkdown
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RcppSpdlog/files/0001-os-inl.h-fix-for-missing-pthread_threadid_np.patch b/R/R-RcppSpdlog/files/0001-os-inl.h-fix-for-missing-pthread_threadid_np.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 14f14284b63..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-RcppSpdlog/files/0001-os-inl.h-fix-for-missing-pthread_threadid_np.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 5efc43bc9e1f943c1059f6e1c49e04bba93393b0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 23 Apr 2023 07:19:23 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] os-inl.h: fix for missing pthread_threadid_np
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inst/include/spdlog/details/os-inl.h | 16 +++++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 15 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/inst/include/spdlog/details/os-inl.h b/inst/include/spdlog/details/os-inl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b9bab53..0d7fb02 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- inst/include/spdlog/details/os-inl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ inst/include/spdlog/details/os-inl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,6 +60,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // unix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __has_feature // Clang - feature checking macros.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define __has_feature(x) 0 // Compatibility with non-clang compilers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -353,7 +357,17 @@ SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return static_cast<size_t>(::thr_self());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t tid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pthread_threadid_np(nullptr, &tid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) || defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tid = pthread_mach_thread_np(pthread_self());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# elif MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (&pthread_threadid_np) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_threadid_np(nullptr, &tid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tid = pthread_mach_thread_np(pthread_self());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_threadid_np(nullptr, &tid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return static_cast<size_t>(tid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else // Default to standard C++11 (other Unix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
</span></pre><pre style='margin:0'>
</pre>