<!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>[117961] 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/117961">117961</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-03-17 12:41:23 -0700 (Mon, 17 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py*-qscintilla:
+ update to 2.8.1 (to match Qscintilla);
+ add support for Python 3.4.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyqscintillaPortfile">trunk/dports/python/py-qscintilla/Portfile</a></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 (117960 => 117961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qscintilla/Portfile 2014-03-17 19:40:15 UTC (rev 117960)
+++ trunk/dports/python/py-qscintilla/Portfile 2014-03-17 19:41:23 UTC (rev 117961)
</span><span class="lines">@@ -10,8 +10,7 @@
</span><span class="cx"> # WARNING: The version of these python bindings must match the version
</span><span class="cx"> # number of the installed qscintilla port, or configure/building
</span><span class="cx"> # will fail with strange error messages.
</span><del>-version 2.7.2
-revision 3
</del><ins>+version 2.8.1
</ins><span class="cx">
</span><span class="cx"> categories python devel
</span><span class="cx"> license {GPL-2 GPL-3}
</span><span class="lines">@@ -27,11 +26,10 @@
</span><span class="cx"> distname QScintilla-gpl-${version}
</span><span class="cx"> master_sites sourceforge:pyqt
</span><span class="cx">
</span><del>-checksums md5 0fbfb06078f206a241a62c94861cce21 \
- sha1 2a11fb6be2c3005bc6502f929a0a339d4303af9b \
- rmd160 09552e7c41695822e7eebf86781901c7de90e521
</del><ins>+checksums rmd160 7301f1d9bea71b15cc9d98a20a2ece2b6843f3aa \
+ sha256 fbf3db4fe876152af56b5c9d5ec6f101c96bf97c05fdc5a87f358c707801c422
</ins><span class="cx">
</span><del>-python.versions 25 26 27 31 32 33
</del><ins>+python.versions 25 26 27 31 32 33 34
</ins><span class="cx"> python.default_version 27
</span><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span></span></pre></div>
<a id="trunkdportspythonpyqscintillafilespatchPythonconfigurepydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff (117960 => 117961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff 2014-03-17 19:40:15 UTC (rev 117960)
+++ trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff 2014-03-17 19:41:23 UTC (rev 117961)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- Python/configure.py.orig 2014-03-17 14:40:05.000000000 -0400
++++ Python/configure.py 2014-03-17 14:40:50.000000000 -0400
+@@ -498,6 +498,13 @@
</ins><span class="cx"> action='store_true',
</span><span class="cx"> help="suppress timestamps in the header comments of generated "
</span><span class="cx"> "code [default: include timestamps]")
</span><span class="lines">@@ -14,14 +14,23 @@
</span><span class="cx">
</span><span class="cx"> return p
</span><span class="cx">
</span><del>-@@ -660,6 +667,10 @@
- pro.write('TEMPLATE = lib\n')
</del><ins>+@@ -671,6 +678,10 @@
</ins><span class="cx"> pro.write('CONFIG += %s\n' % ('debug' if opts.debug else 'release'))
</span><span class="cx"> pro.write('CONFIG += %s\n' % ('staticlib' if opts.static else 'plugin'))
</span><ins>+ pro.write('CONFIG += qscintilla2\n')
</ins><span class="cx"> + if sys.platform == 'darwin' and opts.use_arch is not None:
</span><span class="cx"> + # convert opts.use_arch from a list to a string
</span><span class="cx"> + use_arch = ' '.join(iter(opts.use_arch))
</span><span class="cx"> + pro.write('CONFIG += %s\n' % use_arch)
</span><span class="cx">
</span><del>- pro.write('''
- greaterThan(QT_MAJOR_VERSION, 4) {
</del><ins>+ if not opts.static:
+ # I don't really understand why the linker needs to find the Python
+@@ -758,7 +769,7 @@
+
+ macx {
+ QMAKE_LFLAGS += "-undefined dynamic_lookup"
+- QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
++ QMAKE_LFLAGS += "-install_name $$target.path/$$PY_MODULE"
+ QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -change libqscintilla2.%s.dylib %s/libqscintilla2.%s.dylib $$PY_MODULE)
+ }
+ ''' % (QSCI_API_MAJOR, lib_dir, QSCI_API_MAJOR))
</ins></span></pre>
</div>
</div>
</body>
</html>