<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/cb2b9da15cf5a1162720e40366288cf13ae68b56">https://github.com/macports/macports-ports/commit/cb2b9da15cf5a1162720e40366288cf13ae68b56</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cb2b9da15cf5a1162720e40366288cf13ae68b56
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 4 03:25:50 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-qscintilla: use cache file instead of patching
</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 +++----
.../files/patch-Python-configure.py.diff | 28 ----------------------
2 files changed, 3 insertions(+), 33 deletions(-)
<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 2cd5028..b3b2c87 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,14 +36,12 @@ if {${name} ne ${subport}} {
</span> depends_lib-append port:qscintilla \
port:py${python.version}-pyqt4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Python-configure.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure yes
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${qt_arch_types} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --use-arch=$arch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cache [open "${configure.dir}/.qmake.cache" w 0644]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${cache} "CONFIG += ${qt_arch_types}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${cache}
</span> }
set python_ver_dot [join [split ${python.version} ""] "."]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-qscintilla/files/patch-Python-configure.py.diff b/python/py-qscintilla/files/patch-Python-configure.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index db98d14..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-qscintilla/files/patch-Python-configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Python/configure.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Python/configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1207,6 +1207,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p.add_option('--verbose', '-w', dest='verbose', default=False,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- action='store_true',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- help="enable verbose output during configuration")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g = optparse.OptionGroup(p, title="MacOS X Configuration")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g.add_option("--use-arch", action="append", metavar="ARCH",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dest="use_arch", choices=["x86", "x86_64", "ppc", "ppc64"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ help="the architecture to use when building Qscintilla "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "[default: system default]")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p.add_option_group(g)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkg_config.init_optparser(p, target_config)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1412,6 +1419,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pro.write('CONFIG += %s\n' % ('debug' if target_config.debug else 'release'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if sys.platform == 'darwin' and opts.use_arch is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # convert opts.use_arch from a list to a string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ use_arch = ' '.join(iter(opts.use_arch))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pro.write('CONFIG += %s\n' % use_arch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config = qmake_config.get('CONFIG')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if config:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pro.write('CONFIG += %s\n' % config)
</span></pre><pre style='margin:0'>
</pre>