<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/43bd6cfa56c2c6231b5ebd4d190483aa0d7b94e4">https://github.com/macports/macports-ports/commit/43bd6cfa56c2c6231b5ebd4d190483aa0d7b94e4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 43bd6cfa56c2c6231b5ebd4d190483aa0d7b94e4
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jul 5 15:30:27 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> google-glog: update to 0.6.0
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove patch to re-expose IsGoogleLoggingInitialized(); now included by upstream
</span><span style='display:block; white-space:pre;color:#404040;'> - CC: @essandess
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/pytorch/pytorch/issues/58054
</span>---
devel/google-glog/Portfile | 10 +--
devel/google-glog/files/patch-fix-api-break.diff | 109 -----------------------
2 files changed, 4 insertions(+), 115 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/google-glog/Portfile b/devel/google-glog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a0a78feab4..c44fae98fc6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/google-glog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/google-glog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,11 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
name google-glog
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup google glog 0.5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup google glog 0.6.0 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 019faa965c4faef72c990cf010ee2ea62b3934b7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4bd6406219840295f961bfd850a04647d10ae508af81131ca6091f2cf71606a9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 183395
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f59cdbebd81c3c8881e3775ccec9336968648387 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8eb8a80e63839beb9587bbd7deb95ba263bc112f55db9042c6cd8c77f69a2a1f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 193314
</span>
categories devel
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,8 +24,6 @@ license BSD
</span>
# see https://github.com/google/glog/pull/239
patchfiles-append patch-pkg_file.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix api break, see https://github.com/google/glog/commit/0b3d4cb4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-api-break.diff
</span>
configure.args-append \
-DWITH_GFLAGS=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/google-glog/files/patch-fix-api-break.diff b/devel/google-glog/files/patch-fix-api-break.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7d1c352dc1c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/google-glog/files/patch-fix-api-break.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,109 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Tongliang Liao <xkszltl@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 13 May 2021 08:24:08 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Expose `IsGoogleLoggingInitialized()` in public API.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Resolve https://github.com/google/glog/issues/125
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/glog/logging.h.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/glog/logging.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -594,6 +594,9 @@ GOOGLE_GLOG_DLL_DECL void InitGoogleLogging(const char* argv0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void* prefix_callback_data = NULL);
</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;'>-+// Check if google's logging library has been initialized.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GOOGLE_GLOG_DLL_DECL bool IsGoogleLoggingInitialized();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Shutdown google's logging library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/logging_custom_prefix_unittest.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/logging_custom_prefix_unittest.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,11 +221,15 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const string early_stderr = GetCapturedTestStderr();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_FALSE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Setting a custom prefix generator (it will use the default format so that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // the golden outputs can be reused):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string prefix_attacher_data = "good data";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- InitGoogleLogging(argv[0], &PrefixAttacher, static_cast<void*>(&prefix_attacher_data));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_TRUE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RunSpecifiedBenchmarks();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FLAGS_logtostderr = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -992,8 +996,10 @@ static void TestCustomLoggerDeletionOnShutdown() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base::SetLogger(GLOG_INFO,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new RecordDeletionLogger(&custom_logger_deleted,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base::GetLogger(GLOG_INFO)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_TRUE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ShutdownGoogleLogging();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(custom_logger_deleted);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_FALSE(IsGoogleLoggingInitialized());
</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;'>- _START_GOOGLE_NAMESPACE_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/logging_unittest.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/logging_unittest.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,8 +197,12 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const string early_stderr = GetCapturedTestStderr();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_FALSE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- InitGoogleLogging(argv[0]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_TRUE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RunSpecifiedBenchmarks();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FLAGS_logtostderr = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -965,8 +969,10 @@ static void TestCustomLoggerDeletionOnShutdown() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base::SetLogger(GLOG_INFO,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new RecordDeletionLogger(&custom_logger_deleted,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- base::GetLogger(GLOG_INFO)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_TRUE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ShutdownGoogleLogging();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPECT_TRUE(custom_logger_deleted);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EXPECT_FALSE(IsGoogleLoggingInitialized());
</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;'>- _START_GOOGLE_NAMESPACE_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/utilities.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/utilities.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,6 +62,10 @@ _START_GOOGLE_NAMESPACE_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const char* g_program_invocation_short_name = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bool IsGoogleLoggingInitialized() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return g_program_invocation_short_name != NULL;
</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;'>- _END_GOOGLE_NAMESPACE_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // The following APIs are all internal.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,10 +180,6 @@ const char* ProgramInvocationShortName() {
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bool IsGoogleLoggingInitialized() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return g_program_invocation_short_name != NULL;
</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;'>- #ifdef OS_WINDOWS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct timeval {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long tv_sec, tv_usec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/utilities.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/utilities.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,8 +163,6 @@ namespace glog_internal_namespace_ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* ProgramInvocationShortName();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bool IsGoogleLoggingInitialized();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int64 CycleClock_Now();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int64 UsecToCycles(int64 usec);
</span></pre><pre style='margin:0'>
</pre>