<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/9e64c590df4f73328052377d289165e82942a47e">https://github.com/macports/macports-ports/commit/9e64c590df4f73328052377d289165e82942a47e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9e64c590df4f73328052377d289165e82942a47e
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Jan 6 13:24:31 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-qscintilla2: do not reproduce qmake5 PG code
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since the resulting build is the same.
</span>---
devel/qscintilla2/Portfile | 34 ++++++++-----------------
devel/qscintilla2/files/patch-configure.py.diff | 15 -----------
2 files changed, 11 insertions(+), 38 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 fe15d5a..baa7dd6 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;'>@@ -64,7 +64,7 @@ set python_versions {27 34 35}
</span>
foreach pver ${python_versions} {
subport py${pver}-${name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span>
description Python bindings for port ${name}
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,8 +84,7 @@ foreach pver ${python_versions} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # first part of patch allows configure.py to respect --sip=... argument
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # second part of patch passes certain environmental variables to qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow configure.py to respect --sip=... argument
</span> patchfiles-append patch-configure.py.diff
set pbranch [string range ${pver} 0 end-1].[string index ${pver} end]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,26 +105,15 @@ foreach pver ${python_versions} {
</span> --qmake=${qt_qmake_cmd} \
--sip=${prefix}/bin/sip-${pbranch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_CXX_STDLIB=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # specify build configuration (compiler, 32-bit/64-bit, etc.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![option universal_variant] || ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --spec=${qt_qmake_spec}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_ARCH=${build_arch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_TARGET_ARCH=${build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(i386) --spec=${qt_qmake_spec_32}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_args(x86_64) --spec=${qt_qmake_spec_64}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch {i386 x86_64} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_ARCH=${arch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT_TARGET_ARCH=${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.add_spec no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global merger_configure_args
</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 { ![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;'>+ } 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;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 c58e64a..bf05d71 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;'>@@ -31,18 +31,3 @@
</span>
self.qt_version_str = getattr(qt_config, 'QT_VERSION', '')
self.api_dir = os.path.join(qt_config.QT_INSTALL_DATA, 'qsci')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1526,6 +1526,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- args.append('-spec')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- args.append(target_config.qmake_spec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args.append('QMAKE_MACOSX_DEPLOYMENT_TARGET='+os.environ['QMAKE_MACOSX_DEPLOYMENT_TARGET'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args.append('QT_ARCH='+os.environ['QT_ARCH'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args.append('QT_TARGET_ARCH='+os.environ['QT_TARGET_ARCH'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args.append('QMAKE_CXXFLAGS-=-stdlib=libc++')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args.append('QMAKE_CXXFLAGS+=-stdlib='+os.environ['QT_CXX_STDLIB'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args.append('QMAKE_LFLAGS-=-stdlib=libc++')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ args.append('QMAKE_LFLAGS+=-stdlib='+os.environ['QT_CXX_STDLIB'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- args.append(pro_file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _run_command(' '.join(args), verbose)
</span></pre><pre style='margin:0'>
</pre>