<!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>[120855] trunk/dports</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/120855">120855</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-06-09 18:25:48 -0700 (Mon, 09 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>qscintilla and py*qscintilla:
+ update to 2.8.2;
+ rearrange sections to make more convenient.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelqscintillaPortfile">trunk/dports/devel/qscintilla/Portfile</a></li>
<li><a href="#trunkdportsdevelqscintillafilespatchadd_debugdiff">trunk/dports/devel/qscintilla/files/patch-add_debug.diff</a></li>
<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="trunkdportsdevelqscintillaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/qscintilla/Portfile (120854 => 120855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/qscintilla/Portfile 2014-06-10 01:16:11 UTC (rev 120854)
+++ trunk/dports/devel/qscintilla/Portfile 2014-06-10 01:25:48 UTC (rev 120855)
</span><span class="lines">@@ -5,7 +5,14 @@
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><span class="cx"> name qscintilla
</span><del>-version 2.8.1
</del><ins>+
+# NOTE: the version of this port must be kept in sync with the 'py*-qscintilla' port(s),
+# since they contain the python bindings!
+
+version 2.8.2
+checksums rmd160 030773b5013cc6e36a928b607ba24d5d5d841e55 \
+ sha256 b054d70df9f460d54d42b2879a1ac921a490ebaea8313bac932282d234a53f74
+
</ins><span class="cx"> categories devel
</span><span class="cx"> license {GPL-2 GPL-3 OpenSSLException}
</span><span class="cx"> maintainers michaelld openmaintainer
</span><span class="lines">@@ -24,17 +31,9 @@
</span><span class="cx"> bold and italics, multiple foreground and background colours and \
</span><span class="cx"> multiple fonts. See the py*-qscintilla port to install python bindings.
</span><span class="cx">
</span><del>-#
-# NOTE: the version of this port must be kept in sync with the 'py*-qscintilla' port(s),
-# since they contain the python bindings!
-#
-
</del><span class="cx"> distname QScintilla-gpl-${version}
</span><span class="cx"> master_sites sourceforge:pyqt
</span><span class="cx">
</span><del>-checksums rmd160 7301f1d9bea71b15cc9d98a20a2ece2b6843f3aa \
- sha256 fbf3db4fe876152af56b5c9d5ec6f101c96bf97c05fdc5a87f358c707801c422
-
</del><span class="cx"> # fix up QMake .pro files for +debug, if selected; also fixed up the
</span><span class="cx"> # library and header paths to include .. and ../Qt4 before others.
</span><span class="cx"> patchfiles-append patch-add_debug.diff
</span></span></pre></div>
<a id="trunkdportsdevelqscintillafilespatchadd_debugdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/qscintilla/files/patch-add_debug.diff (120854 => 120855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/qscintilla/files/patch-add_debug.diff 2014-06-10 01:16:11 UTC (rev 120854)
+++ trunk/dports/devel/qscintilla/files/patch-add_debug.diff 2014-06-10 01:25:48 UTC (rev 120855)
</span><span class="lines">@@ -25,24 +25,22 @@
</span><span class="cx"> +
</span><span class="cx"> +INCLUDEPATH += ../Qt4Qt5
</span><span class="cx"> +LIBS += -L../Qt4Qt5 -l$$QSCI_LIB
</span><del>---- Qt4Qt5/qscintilla.pro.orig 2014-03-17 13:40:20.000000000 -0400
-+++ Qt4Qt5/qscintilla.pro 2014-03-17 13:43:15.000000000 -0400
-@@ -29,10 +29,16 @@
</del><ins>+--- Qt4Qt5/qscintilla.pro.orig 2014-05-26 09:42:15.000000000 -0400
++++ Qt4Qt5/qscintilla.pro 2014-06-02 14:40:49.000000000 -0400
+@@ -29,8 +29,14 @@
</ins><span class="cx">
</span><span class="cx"> TEMPLATE = lib
</span><span class="cx"> TARGET = qscintilla2
</span><del>--CONFIG += qt warn_off release dll thread exceptions
</del><ins>+-CONFIG += qt warn_off release thread exceptions
</ins><span class="cx"> -INCLUDEPATH += . ../include ../lexlib ../src
</span><del>-+CONFIG += qt warn_off dll thread exceptions @ARCHES@ @BUILD_TYPE@
</del><ins>++CONFIG += qt warn_off thread exceptions @ARCHES@ @BUILD_TYPE@
</ins><span class="cx"> +INCLUDEPATH += . .. ../include ../lexlib ../src
</span><del>- DEFINES += QSCINTILLA_MAKE_DLL SCINTILLA_QT SCI_LEXER
-
</del><ins>++
</ins><span class="cx"> +!debug_and_release|build_pass {
</span><del>-+ CONFIG(debug, debug|release) {
-+ macx:TARGET = $$member(TARGET, 0)_debug
-+ }
</del><ins>++ CONFIG(debug, debug|release) {
++ macx:TARGET = $$member(TARGET, 0)_debug
++ }
</ins><span class="cx"> +}
</span><del>-+
- greaterThan(QT_MAJOR_VERSION, 4) {
- QT += widgets
- QT += printsupport
</del><ins>+
+ DEFINES += QSCINTILLA_MAKE_DLL SCINTILLA_QT SCI_LEXER
+ greaterThan(QT_MAJOR_VERSION, 3) {
</ins></span></pre></div>
<a id="trunkdportspythonpyqscintillaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-qscintilla/Portfile (120854 => 120855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qscintilla/Portfile 2014-06-10 01:16:11 UTC (rev 120854)
+++ trunk/dports/python/py-qscintilla/Portfile 2014-06-10 01:25:48 UTC (rev 120855)
</span><span class="lines">@@ -10,8 +10,11 @@
</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.8.1
</del><span class="cx">
</span><ins>+version 2.8.2
+checksums rmd160 030773b5013cc6e36a928b607ba24d5d5d841e55 \
+ sha256 b054d70df9f460d54d42b2879a1ac921a490ebaea8313bac932282d234a53f74
+
</ins><span class="cx"> categories python devel
</span><span class="cx"> license {GPL-2 GPL-3}
</span><span class="cx"> maintainers michaelld openmaintainer
</span><span class="lines">@@ -26,9 +29,6 @@
</span><span class="cx"> distname QScintilla-gpl-${version}
</span><span class="cx"> master_sites sourceforge:pyqt
</span><span class="cx">
</span><del>-checksums rmd160 7301f1d9bea71b15cc9d98a20a2ece2b6843f3aa \
- sha256 fbf3db4fe876152af56b5c9d5ec6f101c96bf97c05fdc5a87f358c707801c422
-
</del><span class="cx"> python.versions 25 26 27 31 32 33 34
</span><span class="cx"> python.default_version 27
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpyqscintillafilespatchPythonconfigurepydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff (120854 => 120855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff 2014-06-10 01:16:11 UTC (rev 120854)
+++ trunk/dports/python/py-qscintilla/files/patch-Python-configure.py.diff 2014-06-10 01:25:48 UTC (rev 120855)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- Python/configure.py.orig 2014-05-26 09:42:16.000000000 -0400
++++ Python/configure.py 2014-06-02 14:51:02.000000000 -0400
+@@ -1108,6 +1108,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">@@ -12,25 +12,29 @@
</span><span class="cx"> + "[default: system default]")
</span><span class="cx"> + p.add_option_group(g)
</span><span class="cx">
</span><del>- return p
</del><ins>+ module_config.init_optparser(p, target_config)
</ins><span class="cx">
</span><del>-@@ -671,6 +678,10 @@
</del><ins>+@@ -1235,6 +1242,11 @@
</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><del>- pro.write('CONFIG += qscintilla2\n')
</del><ins>+
</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><ins>++
+ config = qmake_config.get('CONFIG')
+ if config:
+ pro.write('CONFIG += %s\n' % config)
+@@ -1334,10 +1346,7 @@
</ins><span class="cx">
</span><del>- if not opts.static:
- # I don't really understand why the linker needs to find the Python
-@@ -758,7 +769,7 @@
-
</del><span class="cx"> macx {
</span><span class="cx"> QMAKE_LFLAGS += "-undefined dynamic_lookup"
</span><del>-- QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
</del><ins>+- greaterThan(QT_MAJOR_VERSION, 4) {
+- QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
+- }
+-
</ins><span class="cx"> + QMAKE_LFLAGS += "-install_name $$target.path/$$PY_MODULE"
</span><del>- QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -change libqscintilla2.%s.dylib %s/libqscintilla2.%s.dylib $$PY_MODULE)
</del><ins>+ QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\\\n\\\\t)$$quote(install_name_tool -change %s %s $$PY_MODULE)
</ins><span class="cx"> }
</span><del>- ''' % (QSCI_API_MAJOR, lib_dir, QSCI_API_MAJOR))
</del><ins>+ ''' % (os.path.basename(dylib), dylib))
</ins></span></pre>
</div>
</div>
</body>
</html>