<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/a9e78ed1771723dfa7c262639dbc5b39d03008cd">https://github.com/macports/macports-ports/commit/a9e78ed1771723dfa7c262639dbc5b39d03008cd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a9e78ed1771723dfa7c262639dbc5b39d03008cd
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Nov 3 19:36:30 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qscintilla: remove obsolete fix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The port tidy no longer installs platform.h, so there is no
</span><span style='display:block; white-space:pre;color:#404040;'> need for a workaround.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/htacg/tidy-html5/issues/223
</span>---
devel/qscintilla/Portfile | 6 ------
devel/qscintilla/files/patch-add_debug.diff | 9 ---------
2 files changed, 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla/Portfile b/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74fc122..6562530 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,12 +47,6 @@ configure.cxxflags-append -std=c++11
</span> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix up 'Platform.h's, to avoid a conflict with the port 'tidy's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 'platform.h'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fixfile [exec grep -lr \"Platform\.h\" ${worksrcpath}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s@\"Platform\.h\"@\"include/Platform\.h\"@g" ${fixfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # fix up .pro files to handle debug and release
set build_type "release"
if {[variant_isset debug]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla/files/patch-add_debug.diff b/devel/qscintilla/files/patch-add_debug.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cd73dde..17cc224 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla/files/patch-add_debug.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla/files/patch-add_debug.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,12 +36,3 @@
</span>
CONFIG(debug, debug|release) {
mac: {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDEPATH += . ../include ../lexlib ../src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCLUDEPATH += . .. ../include ../lexlib ../src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !CONFIG(staticlib) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFINES += QSCINTILLA_MAKE_DLL
</span></pre><pre style='margin:0'>
</pre>