<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fb0d9658c32fa864c1bda1399e9be69b137095a6">https://github.com/macports/macports-ports/commit/fb0d9658c32fa864c1bda1399e9be69b137095a6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fb0d9658c32fa864c1bda1399e9be69b137095a6
</span>Author: Vadym-Valdis Yudaiev <judaew@outlook.de>
AuthorDate: Sun Jul 9 22:39:11 2023 +0300
<span style='display:block; white-space:pre;color:#404040;'> spdlog: update to 1.12.0 and remove unnecessary patch
</span>---
devel/spdlog/Portfile | 14 +++++---------
devel/spdlog/files/patch-pthread.diff | 32 --------------------------------
2 files changed, 5 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/spdlog/Portfile b/devel/spdlog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c22a5d6497c..12d984bc314 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/spdlog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/spdlog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,14 +4,9 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gabime spdlog 1.11.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gabime spdlog 1.12.0 v
</span> github.tarball_from archive
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a11d5bb1a8ba1ad2320be4eed3087cf9b0f20db5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 373033
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> conflicts spdlog0
categories devel
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +17,9 @@ maintainers {protomail.com:XNephila @XNephila} \
</span> description Very fast, header only, C++ logging library.
long_description {*}${description}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 06bfcd66f06a9eea8544edfa81df85cf1f71ac08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 251037
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
compiler.thread_local_storage yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/gabime/spdlog/commit/c65aa4e4889939c1afa82001db349cac237a13f8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-pthread.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/spdlog/files/patch-pthread.diff b/devel/spdlog/files/patch-pthread.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 69a9810ccff..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/spdlog/files/patch-pthread.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/spdlog/details/os-inl.h.orig 2022-11-03 05:13:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/spdlog/details/os-inl.h 2023-04-28 04:51:00.000000000 +0800
</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 @@
</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>