<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/940815f1b2aab261b75a6c9abe825a40c272a2d9">https://github.com/macports/macports-ports/commit/940815f1b2aab261b75a6c9abe825a40c272a2d9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 940815f1b2a google-glog: Update to 0.5.0
</span>940815f1b2a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 940815f1b2aab261b75a6c9abe825a40c272a2d9
</span>Author: Vadim-Valdis Yudaev <judaew@outlook.de>
AuthorDate: Sat May 15 14:50:57 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> google-glog: Update to 0.5.0
</span>---
devel/google-glog/Portfile | 14 +--
devel/google-glog/files/patch-fix-api-break.diff | 109 +++++++++++++++++++++++
2 files changed, 117 insertions(+), 6 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 c3078d161b3..c3b3dc688bc 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.4.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c2627b9fc5c92a6f2f6d5475dbed9b8cf012ad86 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 217fd7e5c52b76d6163459d9b2a1ca790075f6e089887e48257362d4874ed133 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 200999
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup google glog 0.5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 019faa965c4faef72c990cf010ee2ea62b3934b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4bd6406219840295f961bfd850a04647d10ae508af81131ca6091f2cf71606a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 183395
</span>
categories devel
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,8 @@ 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:#e0ffe0;'>+# fix api break, see https://github.com/google/glog/commit/0b3d4cb4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-api-break.diff
</span>
configure.args-append -DWITH_GFLAGS=OFF \
-DBUILD_SHARED_LIBS=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +41,7 @@ post-destroot {
</span> set dest_doc ${destroot}${prefix}/share/doc/${name}
xinstall -d ${dest_doc}
xinstall -m 644 -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTHORS COPYING ChangeLog doc/designstyle.css doc/glog.html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AUTHORS COPYING ChangeLog README.rst \
</span> ${dest_doc}
}
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7d1c352dc1c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/google-glog/files/patch-fix-api-break.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,109 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Tongliang Liao <xkszltl@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 13 May 2021 08:24:08 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Expose `IsGoogleLoggingInitialized()` in public API.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Resolve https://github.com/google/glog/issues/125
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/glog/logging.h.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/glog/logging.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -594,6 +594,9 @@ GOOGLE_GLOG_DLL_DECL void InitGoogleLogging(const char* argv0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void* prefix_callback_data = NULL);
</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;'>++// Check if google's logging library has been initialized.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GOOGLE_GLOG_DLL_DECL bool IsGoogleLoggingInitialized();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Shutdown google's logging library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/logging_custom_prefix_unittest.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/logging_custom_prefix_unittest.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,11 +221,15 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const string early_stderr = GetCapturedTestStderr();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXPECT_FALSE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Setting a custom prefix generator (it will use the default format so that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // the golden outputs can be reused):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string prefix_attacher_data = "good data";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ InitGoogleLogging(argv[0], &PrefixAttacher, static_cast<void*>(&prefix_attacher_data));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXPECT_TRUE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RunSpecifiedBenchmarks();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLAGS_logtostderr = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -992,8 +996,10 @@ static void TestCustomLoggerDeletionOnShutdown() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base::SetLogger(GLOG_INFO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ new RecordDeletionLogger(&custom_logger_deleted,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base::GetLogger(GLOG_INFO)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXPECT_TRUE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ShutdownGoogleLogging();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXPECT_TRUE(custom_logger_deleted);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXPECT_FALSE(IsGoogleLoggingInitialized());
</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;'>+ _START_GOOGLE_NAMESPACE_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/logging_unittest.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/logging_unittest.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,8 +197,12 @@ int main(int argc, char **argv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const string early_stderr = GetCapturedTestStderr();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXPECT_FALSE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ InitGoogleLogging(argv[0]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXPECT_TRUE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RunSpecifiedBenchmarks();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FLAGS_logtostderr = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -965,8 +969,10 @@ static void TestCustomLoggerDeletionOnShutdown() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base::SetLogger(GLOG_INFO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ new RecordDeletionLogger(&custom_logger_deleted,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ base::GetLogger(GLOG_INFO)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXPECT_TRUE(IsGoogleLoggingInitialized());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ShutdownGoogleLogging();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXPECT_TRUE(custom_logger_deleted);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EXPECT_FALSE(IsGoogleLoggingInitialized());
</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;'>+ _START_GOOGLE_NAMESPACE_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/utilities.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/utilities.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,6 +62,10 @@ _START_GOOGLE_NAMESPACE_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char* g_program_invocation_short_name = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bool IsGoogleLoggingInitialized() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return g_program_invocation_short_name != NULL;
</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;'>+ _END_GOOGLE_NAMESPACE_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The following APIs are all internal.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,10 +180,6 @@ const char* ProgramInvocationShortName() {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bool IsGoogleLoggingInitialized() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return g_program_invocation_short_name != NULL;
</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;'>+ #ifdef OS_WINDOWS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct timeval {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long tv_sec, tv_usec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/utilities.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/utilities.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,8 +163,6 @@ namespace glog_internal_namespace_ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* ProgramInvocationShortName();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-bool IsGoogleLoggingInitialized();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int64 CycleClock_Now();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int64 UsecToCycles(int64 usec);
</span></pre><pre style='margin:0'>
</pre>