<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b7aea868e98121355a5a16dff7372c6677781f82">https://github.com/macports/macports-ports/commit/b7aea868e98121355a5a16dff7372c6677781f82</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 b7aea86 TOra: Fix build with clang-902.0.39.2 (Xcode 9.4.1)
</span>b7aea86 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b7aea868e98121355a5a16dff7372c6677781f82
</span>Author: Max Khon <fjoe@samodelkin.net>
AuthorDate: Thu Jul 19 16:12:29 2018 +0700
<span style='display:block; white-space:pre;color:#404040;'> TOra: Fix build with clang-902.0.39.2 (Xcode 9.4.1)
</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/47792
</span>---
aqua/TOra/Portfile | 5 ++++-
aqua/TOra/files/patch-src-toextract.cpp | 10 ++++++++++
aqua/TOra/files/patch-src-toextract.h | 18 ++++++++++++++++++
aqua/TOra/files/patch-src-toreport.cpp | 11 +++++++++++
4 files changed, 43 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/TOra/Portfile b/aqua/TOra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 785788c..1e9addb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/TOra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/TOra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,10 @@ depends_lib port:qscintilla-qt4
</span>
patchfiles patch-cmake-modules-FindOracle.cmake.diff \
patch-osx_tools-Info.plist.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-modules-FindQScintilla.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-modules-FindQScintilla.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-toextract.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-toextract.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-toreport.cpp
</span>
configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}/tmprelease/
# -Dmacports_prefix is there due to the patch for the Info.plist file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/TOra/files/patch-src-toextract.cpp b/aqua/TOra/files/patch-src-toextract.cpp
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a10479e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/TOra/files/patch-src-toextract.cpp
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/toextract.cpp.orig 2018-07-19 16:07:16.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/toextract.cpp 2018-07-19 16:07:31.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,6 +46,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "toextract.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <qapplication.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <qlabel.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/TOra/files/patch-src-toextract.h b/aqua/TOra/files/patch-src-toextract.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dc43d44
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/TOra/files/patch-src-toextract.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/toextract.h.orig 2018-07-19 16:05:27.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/toextract.h 2018-07-19 16:05:18.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -782,13 +782,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** Implement sort order based only on Order field.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bool operator <(const columnInfo &inf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool operator <(const columnInfo &inf) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Order < inf.Order;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** Implement sort order based only on Order field.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bool operator ==(const columnInfo &inf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool operator ==(const columnInfo &inf) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Order == inf.Order;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/TOra/files/patch-src-toreport.cpp b/aqua/TOra/files/patch-src-toreport.cpp
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a588846
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/TOra/files/patch-src-toreport.cpp
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/toreport.cpp.orig 2018-07-19 16:08:26.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/toreport.cpp 2018-07-19 16:08:40.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,6 +47,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "toextract.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "toreport.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <qapplication.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <qdatetime.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef Q_OS_WIN32
</span></pre><pre style='margin:0'>
</pre>