<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5e6f578b0b8864c154da5b7cd9cc0e7c8045799b">https://github.com/macports/macports-ports/commit/5e6f578b0b8864c154da5b7cd9cc0e7c8045799b</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 5e6f578 kcachegrind4: fix build with recent compilers (fixes https://trac.macports.org/ticket/59174)
</span>5e6f578 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5e6f578b0b8864c154da5b7cd9cc0e7c8045799b
</span>Author: Nicolas Pavillon <pavillon.nicolas@gmail.com>
AuthorDate: Sat Oct 5 23:52:09 2019 +0900
<span style='display:block; white-space:pre;color:#404040;'> kcachegrind4: fix build with recent compilers (fixes https://trac.macports.org/ticket/59174)
</span>---
kde/kcachegrind4/Portfile | 3 ++-
kde/kcachegrind4/files/patch-nullPointers.diff | 12 ++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kcachegrind4/Portfile b/kde/kcachegrind4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 27fb481..3dd65b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/kcachegrind4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kcachegrind4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,8 @@ use_xz yes
</span> checksums rmd160 b0188e11e8846a87bc7c444a1207a199fb4df77d \
sha256 a67917ae2540101b0ab0be618ead7aa4619b1808ec1ebd74358739f8fffea424
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-CMake-icons.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CMake-icons.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-nullPointers.diff
</span>
#Binaries do not link to openssl, nor use the ssl backend of kdelibs4
license_noconflict openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/kcachegrind4/files/patch-nullPointers.diff b/kde/kcachegrind4/files/patch-nullPointers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1731599
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/kcachegrind4/files/patch-nullPointers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur ../kcachegrind-4.14.3-orig/libcore/tracedata.cpp ./libcore/tracedata.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ../kcachegrind-4.14.3-orig/libcore/tracedata.cpp 2014-07-24 06:36:47.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./libcore/tracedata.cpp 2019-10-05 23:44:37.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3259,7 +3259,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void TraceData::addPart(TracePart* part)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (_parts.contains(part)>0) return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_parts.contains(part)!=NULL) return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((part->partNumber()==0) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (part->processID()==0)) {
</span></pre><pre style='margin:0'>
</pre>