[117942] trunk/dports/python/py-pyqt4
michaelld at macports.org
michaelld at macports.org
Mon Mar 17 09:46:00 PDT 2014
Revision: 117942
https://trac.macports.org/changeset/117942
Author: michaelld at macports.org
Date: 2014-03-17 09:46:00 -0700 (Mon, 17 Mar 2014)
Log Message:
-----------
py*-pyqt4:
+ update release to 4.10.4;
+ make -devel port replaced_by non-devel version (at leaast for now, hopefully permanently).
Modified Paths:
--------------
trunk/dports/python/py-pyqt4/Portfile
trunk/dports/python/py-pyqt4/files/patch-configure.py.diff
Removed Paths:
-------------
trunk/dports/python/py-pyqt4/files/patch-configure.py-devel.diff
Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- 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)
@@ -20,20 +20,18 @@
and contains 300 classes and over 5,750 functions and methods.
homepage http://www.riverbankcomputing.co.uk/software/pyqt/intro
+# pre-declare provided subports
+
foreach py_ver ${python.versions} {
- subport py${py_ver}-pyqt4-devel {
- conflicts py${py_ver}-pyqt4
- }
- subport py${py_ver}-pyqt4 {
- conflicts py${py_ver}-pyqt4-devel
- }
+ subport py${py_ver}-pyqt4-devel {}
+ subport py${py_ver}-pyqt4 {}
}
# keep 'port' happy, by defining a global version which is for the
# primary release
set patch 4.10
-version ${patch}.3
+version ${patch}.4
if {${name} ne ${subport}} {
@@ -41,29 +39,26 @@
# devel port
- set base_version ${patch}.4
- set snapshot 595c1453ae29
- version ${base_version}_20140105
+ # replaced by py*-pyqt4 (non -devel), hopefully permanently
- master_sites http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4
- distname PyQt-mac-gpl-${base_version}-snapshot-${snapshot}
+ replaced_by py${python.version}-pyqt4
- checksums rmd160 f85200f29df2d06bec31b3f69da0d43d4d63c740 \
- sha256 d68f5fd084a2fb66435dd784f6bc3441b994f4c77236aa5179b704575ff5a681
+ pre-configure {
+ ui_error "This port has been temporarily replaced by 'py${python.version}-pyqt4'."
+ return -code error
+ }
- patchfiles-append patch-configure.py-devel.diff
+ distfiles
} else {
# release port
- revision 2
-
master_sites sourceforge:pyqt
distname PyQt-mac-gpl-${version}
- checksums rmd160 5c05cf922264ee7a9a942e47e55d0342987b28d2 \
- sha256 d985ad0b19939eb60f2689329f8272ad986acfe2f001f8ab67931c961239030b
+ checksums rmd160 e3db64a1535a774a99a9a3a8b2deb406fc31a922 \
+ sha256 43ca99e80911ac82a6840335a6681f3193ce5257a50f1a31eb8ce4097330d023
patchfiles-append patch-configure.py.diff
@@ -273,10 +268,7 @@
if {[string last devel ${subport}] != -1} {
- 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<
+ livecheck.type none
} else {
Deleted: trunk/dports/python/py-pyqt4/files/patch-configure.py-devel.diff
===================================================================
--- 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)
@@ -1,175 +0,0 @@
---- 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 at 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
Modified: trunk/dports/python/py-pyqt4/files/patch-configure.py.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
---- configure.py.orig 2013-10-02 10:33:49.000000000 -0400
-+++ configure.py 2013-10-02 10:34:47.000000000 -0400
+--- configure.py.orig 2014-03-14 10:30:42.000000000 -0400
++++ configure.py 2014-03-17 11:53:24.000000000 -0400
@@ -44,6 +44,7 @@
qt_dir = None
qt_incdir = None
@@ -8,21 +8,14 @@
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,16 +976,7 @@
+@@ -979,18 +980,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:
@@ -35,7 +28,7 @@
else:
sipconfig.inform("Qt Designer plugin disabled because Python library is static")
opts.designer_plugin = False
-@@ -1083,7 +1075,10 @@
+@@ -1089,7 +1079,10 @@
sipconfig.inform("SIP %s is being used." % sipcfg.sip_version_str)
sipconfig.inform("The Qt header files are in %s." % qt_incdir)
@@ -47,7 +40,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))
-@@ -1148,7 +1143,8 @@
+@@ -1154,7 +1147,8 @@
"qt_data_dir": qt_datadir,
"qt_archdata_dir": qt_archdatadir,
"qt_inc_dir": qt_incdir,
@@ -57,7 +50,7 @@
}
sipconfig.create_config_module(module, template, content, macros)
-@@ -1804,7 +1800,7 @@
+@@ -1809,7 +1803,7 @@
lfile = license.LicenseFile
except AttributeError:
lfile = None
@@ -66,7 +59,7 @@
ltype = None
if ltype is None:
-@@ -1921,12 +1917,14 @@
+@@ -1926,12 +1920,14 @@
names = list(sipcfg.build_macros().keys())
names.append("INCDIR_QT")
names.append("LIBDIR_QT")
@@ -82,7 +75,7 @@
}
macros = sipconfig.parse_build_macros(fname, names, overrides, properties)
-@@ -1972,7 +1970,7 @@
+@@ -1977,7 +1973,7 @@
# Work out how Qt was built on MacOS.
if sys.platform == "darwin":
@@ -91,7 +84,7 @@
global qt_framework
qt_framework = 1
-@@ -1989,6 +1987,7 @@
+@@ -1994,6 +1990,7 @@
sipcfg.qt_threaded = 1
sipcfg.qt_dir = qt_dir
sipcfg.qt_lib_dir = qt_libdir
@@ -99,7 +92,7 @@
return ConfigurePyQt4(generator)
-@@ -2004,7 +2003,7 @@
+@@ -2009,7 +2006,7 @@
def get_qt_configuration():
@@ -108,7 +101,7 @@
qt_archdatadir, qt_pluginsdir and qt_xfeatures globals for the Qt
installation.
"""
-@@ -2078,6 +2077,7 @@
+@@ -2083,6 +2080,7 @@
out << QLibraryInfo::location(QLibraryInfo::PrefixPath) << '\\n';
out << QLibraryInfo::location(QLibraryInfo::HeadersPath) << '\\n';
out << QLibraryInfo::location(QLibraryInfo::LibrariesPath) << '\\n';
@@ -116,7 +109,7 @@
out << QLibraryInfo::location(QLibraryInfo::BinariesPath) << '\\n';
out << QLibraryInfo::location(QLibraryInfo::DataPath) << '\\n';
#if QT_VERSION >= 0x050000
-@@ -2206,22 +2206,23 @@
+@@ -2211,22 +2209,23 @@
lines = f.read().strip().split("\n")
f.close()
@@ -150,7 +143,7 @@
if opts.assume_shared:
qt_shared = "shared"
-@@ -2282,6 +2283,11 @@
+@@ -2287,6 +2286,11 @@
p = create_optparser()
opts, args = p.parse_args()
@@ -162,7 +155,7 @@
# Provide defaults for platform-specific options.
if sys.platform == 'win32':
opts.qmake = find_default_qmake()
-@@ -2399,7 +2405,6 @@
+@@ -2404,7 +2408,6 @@
raise
except:
sys.stderr.write(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140317/9464ef64/attachment-0001.html>
More information about the macports-changes
mailing list