<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/bfd8d256cde2822dbc22ec681fd8414f397a518c">https://github.com/macports/macports-ports/commit/bfd8d256cde2822dbc22ec681fd8414f397a518c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bfd8d256cde2822dbc22ec681fd8414f397a518c
</span>Author: Chih-Hsuan Yen <yan12125@macports.org>
AuthorDate: Fri May 31 21:04:00 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> qt4-creator-mac: use bundled botan 1.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Incompatible with botan2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ref: https://trac.macports.org/ticket/58513
</span>---
devel/qt4-creator-mac/Portfile | 13 ++++++-------
.../qt4-creator-mac/files/patch-no-pointer-comparison.diff | 11 +++++++++++
2 files changed, 17 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt4-creator-mac/Portfile b/devel/qt4-creator-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a349e46..83bd46d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qt4-creator-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qt4-creator-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,22 +12,23 @@ description Cross-platform integrated development environment (IDE) tail
</span> long_description Qt Creator is a cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
version 2.8.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> checksums rmd160 9348896ff468a90e2c36260621c615c1ee89e82c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24381282
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
homepage https://www.qt.io/qt-features-libraries-apis-tools-and-ide/
distname qt-creator-${version}-src
master_sites https://download.qt.io/official_releases/qtcreator/${branch}/${version}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:botan \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt4-mac-sqlite3-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:qt4-mac-sqlite3-plugin
</span>
# fix up QMake build files to remove debug and release building;
# specify that here instead.
patchfiles patch-remove_build_types.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-macports-paths.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-macports-paths.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-pointer-comparison.diff
</span>
post-patch {
# remove arch from QMake build scripts
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,8 +50,6 @@ pre-configure {
</span> configure.pre_args-append CONFIG+="release"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args "USE_SYSTEM_BOTAN=1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.target-append docs
# allow ccache, if specified by the user
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt4-creator-mac/files/patch-no-pointer-comparison.diff b/devel/qt4-creator-mac/files/patch-no-pointer-comparison.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..86f1695
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qt4-creator-mac/files/patch-no-pointer-comparison.diff
</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/plugins/debugger/debuggerplugin.cpp.orig 2019-05-31 21:06:24.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/debugger/debuggerplugin.cpp 2019-05-31 21:06:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1091,7 +1091,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const QAction *act = qobject_cast<QAction *>(sender());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTC_ASSERT(act, return);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const BreakpointModelId id = act->data().value<BreakpointModelId>();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QTC_ASSERT(id > 0, return);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QTC_ASSERT(id, return);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BreakTreeView::editBreakpoint(id, mainWindow());
</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>