[138149] trunk/dports/python/py-pyqt4
michaelld at macports.org
michaelld at macports.org
Tue Jun 30 10:35:45 PDT 2015
Revision: 138149
https://trac.macports.org/changeset/138149
Author: michaelld at macports.org
Date: 2015-06-30 10:35:45 -0700 (Tue, 30 Jun 2015)
Log Message:
-----------
py*-pyqt4: update to 4.11.4, which changes the license to just GPL3 and no exceptions.
Modified Paths:
--------------
trunk/dports/python/py-pyqt4/Portfile
trunk/dports/python/py-pyqt4/files/patch-configure.py.diff
Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py-pyqt4/Portfile 2015-06-30 17:34:02 UTC (rev 138148)
+++ trunk/dports/python/py-pyqt4/Portfile 2015-06-30 17:35:45 UTC (rev 138149)
@@ -10,7 +10,7 @@
categories-append devel
platforms macosx
maintainers michaelld openmaintainer
-license {GPL-2 GPL-3}
+license GPL-3
description PyQt4 is a set of Python bindings for the Qt4 toolkit
long_description \
PyQt4 is a set of Python bindings for the Qt4 toolkit. The \
@@ -19,7 +19,7 @@
and contains 300 classes and over 5,750 functions and methods.
homepage http://www.riverbankcomputing.co.uk/software/pyqt/intro
-version 4.11.3
+version 4.11.4
set branch [join [lrange [split ${version} .] 0 1] .]
set patch [lindex [split ${version} .] 2]
@@ -63,8 +63,8 @@
distname PyQt-mac-gpl-${version}
}
- checksums rmd160 9ee5ebc827d1186c7d7f493f55eb056024df2a9c \
- sha256 8b8bb3a2ef8b7368710e0bc59d6e94e1f513f7dbf10a3aaa3154f7b848c88b4d
+ checksums rmd160 55ab22e65a2681b7af3680db9462967578a907f0 \
+ sha256 f178ba12a814191df8e9f87fb95c11084a0addc827604f1a18a82944225ed918
patchfiles-append patch-configure.py.diff
@@ -230,9 +230,7 @@
file copy ${worksrcpath}/examples \
${docdir}/${subport}
xinstall -m 644 -W ${worksrcpath} \
- GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT \
- LICENSE.GPL2 LICENSE.GPL3 OPENSOURCE-NOTICE.TXT NEWS README \
- THANKS \
+ ChangeLog LICENSE NEWS README THANKS \
${docdir}/${subport}
# Rename designer plugin to include Python version; easiest
Modified: trunk/dports/python/py-pyqt4/files/patch-configure.py.diff
===================================================================
--- trunk/dports/python/py-pyqt4/files/patch-configure.py.diff 2015-06-30 17:34:02 UTC (rev 138148)
+++ trunk/dports/python/py-pyqt4/files/patch-configure.py.diff 2015-06-30 17:35:45 UTC (rev 138149)
@@ -1,6 +1,6 @@
---- configure.py.orig 2014-09-11 13:50:13.000000000 -0400
-+++ configure.py 2014-09-17 14:25:29.000000000 -0400
-@@ -44,6 +44,7 @@
+--- configure.py.orig 2015-06-11 11:33:16.000000000 -0400
++++ configure.py 2015-06-30 13:19:46.000000000 -0400
+@@ -39,6 +39,7 @@
qt_dir = None
qt_incdir = None
qt_libdir = None
@@ -8,7 +8,7 @@
qt_bindir = None
qt_datadir = None
qt_archdatadir = None
-@@ -978,18 +979,7 @@
+@@ -973,18 +974,7 @@
dynamic_pylib = "--enable-shared" in config_args
if dynamic_pylib:
@@ -28,7 +28,7 @@
else:
sipconfig.inform("The Qt Designer plugin was disabled because a dynamic Python library couldn't be found")
opts.designer_plugin = False
-@@ -1088,7 +1078,10 @@
+@@ -1083,7 +1073,10 @@
sipconfig.inform("SIP %s is being used." % sipcfg.sip_version_str)
sipconfig.inform("The Qt header files are in %s." % qt_incdir)
@@ -40,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))
-@@ -1153,7 +1146,8 @@
+@@ -1148,7 +1141,8 @@
"qt_data_dir": qt_datadir,
"qt_archdata_dir": qt_archdatadir,
"qt_inc_dir": qt_incdir,
@@ -50,7 +50,7 @@
}
sipconfig.create_config_module(module, template, content, macros)
-@@ -1741,7 +1735,7 @@
+@@ -1736,7 +1730,7 @@
lfile = license.LicenseFile
except AttributeError:
lfile = None
@@ -59,7 +59,7 @@
ltype = None
if ltype is None:
-@@ -1858,12 +1852,14 @@
+@@ -1841,12 +1835,14 @@
names = list(sipcfg.build_macros().keys())
names.append("INCDIR_QT")
names.append("LIBDIR_QT")
@@ -75,7 +75,7 @@
}
macros = sipconfig.parse_build_macros(fname, names, overrides, properties)
-@@ -1909,7 +1905,7 @@
+@@ -1892,7 +1888,7 @@
# Work out how Qt was built on MacOS.
if sys.platform == "darwin":
@@ -84,7 +84,7 @@
global qt_framework
qt_framework = 1
-@@ -1926,6 +1922,7 @@
+@@ -1909,6 +1905,7 @@
sipcfg.qt_threaded = 1
sipcfg.qt_dir = qt_dir
sipcfg.qt_lib_dir = qt_libdir
@@ -92,7 +92,7 @@
return ConfigurePyQt4(generator)
-@@ -1941,7 +1938,7 @@
+@@ -1924,7 +1921,7 @@
def get_qt_configuration():
@@ -101,7 +101,7 @@
qt_archdatadir, qt_pluginsdir and qt_xfeatures globals for the Qt
installation.
"""
-@@ -2013,6 +2010,7 @@
+@@ -1996,6 +1993,7 @@
out << QLibraryInfo::location(QLibraryInfo::PrefixPath) << '\\n';
out << QLibraryInfo::location(QLibraryInfo::HeadersPath) << '\\n';
out << QLibraryInfo::location(QLibraryInfo::LibrariesPath) << '\\n';
@@ -109,7 +109,7 @@
out << QLibraryInfo::location(QLibraryInfo::BinariesPath) << '\\n';
out << QLibraryInfo::location(QLibraryInfo::DataPath) << '\\n';
#if QT_VERSION >= 0x050000
-@@ -2141,22 +2139,23 @@
+@@ -2124,22 +2122,23 @@
lines = f.read().strip().split("\n")
f.close()
@@ -143,7 +143,7 @@
if opts.assume_shared:
qt_shared = 'shared'
-@@ -2219,6 +2218,11 @@
+@@ -2202,6 +2201,11 @@
p = create_optparser()
opts, args = p.parse_args()
@@ -155,7 +155,7 @@
# Provide defaults for platform-specific options.
if sys.platform == 'win32':
opts.qmake = find_default_qmake()
-@@ -2336,7 +2340,6 @@
+@@ -2319,7 +2323,6 @@
raise
except:
sys.stderr.write(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150630/9c7f0c99/attachment-0001.html>
More information about the macports-changes
mailing list