<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a4d2173287425013bd226e3a3aaa46c77895247f">https://github.com/macports/macports-ports/commit/a4d2173287425013bd226e3a3aaa46c77895247f</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 a4d21732874 colorer: Rename log variable to avoid build failure
</span>a4d21732874 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a4d2173287425013bd226e3a3aaa46c77895247f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Mar 9 18:09:34 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> colorer: Rename log variable to avoid build failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In newer toolchains, <math.h> seems to get included into this source
</span><span style='display:block; white-space:pre;color:#404040;'> file automatically, causing a problem when its log function conflicts
</span><span style='display:block; white-space:pre;color:#404040;'> with this file's log variable. Rename the variable to avoid that.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62397
</span>---
textproc/colorer/Portfile | 3 +-
.../files/patch-src-shared-common-Logging.cpp.diff | 55 ++++++++++++++++++++++
2 files changed, 57 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/colorer/Portfile b/textproc/colorer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2137e86674..5daa9063fa0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/colorer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/colorer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,8 @@ variant universal {}
</span>
patchfiles patch-Makefile.in.diff \
patch-src-colorer-makefile.gcc.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-libcolorer-makefile.gcc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-libcolorer-makefile.gcc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-shared-common-Logging.cpp.diff
</span>
post-patch {
# error: cast from 'int*' to 'int' loses precision
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/colorer/files/patch-src-shared-common-Logging.cpp.diff b/textproc/colorer/files/patch-src-shared-common-Logging.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9bddf239f06
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/colorer/files/patch-src-shared-common-Logging.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Rename log variable to avoid conflict with log function in <math.h>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/shared/common/Logging.cpp.orig 2006-11-24 17:14:42.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/shared/common/Logging.cpp 2021-03-10 00:03:58.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,30 +10,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char *toTrace[] = {"BaseEditorNative", "JavaLineSource" };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static FILE *log = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static FILE *logfh = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void file_logger(int level, const char *cname, const char *msg, va_list v){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int idx = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while (log == 0 && idx < 10){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (logfh == 0 && idx < 10){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char log_name[30];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __unix__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(log_name, "/tmp/clr-trace%d.log", idx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(log_name, "c:\\clr-trace%d.log", idx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- log = fopen(log_name, "ab+");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ logfh = fopen(log_name, "ab+");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ idx++;
</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;'>+- fprintf(log, "[%s][%s] ", levelNames[level], cname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(logfh, "[%s][%s] ", levelNames[level], cname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vfprintf(log, msg, v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vfprintf(logfh, msg, v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(log, "\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(logfh, "\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fflush(log);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fflush(logfh);
</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;'>+ static void console_logger(int level, const char *cname, const char *msg, va_list v){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,10 +48,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void colorer_logger_set_target(const char *logfile){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (logfile == 0) return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (log != 0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fclose(log);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (logfh != 0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fclose(logfh);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- log = fopen(logfile, "ab+");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ logfh = fopen(logfile, "ab+");
</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></pre><pre style='margin:0'>
</pre>