<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2f625120c413eead177c487d76014b8d153b030d">https://github.com/macports/macports-ports/commit/2f625120c413eead177c487d76014b8d153b030d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2f625120c413eead177c487d76014b8d153b030d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Feb 26 11:35:20 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> *qscintilla2*: update version 2.9.3->2.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Library name has changed, so revbump dependencies.
</span>---
devel/qscintilla2/Portfile | 12 +--
devel/qscintilla2/files/patch-configure.py.diff | 2 +-
devel/qscintilla2/files/patch-xcode-8.diff | 105 ------------------------
math/octave/Portfile | 2 +-
math/octave/files/patch-qscintilla2.diff | 11 ++-
5 files changed, 13 insertions(+), 119 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla2/Portfile b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ef5c1b..3a77d44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,9 @@ PortSystem 1.0
</span>
name qscintilla2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 18c5ae739a3d62e55bf35b98a3ab893cb278e3e6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 98aab93d73b05635867c2fc757acb383b5856a0b416e3fd7659f1879996ddb7e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4292b3dfb0656dc164b14510468bc774ab71cebd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 16be30577bc178470936c458551f2512cc068aff6e7a7de6ed244e28c045f6ec
</span>
categories devel
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,12 +36,6 @@ if { ${subport} eq ${name} } {
</span>
qt5.depends_component qtmacextras
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://www.riverbankcomputing.com/pipermail/qscintilla/2016-October/001160.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://www.riverbankcomputing.com/pipermail/qscintilla/2016-October/001167.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${xcodeversion} 8.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-xcode-8.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append CONFIG+=absolute_library_soname
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla2/files/patch-configure.py.diff b/devel/qscintilla2/files/patch-configure.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bf05d71..27c18ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla2/files/patch-configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla2/files/patch-configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.py.orig 2016-11-11 06:57:28.000000000 -0700
+++ configure.py 2016-11-11 07:06:04.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -923,18 +923,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -940,18 +940,18 @@
</span>
# The binary MacOS/X Qt installer defaults to XCode. If this is what
# we might have then use macx-clang (Qt v5) or macx-g++ (Qt v4).
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla2/files/patch-xcode-8.diff b/devel/qscintilla2/files/patch-xcode-8.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 52bc157..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qscintilla2/files/patch-xcode-8.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 70f3944e36b8b95b3ad92106aeae2f511b3f0e90 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Alan Garny <agarny@hellix.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 13 Oct 2016 16:30:11 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] QScintilla: fix Xcode 8 compilation problem.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Another solution has been given on the QScintilla mailing list (see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://www.riverbankcomputing.com/pipermail/qscintilla/2016-October/001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-160.html), referencing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/sqlitebrowser/sqlitebrowser/commit/969e263e5bf71e63df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-8ee908cb4a2014b9a55c9b, but it’s not working for us.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Indeed, although it does allow QScintilla to be compiled using Xcode 8,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if you open more than one file using a QScintilla-based editor that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-should have the same lexer, then the lexer of the first file will be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-'wrong'. In our case, the line height of the first editor is slightly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bigger than that of the two other editors, which is clearly wrong.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Using this fix, everything is fine.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .../thirdParty/QScintilla/Qt4Qt5/Qsci/qsciscintilla.h | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Qt4Qt5/qsciscintilla.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 24 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Qt4Qt5/Qsci/qsciscintilla.h b/Qt4Qt5/Qsci/qsciscintilla.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c8a7d5a..563884b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Qsci/qsciscintilla.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Qsci/qsciscintilla.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,9 +22,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef QSCISCINTILLA_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define QSCISCINTILLA_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*---OPENCOR---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C++" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>- #include <QByteArray>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QList>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2135,7 +2137,13 @@ private slots:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ct_cursor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QList<int> ct_shifts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AutoCompletionUseSingle use_single;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*---OPENCOR---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QPointer<QsciLexer> lex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//---OPENCOR--- BEGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct Lexer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Lexer *lexerStruct;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//---OPENCOR--- END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QsciCommandSet *stdCmds;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QsciDocument doc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QColor nl_text_colour;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2157,8 +2165,10 @@ private slots:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QsciScintilla &operator=(const QsciScintilla &);
</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;'>-+/*---OPENCOR---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Qt4Qt5/qsciscintilla.cpp b/Qt4Qt5/qsciscintilla.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4ddad7c..4f0bf85 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qsciscintilla.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qsciscintilla.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +41,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Qsci/qscistyle.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Qsci/qscistyledtext.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//---OPENCOR--- BEGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct QsciScintilla::Lexer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QPointer<QsciLexer> object;
</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;'>-+#define lex (lexerStruct->object)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//---OPENCOR--- END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Make sure these match the values in Scintilla.h. We don't #include that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // file because it just causes more clashes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,6 +75,9 @@ QsciScintilla::QsciScintilla(QWidget *parent)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wchars(defaultWordChars), call_tips_position(CallTipsBelowText),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- call_tips_style(CallTipsNoContext), maxCallTips(-1),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_single(AcusNever), explicit_fillups(""), fillups_enabled(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//---OPENCOR--- BEGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ , lexerStruct(new Lexer())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//---OPENCOR--- END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect(this,SIGNAL(SCN_MODIFYATTEMPTRO()),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SIGNAL(modificationAttempted()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,6 +157,9 @@ QsciScintilla::~QsciScintilla()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doc.undisplay(this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete stdCmds;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//---OPENCOR--- BEGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete lexerStruct;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//---OPENCOR--- END
</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;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff70e90..ae4c71d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ compiler.blacklist-append {*gcc-3*} {*gcc-4.[0-6]} {clang < 700} cc
</span>
name octave
version 4.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories math science
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-qscintilla2.diff b/math/octave/files/patch-qscintilla2.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d08241e..06a3e16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-qscintilla2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-qscintilla2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,16 @@
</span> --- configure.orig 2016-11-13 08:22:50.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-12-04 18:39:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34675,7 +34675,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-02-26 08:38:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34671,11 +34671,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$qt_version" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_MODULES="QtCore QtGui QtNetwork QtOpenGL"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- octave_qscintilla_libnames=qscintilla2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave_qscintilla_libnames="qscintilla2 qscintilla2_qt4"
</span> ;;
5)
QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 qscintilla2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 qscintilla2_qt5"
</span> ;;
*)
as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
</pre><pre style='margin:0'>
</pre>