[107067] trunk/dports/python/py-pyqt4
michaelld at macports.org
michaelld at macports.org
Mon Jun 17 06:28:46 PDT 2013
Revision: 107067
https://trac.macports.org/changeset/107067
Author: michaelld at macports.org
Date: 2013-06-17 06:28:46 -0700 (Mon, 17 Jun 2013)
Log Message:
-----------
py*-pyqt4: update to 4.10.2.
Modified Paths:
--------------
trunk/dports/python/py-pyqt4/Portfile
trunk/dports/python/py-pyqt4/files/patch-configure.py.diff
trunk/dports/python/py-pyqt4/files/patch-fix-qt_apps_dir.diff
Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py-pyqt4/Portfile 2013-06-17 11:15:46 UTC (rev 107066)
+++ trunk/dports/python/py-pyqt4/Portfile 2013-06-17 13:28:46 UTC (rev 107067)
@@ -6,7 +6,7 @@
PortGroup python 1.0
name py-pyqt4
-version 4.10.1
+version 4.10.2
python.versions 24 25 26 27 31 32 33
python.default_version 27
categories-append devel
@@ -27,8 +27,8 @@
distname PyQt-mac-gpl-${version}
dist_subdir python
- checksums sha1 cf20699c4db8d3031c19dd51df8857bba1a4956b \
- rmd160 a053a92d154a030b707a570b7a755cb17fb17c87
+ checksums sha1 40362e6b9f476683e4e35b83369e30a8dfff99ad \
+ rmd160 a2a829f41e0753dc93efaf0d9e4e76d2c54d6d2c
depends_lib-append port:py${python.version}-sip \
port:qt4-mac
Modified: trunk/dports/python/py-pyqt4/files/patch-configure.py.diff
===================================================================
--- trunk/dports/python/py-pyqt4/files/patch-configure.py.diff 2013-06-17 11:15:46 UTC (rev 107066)
+++ trunk/dports/python/py-pyqt4/files/patch-configure.py.diff 2013-06-17 13:28:46 UTC (rev 107067)
@@ -1,5 +1,5 @@
---- configure.py.orig 2013-04-22 20:06:08.000000000 -0400
-+++ configure.py 2013-04-22 20:21:29.000000000 -0400
+--- configure.py.orig 2013-06-16 11:18:09.000000000 -0400
++++ configure.py 2013-06-17 09:12:35.000000000 -0400
@@ -44,6 +44,7 @@
qt_dir = None
qt_incdir = None
@@ -38,7 +38,7 @@
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))
-@@ -1149,7 +1144,8 @@
+@@ -1150,7 +1145,8 @@
"qt_data_dir": qt_datadir,
"qt_archdata_dir": qt_archdatadir,
"qt_inc_dir": qt_incdir,
@@ -48,7 +48,7 @@
}
sipconfig.create_config_module(module, template, content, macros)
-@@ -1805,7 +1801,7 @@
+@@ -1806,7 +1802,7 @@
lfile = license.LicenseFile
except AttributeError:
lfile = None
@@ -57,7 +57,7 @@
ltype = None
if ltype is None:
-@@ -1922,12 +1918,14 @@
+@@ -1923,12 +1919,14 @@
names = list(sipcfg.build_macros().keys())
names.append("INCDIR_QT")
names.append("LIBDIR_QT")
@@ -73,7 +73,7 @@
}
macros = sipconfig.parse_build_macros(fname, names, overrides, properties)
-@@ -1973,7 +1971,7 @@
+@@ -1974,7 +1972,7 @@
# Work out how Qt was built on MacOS.
if sys.platform == "darwin":
@@ -82,7 +82,7 @@
global qt_framework
qt_framework = 1
-@@ -1990,6 +1988,7 @@
+@@ -1991,6 +1989,7 @@
sipcfg.qt_threaded = 1
sipcfg.qt_dir = qt_dir
sipcfg.qt_lib_dir = qt_libdir
@@ -90,7 +90,7 @@
return ConfigurePyQt4(generator)
-@@ -2005,7 +2004,7 @@
+@@ -2006,7 +2005,7 @@
def get_qt_configuration():
@@ -99,7 +99,7 @@
qt_archdatadir, qt_pluginsdir and qt_xfeatures globals for the Qt
installation.
"""
-@@ -2079,6 +2078,7 @@
+@@ -2080,6 +2079,7 @@
out << QLibraryInfo::location(QLibraryInfo::PrefixPath) << '\\n';
out << QLibraryInfo::location(QLibraryInfo::HeadersPath) << '\\n';
out << QLibraryInfo::location(QLibraryInfo::LibrariesPath) << '\\n';
@@ -107,7 +107,7 @@
out << QLibraryInfo::location(QLibraryInfo::BinariesPath) << '\\n';
out << QLibraryInfo::location(QLibraryInfo::DataPath) << '\\n';
#if QT_VERSION >= 0x050000
-@@ -2206,22 +2206,23 @@
+@@ -2207,22 +2207,23 @@
lines = f.read().strip().split("\n")
f.close()
Modified: trunk/dports/python/py-pyqt4/files/patch-fix-qt_apps_dir.diff
===================================================================
--- trunk/dports/python/py-pyqt4/files/patch-fix-qt_apps_dir.diff 2013-06-17 11:15:46 UTC (rev 107066)
+++ trunk/dports/python/py-pyqt4/files/patch-fix-qt_apps_dir.diff 2013-06-17 13:28:46 UTC (rev 107067)
@@ -1,6 +1,6 @@
---- examples/demos/qtdemo/menumanager.py.orig 2012-08-14 09:39:23.000000000 -0400
-+++ examples/demos/qtdemo/menumanager.py 2012-08-14 09:40:38.000000000 -0400
-@@ -318,7 +318,7 @@
+--- examples/demos/qtdemo/menumanager.py.orig 2013-06-16 11:18:32.000000000 -0400
++++ examples/demos/qtdemo/menumanager.py 2013-06-17 09:12:42.000000000 -0400
+@@ -328,7 +328,7 @@
app = QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.BinariesPath) + QtCore.QDir.separator()
if sys.platform == 'darwin':
@@ -9,9 +9,9 @@
else:
app += 'assistant'
---- examples/designer/plugins/plugins.py.orig 2012-08-14 09:39:32.000000000 -0400
-+++ examples/designer/plugins/plugins.py 2012-08-14 09:40:44.000000000 -0400
-@@ -75,7 +75,7 @@
+--- examples/designer/plugins/plugins.py.orig 2013-06-16 11:18:32.000000000 -0400
++++ examples/designer/plugins/plugins.py 2013-06-17 09:12:42.000000000 -0400
+@@ -76,7 +76,7 @@
designer_bin = QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.BinariesPath)
if sys.platform == 'darwin':
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130617/9385c16b/attachment.html>
More information about the macports-changes
mailing list