<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[117747] trunk/dports/python/py-qscintilla</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/117747">117747</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-03-10 13:01:51 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py*-qscintilla: make +universal.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyqscintillaPortfile">trunk/dports/python/py-qscintilla/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/py-qscintilla/files/</li>
<li><a href="#trunkdportspythonpyqscintillafilespatchPythonconfigurepydiff">trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyqscintillaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-qscintilla/Portfile (117746 => 117747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qscintilla/Portfile 2014-03-10 19:25:44 UTC (rev 117746)
+++ trunk/dports/python/py-qscintilla/Portfile 2014-03-10 20:01:51 UTC (rev 117747)
</span><span class="lines">@@ -41,18 +41,29 @@
</span><span class="cx"> # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span class="cx"> depends_lib-append path:share/py${python.version}-sip/PyQt4:py${python.version}-pyqt4
</span><span class="cx">
</span><del>- universal_variant no
</del><ins>+ patchfiles-append patch-Python-configure.py.diff
+
</ins><span class="cx"> use_configure yes
</span><span class="cx">
</span><ins>+ pre-configure {
+ foreach arch ${qt_arch_types} {
+ configure.args-append --use-arch=$arch
+ }
+ }
+
</ins><span class="cx"> set python_ver_dot [join [split ${python.version} ""] "."]
</span><span class="cx">
</span><span class="cx"> configure.pre_args
</span><span class="cx"> configure.dir ${worksrcpath}/Python
</span><del>- configure.cmd ${python.bin} configure.py \
</del><ins>+ configure.cmd ${python.bin} configure.py
+ configure.args-append \
</ins><span class="cx"> --sip=${prefix}/bin/sip-${python_ver_dot} \
</span><span class="cx"> --pyqt-sipdir=${prefix}/share/py${python.version}-sip/PyQt4 \
</span><span class="cx"> --apidir=${qt_data_dir}/qsci
</span><span class="cx">
</span><ins>+ # --disable-dependency-tracking is not recognized.
+ configure.universal_args-delete --disable-dependency-tracking
+
</ins><span class="cx"> build.dir ${worksrcpath}/Python
</span><span class="cx"> build.cmd make
</span><span class="cx"> build.target
</span></span></pre></div>
<a id="trunkdportspythonpyqscintillafilespatchPythonconfigurepydiff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff (0 => 117747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff (rev 0)
+++ trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff 2014-03-10 20:01:51 UTC (rev 117747)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+--- Python/configure.py.orig 2014-03-10 15:27:40.000000000 -0400
++++ Python/configure.py 2014-03-10 15:56:30.000000000 -0400
+@@ -496,6 +496,13 @@
+ action='store_true',
+ help="suppress timestamps in the header comments of generated "
+ "code [default: include timestamps]")
++ if sys.platform == 'darwin':
++ g = optparse.OptionGroup(p, title="MacOS X Configuration")
++ g.add_option("--use-arch", action="append", metavar="ARCH",
++ dest="use_arch", choices=["x86", "x86_64", "ppc", "ppc64"],
++ help="the architecture to use when building Qscintilla "
++ "[default: system default]")
++ p.add_option_group(g)
+
+ return p
+
+@@ -660,6 +667,10 @@
+ pro.write('TEMPLATE = lib\n')
+ pro.write('CONFIG += %s\n' % ('debug' if opts.debug else 'release'))
+ pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
++ if sys.platform == 'darwin' and opts.use_arch is not None:
++ # convert opts.use_arch from a list to a string
++ use_arch = ' '.join(iter(opts.use_arch))
++ pro.write('CONFIG += %s\n' % use_arch)
+
+ pro.write('''
+ greaterThan(QT_MAJOR_VERSION, 4) {
</ins></span></pre>
</div>
</div>
</body>
</html>