<!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>[117942] 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/117942">117942</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-03-17 09:46:00 -0700 (Mon, 17 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py*-pyqt4:
+ update release to 4.10.4;
+ make -devel port replaced_by non-devel version (at leaast for now, hopefully permanently).</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>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportspythonpypyqt4filespatchconfigurepydeveldiff">trunk/dports/python/py-pyqt4/files/patch-configure.py-devel.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 (117941 => 117942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyqt4/Portfile 2014-03-17 16:44:00 UTC (rev 117941)
+++ trunk/dports/python/py-pyqt4/Portfile 2014-03-17 16:46:00 UTC (rev 117942)
</span><span class="lines">@@ -20,20 +20,18 @@
</span><span class="cx"> and contains 300 classes and over 5,750 functions and methods.
</span><span class="cx"> homepage http://www.riverbankcomputing.co.uk/software/pyqt/intro
</span><span class="cx">
</span><ins>+# pre-declare provided subports
+
</ins><span class="cx"> foreach py_ver ${python.versions} {
</span><del>- subport py${py_ver}-pyqt4-devel {
- conflicts py${py_ver}-pyqt4
- }
- subport py${py_ver}-pyqt4 {
- conflicts py${py_ver}-pyqt4-devel
- }
</del><ins>+ subport py${py_ver}-pyqt4-devel {}
+ subport py${py_ver}-pyqt4 {}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # keep 'port' happy, by defining a global version which is for the
</span><span class="cx"> # primary release
</span><span class="cx">
</span><span class="cx"> set patch 4.10
</span><del>-version ${patch}.3
</del><ins>+version ${patch}.4
</ins><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx">
</span><span class="lines">@@ -41,29 +39,26 @@
</span><span class="cx">
</span><span class="cx"> # devel port
</span><span class="cx">
</span><del>- set base_version ${patch}.4
- set snapshot 595c1453ae29
- version ${base_version}_20140105
</del><ins>+ # replaced by py*-pyqt4 (non -devel), hopefully permanently
</ins><span class="cx">
</span><del>- master_sites http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4
- distname PyQt-mac-gpl-${base_version}-snapshot-${snapshot}
</del><ins>+ replaced_by py${python.version}-pyqt4
</ins><span class="cx">
</span><del>- checksums rmd160 f85200f29df2d06bec31b3f69da0d43d4d63c740 \
- sha256 d68f5fd084a2fb66435dd784f6bc3441b994f4c77236aa5179b704575ff5a681
</del><ins>+ pre-configure {
+ ui_error "This port has been temporarily replaced by 'py${python.version}-pyqt4'."
+ return -code error
+ }
</ins><span class="cx">
</span><del>- patchfiles-append patch-configure.py-devel.diff
</del><ins>+ distfiles
</ins><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> # release port
</span><span class="cx">
</span><del>- revision 2
-
</del><span class="cx"> master_sites sourceforge:pyqt
</span><span class="cx"> distname PyQt-mac-gpl-${version}
</span><span class="cx">
</span><del>- checksums rmd160 5c05cf922264ee7a9a942e47e55d0342987b28d2 \
- sha256 d985ad0b19939eb60f2689329f8272ad986acfe2f001f8ab67931c961239030b
</del><ins>+ checksums rmd160 e3db64a1535a774a99a9a3a8b2deb406fc31a922 \
+ sha256 43ca99e80911ac82a6840335a6681f3193ce5257a50f1a31eb8ce4097330d023
</ins><span class="cx">
</span><span class="cx"> patchfiles-append patch-configure.py.diff
</span><span class="cx">
</span><span class="lines">@@ -273,10 +268,7 @@
</span><span class="cx">
</span><span class="cx"> if {[string last devel ${subport}] != -1} {
</span><span class="cx">
</span><del>- livecheck.type regex
- livecheck.url http://www.riverbankcomputing.co.uk/software/pyqt/download
- livecheck.version ${base_version}-snapshot-${snapshot}
- livecheck.regex >PyQt-mac-gpl-(\[0-9.\]*-snapshot-\[0-9a-f\]*).tar.gz<
</del><ins>+ livecheck.type none
</ins><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportspythonpypyqt4filespatchconfigurepydeveldiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/python/py-pyqt4/files/patch-configure.py-devel.diff (117941 => 117942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyqt4/files/patch-configure.py-devel.diff 2014-03-17 16:44:00 UTC (rev 117941)
+++ trunk/dports/python/py-pyqt4/files/patch-configure.py-devel.diff 2014-03-17 16:46:00 UTC (rev 117942)
</span><span class="lines">@@ -1,175 +0,0 @@
</span><del>---- configure.py.orig 2013-10-02 10:20:42.000000000 -0400
-+++ configure.py 2013-10-02 10:21:52.000000000 -0400
-@@ -44,6 +44,7 @@
- qt_dir = None
- qt_incdir = None
- qt_libdir = None
-+qt_frameworkdir = None
- qt_bindir = None
- qt_datadir = None
- qt_archdatadir = None
-@@ -210,7 +211,7 @@
-
- if sys.platform == 'darwin':
- g = optparse.OptionGroup(p, title="MacOS X Configuration")
-- g.add_option("--use-arch", action="store", metavar="ARCH",
-+ g.add_option("--use-arch", action="append", metavar="ARCH",
- dest="use_arch", choices=["i386", "x86_64", "ppc"],
- help="the architecture to use when running pyuic4 "
- "[default: system default]")
-@@ -975,18 +976,7 @@
- dynamic_pylib = "--enable-shared" in config_args
-
- if dynamic_pylib:
-- if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)):
-- lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
-- elif 'MULTIARCH' in ducfg and glob.glob('%s/lib/%s/libpython%d.%d*' % (ducfg['exec_prefix'], ducfg['MULTIARCH'], py_major, py_minor)):
-- lib_dir_flag = quote('-L%s/lib/%s' % (ducfg['exec_prefix'], ducfg['MULTIARCH']))
-- elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)):
-- lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"])
-- else:
-- sipconfig.inform("Qt Designer plugin disabled because Python library couldn't be found")
-- lib_dir_flag = ''
-- opts.designer_plugin = False
--
-- link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
-+ link = "%s @@MACPORTS_PYTHON_FRAMEWORK@@" % sipcfg.build_macros().get('LFLAGS', '')
- else:
- sipconfig.inform("Qt Designer plugin disabled because Python library is static")
- opts.designer_plugin = False
-@@ -1085,7 +1075,10 @@
-
- sipconfig.inform("SIP %s is being used." % sipcfg.sip_version_str)
- sipconfig.inform("The Qt header files are in %s." % qt_incdir)
-- sipconfig.inform("The %s Qt libraries are in %s." % (lib_type, qt_libdir))
-+ if sys.platform == "darwin" and qt_framework:
-+ sipconfig.inform("The %s Qt frameworks are in %s." % (lib_type, qt_frameworkdir))
-+ else:
-+ sipconfig.inform("The %s Qt libraries are in %s." % (lib_type, qt_libdir))
- sipconfig.inform("The Qt binaries are in %s." % qt_bindir)
- sipconfig.inform("The Qt mkspecs directory is in %s." % qt_archdatadir)
- sipconfig.inform("These PyQt modules will be built: %s." % ", ".join(pyqt_modules))
-@@ -1150,7 +1143,8 @@
- "qt_data_dir": qt_datadir,
- "qt_archdata_dir": qt_archdatadir,
- "qt_inc_dir": qt_incdir,
-- "qt_lib_dir": qt_libdir
-+ "qt_lib_dir": qt_libdir,
-+ "qt_framework_dir": qt_frameworkdir
- }
-
- sipconfig.create_config_module(module, template, content, macros)
-@@ -1806,7 +1800,7 @@
- lfile = license.LicenseFile
- except AttributeError:
- lfile = None
-- except ImportError:
-+ except:
- ltype = None
-
- if ltype is None:
-@@ -1923,12 +1917,14 @@
- names = list(sipcfg.build_macros().keys())
- names.append("INCDIR_QT")
- names.append("LIBDIR_QT")
-+ names.append("FRAMEWORKDIR_QT")
- names.append("MOC")
-
- properties = {
- "QT_INSTALL_BINS": qt_bindir,
- "QT_INSTALL_HEADERS": qt_incdir,
-- "QT_INSTALL_LIBS": qt_libdir
-+ "QT_INSTALL_LIBS": qt_libdir,
-+ "QT_INSTALL_FRAMEWORKS": qt_frameworkdir
- }
-
- macros = sipconfig.parse_build_macros(fname, names, overrides, properties)
-@@ -1974,7 +1970,7 @@
-
- # Work out how Qt was built on MacOS.
- if sys.platform == "darwin":
-- if os.access(os.path.join(qt_libdir, "QtCore.framework"), os.F_OK):
-+ if os.access(os.path.join(qt_frameworkdir, "QtCore.framework"), os.F_OK):
- global qt_framework
- qt_framework = 1
-
-@@ -1991,6 +1987,7 @@
- sipcfg.qt_threaded = 1
- sipcfg.qt_dir = qt_dir
- sipcfg.qt_lib_dir = qt_libdir
-+ sipcfg.qt_framework_dir = qt_frameworkdir
-
- return ConfigurePyQt4(generator)
-
-@@ -2006,7 +2003,7 @@
-
-
- def get_qt_configuration():
-- """Set the qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir,
-+ """Set the qt_dir, qt_incdir, qt_libdir, qt_frameworkdir, qt_bindir, qt_datadir,
- qt_archdatadir, qt_pluginsdir and qt_xfeatures globals for the Qt
- installation.
- """
-@@ -2080,6 +2077,7 @@
- out << QLibraryInfo::location(QLibraryInfo::PrefixPath) << '\\n';
- out << QLibraryInfo::location(QLibraryInfo::HeadersPath) << '\\n';
- out << QLibraryInfo::location(QLibraryInfo::LibrariesPath) << '\\n';
-+ out << QLibraryInfo::location(QLibraryInfo::FrameworksPath) << '\\n';
- out << QLibraryInfo::location(QLibraryInfo::BinariesPath) << '\\n';
- out << QLibraryInfo::location(QLibraryInfo::DataPath) << '\\n';
- #if QT_VERSION >= 0x050000
-@@ -2208,22 +2206,23 @@
- lines = f.read().strip().split("\n")
- f.close()
-
-- global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir, qt_archdatadir
-+ global qt_dir, qt_incdir, qt_libdir, qt_frameworkdir, qt_bindir, qt_datadir, qt_archdatadir
- global qt_pluginsdir
- global qt_version, qt_edition, qt_licensee, qt_shared, qt_xfeatures
-
- qt_dir = lines[0]
- qt_incdir = lines[1]
- qt_libdir = lines[2]
-- qt_bindir = lines[3]
-- qt_datadir = lines[4]
-- qt_archdatadir = lines[5]
-- qt_pluginsdir = lines[6]
-- qt_version = lines[7]
-- qt_edition = lines[8]
-- qt_licensee = lines[9]
-- qt_shared = lines[10]
-- qt_xfeatures = lines[11:]
-+ qt_frameworkdir = lines[3]
-+ qt_bindir = lines[4]
-+ qt_datadir = lines[5]
-+ qt_archdatadir = lines[6]
-+ qt_pluginsdir = lines[7]
-+ qt_version = lines[8]
-+ qt_edition = lines[9]
-+ qt_licensee = lines[10]
-+ qt_shared = lines[11]
-+ qt_xfeatures = lines[12:]
-
- if opts.assume_shared:
- qt_shared = "shared"
-@@ -2284,6 +2283,11 @@
- p = create_optparser()
- opts, args = p.parse_args()
-
-+ # fix arch on darwin
-+ if sys.platform == 'darwin' and opts.use_arch is not None:
-+ # convert opts.use_arch from a list to a string
-+ opts.use_arch = sipcfg.arch = ' '.join(iter(opts.use_arch))
-+
- # Provide defaults for platform-specific options.
- if sys.platform == 'win32':
- opts.qmake = find_default_qmake()
-@@ -2401,7 +2405,6 @@
- raise
- except:
- sys.stderr.write(
--"""An internal error occured. Please report all the output from the program,
--including the following traceback, to support@riverbankcomputing.com.
-+"""An internal error occured. Please follow the instructions provided by MacPorts < http://www.macports.org > to report this issue. Please do not report this issue to Riverbank Computing until MacPorts developers have determined that it is appropriate to do so.
- """)
- raise
</del></span></pre></div>
<a id="trunkdportspythonpypyqt4filespatchconfigurepydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-pyqt4/files/patch-configure.py.diff (117941 => 117942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-pyqt4/files/patch-configure.py.diff 2014-03-17 16:44:00 UTC (rev 117941)
+++ trunk/dports/python/py-pyqt4/files/patch-configure.py.diff 2014-03-17 16:46:00 UTC (rev 117942)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- configure.py.orig 2013-10-02 10:33:49.000000000 -0400
-+++ configure.py 2013-10-02 10:34:47.000000000 -0400
</del><ins>+--- configure.py.orig 2014-03-14 10:30:42.000000000 -0400
++++ configure.py 2014-03-17 11:53:24.000000000 -0400
</ins><span class="cx"> @@ -44,6 +44,7 @@
</span><span class="cx"> qt_dir = None
</span><span class="cx"> qt_incdir = None
</span><span class="lines">@@ -8,21 +8,14 @@
</span><span class="cx"> qt_bindir = None
</span><span class="cx"> qt_datadir = None
</span><span class="cx"> qt_archdatadir = None
</span><del>-@@ -210,7 +211,7 @@
-
- if sys.platform == 'darwin':
- g = optparse.OptionGroup(p, title="MacOS X Configuration")
-- g.add_option("--use-arch", action="store", metavar="ARCH",
-+ g.add_option("--use-arch", action="append", metavar="ARCH",
- dest="use_arch", choices=["i386", "x86_64", "ppc"],
- help="the architecture to use when running pyuic4 "
- "[default: system default]")
-@@ -975,16 +976,7 @@
</del><ins>+@@ -979,18 +980,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="cx"> - if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)):
</span><span class="cx"> - lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
</span><ins>+- elif 'MULTIARCH' in ducfg and glob.glob('%s/lib/%s/libpython%d.%d*' % (ducfg['exec_prefix'], ducfg['MULTIARCH'], py_major, py_minor)):
+- lib_dir_flag = quote('-L%s/lib/%s' % (ducfg['exec_prefix'], ducfg['MULTIARCH']))
</ins><span class="cx"> - elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)):
</span><span class="cx"> - lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"])
</span><span class="cx"> - else:
</span><span class="lines">@@ -35,7 +28,7 @@
</span><span class="cx"> else:
</span><span class="cx"> sipconfig.inform("Qt Designer plugin disabled because Python library is static")
</span><span class="cx"> opts.designer_plugin = False
</span><del>-@@ -1083,7 +1075,10 @@
</del><ins>+@@ -1089,7 +1079,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">@@ -47,7 +40,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 +1143,8 @@
</del><ins>+@@ -1154,7 +1147,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">@@ -57,7 +50,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sipconfig.create_config_module(module, template, content, macros)
</span><del>-@@ -1804,7 +1800,7 @@
</del><ins>+@@ -1809,7 +1803,7 @@
</ins><span class="cx"> lfile = license.LicenseFile
</span><span class="cx"> except AttributeError:
</span><span class="cx"> lfile = None
</span><span class="lines">@@ -66,7 +59,7 @@
</span><span class="cx"> ltype = None
</span><span class="cx">
</span><span class="cx"> if ltype is None:
</span><del>-@@ -1921,12 +1917,14 @@
</del><ins>+@@ -1926,12 +1920,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">@@ -82,7 +75,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> macros = sipconfig.parse_build_macros(fname, names, overrides, properties)
</span><del>-@@ -1972,7 +1970,7 @@
</del><ins>+@@ -1977,7 +1973,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">@@ -91,7 +84,7 @@
</span><span class="cx"> global qt_framework
</span><span class="cx"> qt_framework = 1
</span><span class="cx">
</span><del>-@@ -1989,6 +1987,7 @@
</del><ins>+@@ -1994,6 +1990,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">@@ -99,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> return ConfigurePyQt4(generator)
</span><span class="cx">
</span><del>-@@ -2004,7 +2003,7 @@
</del><ins>+@@ -2009,7 +2006,7 @@
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def get_qt_configuration():
</span><span class="lines">@@ -108,7 +101,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>-@@ -2078,6 +2077,7 @@
</del><ins>+@@ -2083,6 +2080,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">@@ -116,7 +109,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>-@@ -2206,22 +2206,23 @@
</del><ins>+@@ -2211,22 +2209,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">@@ -150,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> if opts.assume_shared:
</span><span class="cx"> qt_shared = "shared"
</span><del>-@@ -2282,6 +2283,11 @@
</del><ins>+@@ -2287,6 +2286,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">@@ -162,7 +155,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>-@@ -2399,7 +2405,6 @@
</del><ins>+@@ -2404,7 +2408,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>