<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/edc8840571cdaf2cc780c26972379b3f00594a19">https://github.com/macports/macports-ports/commit/edc8840571cdaf2cc780c26972379b3f00594a19</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit edc8840571cdaf2cc780c26972379b3f00594a19
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 4 03:45:53 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    py-qscintilla: explicitly set Qt4 values
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Part of an attempt to maintain consistency with Qt5 qscintilla.
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://trac.macports.org/ticket/55211
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    No revbump since final build will be the same.
</span>---
 python/py-qscintilla/Portfile                      |  8 +++++
 python/py-qscintilla/files/patch-configure.py.diff | 42 ++++++++++++++++++++++
 2 files changed, 50 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-qscintilla/Portfile b/python/py-qscintilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b3b2c87..46b5bc7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-qscintilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,9 @@ if {${name} ne ${subport}} {
</span>    depends_lib-append  port:qscintilla \
                        port:py${python.version}-pyqt4
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+   # allow configure.py to respect --spec=... argument
</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>    use_configure       yes
 
    pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,10 +53,15 @@ if {${name} ne ${subport}} {
</span>    configure.dir       ${worksrcpath}/Python
    configure.cmd       ${python.bin} configure.py
    configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+       --pyqt=PyQt4 \
</span>        --sip=${prefix}/bin/sip-${python_ver_dot} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+       --qmake=${qt_qmake_cmd} \
</span>        --pyqt-sipdir=${prefix}/share/py${python.version}-sip/PyQt4 \
        --apidir=${qt_data_dir}/qsci
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+   configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       --spec=${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>    # --disable-dependency-tracking is not recognized.
    configure.universal_args-delete --disable-dependency-tracking
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-qscintilla/files/patch-configure.py.diff b/python/py-qscintilla/files/patch-configure.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0d841af
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-qscintilla/files/patch-configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig      2017-07-03 10:40:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py   2017-11-04 02:44:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -940,24 +940,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 self.qmake_spec = 'win32-msvc.net'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 self.qmake_spec = 'win32-msvc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            # Otherwise use 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;'>++        #else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        #    # Otherwise use 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;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # The binary MacOS/X Qt installer used to default to XCode.  If so then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         # 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.api_dir = os.path.join(qt_config.QT_INSTALL_DATA, 'qsci')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         self.qt_inc_dir = qt_config.QT_INSTALL_HEADERS
</span></pre><pre style='margin:0'>

</pre>