<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5959a5240cfed960df20d5658d823cbea89d5317">https://github.com/macports/macports-ports/commit/5959a5240cfed960df20d5658d823cbea89d5317</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5959a5240cfed960df20d5658d823cbea89d5317
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sun Sep 1 16:29:06 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    protobuf3-cpp-upstream: update to 3.28.0
</span>---
 devel/protobuf3-cpp-upstream/Portfile                | 16 ++++++++++------
 .../files/patch-unbreak-time.diff                    | 20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/protobuf3-cpp-upstream/Portfile b/devel/protobuf3-cpp-upstream/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db556bb2f35..d6357159123 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/protobuf3-cpp-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/protobuf3-cpp-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,12 +15,12 @@ legacysupport.newest_darwin_requires_legacy 15
</span> # NOTE: For a minor or major version number change, also
 # NOTE:   Revbump et, protobuf-c, mosh and py-onnx
 set release_version \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                24.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                28.0
</span> 
 name            protobuf3-cpp-upstream
 github.setup    protocolbuffers protobuf 3.${release_version} v
 git.branch      v${release_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision        5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision        0
</span> 
 categories      devel
 maintainers     {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,9 +45,9 @@ long_description \
</span>                 name-value pairs.
 homepage        https://protobuf.dev
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums       rmd160  e74e942bc2c9859706cc92d0d9b20e3a817ec4c3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                sha256  616bb3536ac1fff3fb1a141450fa28b875e985712170ea7f1bfe5e5fc41e2cd8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                size    5180235
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums       rmd160  a151d8a2c942f5fe8c443a4b3f70b201473a480d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                sha256  13e7749c30bc24af6ee93e092422f9dc08491c7097efa69461f88eb5f61805ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                size    9259114
</span> 
 github.tarball_from releases
 distname        protobuf-${release_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,11 @@ worksrcdir      protobuf-${release_version}
</span> # So don't let the project cmake add zlib; already added (last) by base.
 patchfiles-append cmake-zlib-include.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard   2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Revert a breakage from dropping mach_time in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/protocolbuffers/protobuf/commit/a8a9bd2e4990fd5e0f0098bdfbe62bc00783eab7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-unbreak-time.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard   2014
</span> compiler.thread_local_storage   yes
 # error: constexpr constructor never produces a constant expression [-Winvalid-constexpr]
 compiler.blacklist {clang < 900}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/protobuf3-cpp-upstream/files/patch-unbreak-time.diff b/devel/protobuf3-cpp-upstream/files/patch-unbreak-time.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6ebc02487e5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/protobuf3-cpp-upstream/files/patch-unbreak-time.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/google/protobuf/map.h      2024-08-29 00:12:09.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/google/protobuf/map.h      2024-09-01 16:22:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <utility>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(GOOGLE_PROTOBUF_NO_RDTSC) && defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/mach_time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "google/protobuf/stubs/common.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -709,7 +709,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     // Use a commpage-based fast time function on Apple environments (MacOS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     // iOS, tvOS, watchOS, etc).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    s = clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    s = mach_absolute_time();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__x86_64__) && defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     uint32_t hi, lo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     asm volatile("rdtsc" : "=a"(lo), "=d"(hi));
</span></pre><pre style='margin:0'>

</pre>