<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/aacda2f5213b7d75008fe3d069438912e3c2baba">https://github.com/macports/macports-ports/commit/aacda2f5213b7d75008fe3d069438912e3c2baba</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 aacda2f qscintilla2: new port
</span>aacda2f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aacda2f5213b7d75008fe3d069438912e3c2baba
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Nov 13 16:21:15 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> qscintilla2: new port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> qscintilla2 is based on qt5
</span>---
devel/qscintilla2/Portfile | 138 ++++++++++++++++++++++++
devel/qscintilla2/files/patch-configure.py.diff | 48 +++++++++
devel/qscintilla2/files/patch-xcode-8.diff | 105 ++++++++++++++++++
3 files changed, 291 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qscintilla2/Portfile b/devel/qscintilla2/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2eb1adb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,138 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name qscintilla2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.9.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 18c5ae739a3d62e55bf35b98a3ab893cb278e3e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 98aab93d73b05635867c2fc757acb383b5856a0b416e3fd7659f1879996ddb7e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers mcalhoun openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor control.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.riverbankcomputing.com/software/qscintilla/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor control. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ As well as features found in standard text editing components, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QScintilla includes features especially useful when editing and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debugging source code. These include support for syntax styling, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error indicators, code completion and call tips. The selection \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ margin can contain markers like those used in debuggers to indicate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ breakpoints and the current line. Styling choices are more open \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ than with many editors, allowing the use of proportional fonts, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bold and italics, multiple foreground and background colours and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ multiple fonts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname QScintilla_gpl-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:pyqt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq ${name} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/Qt4Qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qtmacextras
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://www.riverbankcomputing.com/pipermail/qscintilla/2016-October/001160.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://www.riverbankcomputing.com/pipermail/qscintilla/2016-October/001167.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 8.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-xcode-8.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${qt_libs_dir}/libqscintilla2.12.dylib ${destroot}${qt_libs_dir}/libqscintilla2.12.0.2.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-designer {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt5_qmake_request_no_debug true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Qt Designer plugin for port ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/designer-Qt4Qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_versions {27 34 35}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport py${pver}-${name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Python bindings for port ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${worksrcdir}/Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${pver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pver}-sip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pver}-pyqt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # QScintilla2.api file is installed in the same location for all python subports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach over ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${over} ne ${pver}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append py${over}-${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # first part of patch allows configure.py to respect --sip=... argument
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # second part of patch passes certain environmental variables to qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pbranch [string range ${pver} 0 end-1].[string index ${pver} end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python${pbranch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --disable-dependency-tracking is not recognized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.python} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # --prefix is not recognized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pyqt=PyQt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --qmake=${qt_qmake_cmd} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sip=${prefix}/bin/sip-${pbranch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_CXX_STDLIB=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # specify build configuration (compiler, 32-bit/64-bit, etc.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![option universal_variant] || ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --spec=${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_ARCH=${build_arch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_TARGET_ARCH=${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(i386) --spec=${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(x86_64) --spec=${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch {i386 x86_64} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_ARCH=${arch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_TARGET_ARCH=${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}download
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex >QScintilla\[_-\]gpl-\(\[0-9.\]+\)${extract.suffix}<
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c58e64a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig 2016-11-11 06:57:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py 2016-11-11 07:06:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -923,18 +923,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The binary MacOS/X Qt installer defaults to XCode. If this is what
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we might have then use macx-clang (Qt v5) or macx-g++ (Qt v4).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Qt v5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if qt_config.QMAKE_SPEC == 'macx-xcode':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # This will exist (and we can't check anyway).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.qmake_spec = 'macx-clang'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # No need to explicitly name the default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.qmake_spec = ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- except AttributeError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Qt v4.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.qmake_spec = 'macx-g++'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # # Qt v5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # if qt_config.QMAKE_SPEC == 'macx-xcode':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # # This will exist (and we can't check anyway).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # self.qmake_spec = 'macx-clang'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # # No need to explicitly name the default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # self.qmake_spec = ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # except AttributeError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # # Qt v4.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # self.qmake_spec = 'macx-g++'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.qt_version_str = getattr(qt_config, 'QT_VERSION', '')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.api_dir = os.path.join(qt_config.QT_INSTALL_DATA, 'qsci')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1526,6 +1526,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.append('-spec')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.append(target_config.qmake_spec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.append('QMAKE_MACOSX_DEPLOYMENT_TARGET='+os.environ['QMAKE_MACOSX_DEPLOYMENT_TARGET'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.append('QT_ARCH='+os.environ['QT_ARCH'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.append('QT_TARGET_ARCH='+os.environ['QT_TARGET_ARCH'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.append('QMAKE_CXXFLAGS-=-stdlib=libc++')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.append('QMAKE_CXXFLAGS+=-stdlib='+os.environ['QT_CXX_STDLIB'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.append('QMAKE_LFLAGS-=-stdlib=libc++')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ args.append('QMAKE_LFLAGS+=-stdlib='+os.environ['QT_CXX_STDLIB'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.append(pro_file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _run_command(' '.join(args), verbose)
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..52bc157
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qscintilla2/files/patch-xcode-8.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,105 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 70f3944e36b8b95b3ad92106aeae2f511b3f0e90 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Alan Garny <agarny@hellix.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 13 Oct 2016 16:30:11 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] QScintilla: fix Xcode 8 compilation problem.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Another solution has been given on the QScintilla mailing list (see
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://www.riverbankcomputing.com/pipermail/qscintilla/2016-October/001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+160.html), referencing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/sqlitebrowser/sqlitebrowser/commit/969e263e5bf71e63df
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+8ee908cb4a2014b9a55c9b, but it’s not working for us.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Indeed, although it does allow QScintilla to be compiled using Xcode 8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if you open more than one file using a QScintilla-based editor that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+should have the same lexer, then the lexer of the first file will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+'wrong'. In our case, the line height of the first editor is slightly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bigger than that of the two other editors, which is clearly wrong.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Using this fix, everything is fine.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .../thirdParty/QScintilla/Qt4Qt5/Qsci/qsciscintilla.h | 10 ++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Qt4Qt5/qsciscintilla.cpp | 14 ++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 24 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Qt4Qt5/Qsci/qsciscintilla.h b/Qt4Qt5/Qsci/qsciscintilla.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c8a7d5a..563884b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Qsci/qsciscintilla.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Qsci/qsciscintilla.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,9 +22,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef QSCISCINTILLA_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define QSCISCINTILLA_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*---OPENCOR---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C++" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QByteArray>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QList>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2135,7 +2137,13 @@ private slots:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ct_cursor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QList<int> ct_shifts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AutoCompletionUseSingle use_single;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*---OPENCOR---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QPointer<QsciLexer> lex;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//---OPENCOR--- BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct Lexer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Lexer *lexerStruct;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//---OPENCOR--- END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QsciCommandSet *stdCmds;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QsciDocument doc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QColor nl_text_colour;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2157,8 +2165,10 @@ private slots:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QsciScintilla &operator=(const QsciScintilla &);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*---OPENCOR---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Qt4Qt5/qsciscintilla.cpp b/Qt4Qt5/qsciscintilla.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4ddad7c..4f0bf85 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qsciscintilla.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qsciscintilla.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +41,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Qsci/qscistyle.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Qsci/qscistyledtext.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//---OPENCOR--- BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct QsciScintilla::Lexer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QPointer<QsciLexer> object;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define lex (lexerStruct->object)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//---OPENCOR--- END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Make sure these match the values in Scintilla.h. We don't #include that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // file because it just causes more clashes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,6 +75,9 @@ QsciScintilla::QsciScintilla(QWidget *parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wchars(defaultWordChars), call_tips_position(CallTipsBelowText),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ call_tips_style(CallTipsNoContext), maxCallTips(-1),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_single(AcusNever), explicit_fillups(""), fillups_enabled(false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//---OPENCOR--- BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ , lexerStruct(new Lexer())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//---OPENCOR--- END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect(this,SIGNAL(SCN_MODIFYATTEMPTRO()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SIGNAL(modificationAttempted()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,6 +157,9 @@ QsciScintilla::~QsciScintilla()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doc.undisplay(this);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete stdCmds;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//---OPENCOR--- BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ delete lexerStruct;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//---OPENCOR--- END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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>