<!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>[138326] trunk/dports/python/py-pyqt4</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/138326">138326</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-07-05 12:25:32 -0700 (Sun, 05 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>py*-pyqt4:
+ remove cruft from py2[4-6], py3[0-3];
+ always build with dbus-python[27,34];
+ patch configure.py to work with phonon installed in a different directory than Qt4;
+ rev-bump for changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypyqt4Portfile">trunk/dports/python/py-pyqt4/Portfile</a></li>
<li><a href="#trunkdportspythonpypyqt4filespatchconfigurepydiff">trunk/dports/python/py-pyqt4/files/patch-configure.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpypyqt4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyqt4/Portfile (138325 => 138326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyqt4/Portfile 2015-07-05 19:21:46 UTC (rev 138325)
+++ trunk/dports/python/py-pyqt4/Portfile 2015-07-05 19:25:32 UTC (rev 138326)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> homepage http://www.riverbankcomputing.co.uk/software/pyqt/intro
</span><span class="cx">
</span><span class="cx"> version 4.11.4
</span><ins>+revision 1
</ins><span class="cx">
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> set patch [lindex [split ${version} .] 2]
</span><span class="lines">@@ -147,37 +148,22 @@
</span><span class="cx"> CFLAGS="${cflags}" \
</span><span class="cx"> CXXFLAGS="${cxxflags}"
</span><span class="cx">
</span><del>- # subport for Python 2.4 or 2.5 installs into non-Framework locations
- if {${python.version} <= 25} {
- configure.cmd-append " -d ${python.pkgd} -b ${prefix}/bin"
- }
</del><ins>+ configure.args-append -e QtDesigner
</ins><span class="cx">
</span><del>- # Don't build designer plugin for 2.4; not built as a framework
- if {${python.version} != 24 } {
- configure.args-append -e QtDesigner
- }
</del><ins>+ depends_lib-append port:dbus-python${python.version}
+ configure.args-append --dbus=${python.include}/dbus-1.0
</ins><span class="cx">
</span><span class="cx"> variant phonon description {Add phonon support} {
</span><span class="cx"> configure.args-append -e phonon
</span><span class="cx"> depends_lib-append port:phonon
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> variant scintilla description {Add QScintilla API file } {
</span><span class="cx"> configure.args-delete --no-qsci-api
</span><span class="cx"> configure.args-append --qsci-api
</span><span class="cx"> depends_lib-append port:qscintilla
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # dbus-python does not yet work correctly with 3.0+
-
- if {${python.version} <= 27} {
-
- depends_lib-append port:dbus-python${python.version}
- configure.args-append --dbus=${python.include}/dbus-1.0
-
- }
-
</del><span class="cx"> post-configure {
</span><span class="cx"> if {[variant_isset universal]} {
</span><span class="cx"> set conflags ""
</span></span></pre></div>
<a id="trunkdportspythonpypyqt4filespatchconfigurepydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyqt4/files/patch-configure.py.diff (138325 => 138326)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyqt4/files/patch-configure.py.diff 2015-07-05 19:21:46 UTC (rev 138325)
+++ trunk/dports/python/py-pyqt4/files/patch-configure.py.diff 2015-07-05 19:25:32 UTC (rev 138326)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- configure.py.orig 2015-06-11 11:33:16.000000000 -0400
-+++ configure.py 2015-06-30 13:19:46.000000000 -0400
</del><ins>+--- configure.py.orig 2015-07-03 16:51:11.000000000 -0400
++++ configure.py 2015-07-03 16:52:51.000000000 -0400
</ins><span class="cx"> @@ -39,6 +39,7 @@
</span><span class="cx"> qt_dir = None
</span><span class="cx"> qt_incdir = None
</span><span class="lines">@@ -8,7 +8,48 @@
</span><span class="cx"> qt_bindir = None
</span><span class="cx"> qt_datadir = None
</span><span class="cx"> qt_archdatadir = None
</span><del>-@@ -973,18 +974,7 @@
</del><ins>+@@ -513,7 +514,39 @@
+ generate_code("QtXmlPatterns")
+
+ if "phonon" in pyqt_modules:
+- generate_code("phonon")
++ # check to see if phonon is installed by Qt or external to
++ # it. adding to the include path and library path will not
++ # hurt if Qt installed phonon, and will get the headers
++ # and library if phonon was installed external to Qt.
++ phononincdirs = []
++ phononlibdirs = []
++ sout = get_command_stdout("pkg-config --cflags-only-I --libs phonon")
++ iflags = sout.read().strip()
++ if iflags:
++ sout = get_command_stdout("%s -query QT_INSTALL_PREFIX" % opts.qmake)
++ qt_install_prefix = sout.read().strip()
++ if sys.hexversion >= 0x03000000:
++ iflags = iflags.decode()
++ qt_install_prefix = qt_install_prefix.decode()
++ for f in iflags.split():
++ # look for flags outside the Qt install prefix only
++ if f.find(qt_install_prefix) == -1:
++ if f.startswith("-I"):
++ tdir = f[2:]
++ phononincdirs.append(tdir)
++ if not tdir.endswith("phonon"):
++ phononincdirs.append(tdir + "/phonon")
++ elif f.startswith("-L"):
++ phononlibdirs.append(f[2:])
++
++ if opts.bigqt:
++ cons_xtra_incdirs.append(phononincdirs)
++ cons_xtra_libdirs.append(phononlibdirs)
++
++ generate_code("phonon")
++ else:
++ generate_code("phonon", extra_include_dirs=phononincdirs,
++ extra_lib_dirs=phononlibdirs)
+
+ if "QtAssistant" in pyqt_modules:
+ generate_code("QtAssistant")
+@@ -973,18 +1006,7 @@
</ins><span class="cx"> dynamic_pylib = "--enable-shared" in config_args
</span><span class="cx">
</span><span class="cx"> if dynamic_pylib:
</span><span class="lines">@@ -28,7 +69,7 @@
</span><span class="cx"> else:
</span><span class="cx"> sipconfig.inform("The Qt Designer plugin was disabled because a dynamic Python library couldn't be found")
</span><span class="cx"> opts.designer_plugin = False
</span><del>-@@ -1083,7 +1073,10 @@
</del><ins>+@@ -1083,7 +1105,10 @@
</ins><span class="cx">
</span><span class="cx"> sipconfig.inform("SIP %s is being used." % sipcfg.sip_version_str)
</span><span class="cx"> sipconfig.inform("The Qt header files are in %s." % qt_incdir)
</span><span class="lines">@@ -40,7 +81,7 @@
</span><span class="cx"> sipconfig.inform("The Qt binaries are in %s." % qt_bindir)
</span><span class="cx"> sipconfig.inform("The Qt mkspecs directory is in %s." % qt_archdatadir)
</span><span class="cx"> sipconfig.inform("These PyQt modules will be built: %s." % ", ".join(pyqt_modules))
</span><del>-@@ -1148,7 +1141,8 @@
</del><ins>+@@ -1148,7 +1173,8 @@
</ins><span class="cx"> "qt_data_dir": qt_datadir,
</span><span class="cx"> "qt_archdata_dir": qt_archdatadir,
</span><span class="cx"> "qt_inc_dir": qt_incdir,
</span><span class="lines">@@ -50,7 +91,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sipconfig.create_config_module(module, template, content, macros)
</span><del>-@@ -1736,7 +1730,7 @@
</del><ins>+@@ -1736,7 +1762,7 @@
</ins><span class="cx"> lfile = license.LicenseFile
</span><span class="cx"> except AttributeError:
</span><span class="cx"> lfile = None
</span><span class="lines">@@ -59,7 +100,7 @@
</span><span class="cx"> ltype = None
</span><span class="cx">
</span><span class="cx"> if ltype is None:
</span><del>-@@ -1841,12 +1835,14 @@
</del><ins>+@@ -1841,12 +1867,14 @@
</ins><span class="cx"> names = list(sipcfg.build_macros().keys())
</span><span class="cx"> names.append("INCDIR_QT")
</span><span class="cx"> names.append("LIBDIR_QT")
</span><span class="lines">@@ -75,7 +116,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> macros = sipconfig.parse_build_macros(fname, names, overrides, properties)
</span><del>-@@ -1892,7 +1888,7 @@
</del><ins>+@@ -1892,7 +1920,7 @@
</ins><span class="cx">
</span><span class="cx"> # Work out how Qt was built on MacOS.
</span><span class="cx"> if sys.platform == "darwin":
</span><span class="lines">@@ -84,7 +125,7 @@
</span><span class="cx"> global qt_framework
</span><span class="cx"> qt_framework = 1
</span><span class="cx">
</span><del>-@@ -1909,6 +1905,7 @@
</del><ins>+@@ -1909,6 +1937,7 @@
</ins><span class="cx"> sipcfg.qt_threaded = 1
</span><span class="cx"> sipcfg.qt_dir = qt_dir
</span><span class="cx"> sipcfg.qt_lib_dir = qt_libdir
</span><span class="lines">@@ -92,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> return ConfigurePyQt4(generator)
</span><span class="cx">
</span><del>-@@ -1924,7 +1921,7 @@
</del><ins>+@@ -1924,7 +1953,7 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def get_qt_configuration():
</span><span class="lines">@@ -101,7 +142,7 @@
</span><span class="cx"> qt_archdatadir, qt_pluginsdir and qt_xfeatures globals for the Qt
</span><span class="cx"> installation.
</span><span class="cx"> """
</span><del>-@@ -1996,6 +1993,7 @@
</del><ins>+@@ -1996,6 +2025,7 @@
</ins><span class="cx"> out << QLibraryInfo::location(QLibraryInfo::PrefixPath) << '\\n';
</span><span class="cx"> out << QLibraryInfo::location(QLibraryInfo::HeadersPath) << '\\n';
</span><span class="cx"> out << QLibraryInfo::location(QLibraryInfo::LibrariesPath) << '\\n';
</span><span class="lines">@@ -109,7 +150,7 @@
</span><span class="cx"> out << QLibraryInfo::location(QLibraryInfo::BinariesPath) << '\\n';
</span><span class="cx"> out << QLibraryInfo::location(QLibraryInfo::DataPath) << '\\n';
</span><span class="cx"> #if QT_VERSION >= 0x050000
</span><del>-@@ -2124,22 +2122,23 @@
</del><ins>+@@ -2124,22 +2154,23 @@
</ins><span class="cx"> lines = f.read().strip().split("\n")
</span><span class="cx"> f.close()
</span><span class="cx">
</span><span class="lines">@@ -143,7 +184,7 @@
</span><span class="cx">
</span><span class="cx"> if opts.assume_shared:
</span><span class="cx"> qt_shared = 'shared'
</span><del>-@@ -2202,6 +2201,11 @@
</del><ins>+@@ -2202,6 +2233,11 @@
</ins><span class="cx"> p = create_optparser()
</span><span class="cx"> opts, args = p.parse_args()
</span><span class="cx">
</span><span class="lines">@@ -155,7 +196,7 @@
</span><span class="cx"> # Provide defaults for platform-specific options.
</span><span class="cx"> if sys.platform == 'win32':
</span><span class="cx"> opts.qmake = find_default_qmake()
</span><del>-@@ -2319,7 +2323,6 @@
</del><ins>+@@ -2319,7 +2355,6 @@
</ins><span class="cx"> raise
</span><span class="cx"> except:
</span><span class="cx"> sys.stderr.write(
</span></span></pre>
</div>
</div>
</body>
</html>