Commit e5f52281 authored by Alvin Wong's avatar Alvin Wong

Windows: Update to PyQt 5.9.2

parent 45781102
......@@ -37,8 +37,8 @@ elseif(MINGW)
)
ExternalProject_Add( ext_pyqt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.9/PyQt5_gpl-5.9.zip
URL_MD5 d978884753df265896eda436d8f4e07b
URL https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.9.2/PyQt5_gpl-5.9.2.zip
URL_MD5 67eacf2f486f77136c9758e03fe6889e
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/pyqt-configure-fix.patch
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE} <SOURCE_DIR>/configure.py ${_PYQT_conf}
......
--- a/configure.py 2017-07-03 18:25:14.000000000 +0800
+++ b/configure.py 2017-07-15 01:19:44.622435500 +0800
@@ -2168,10 +2168,8 @@
if source is None:
for disabled in run_test_program(mname, test, verbose):
if disabled:
- inform("Disabled %s features: %s" % (mname,
- ', '.join(disabled)))
-
- target_config.pyqt_disabled_features.extend(disabled)
+ inform("Disabled %s features: %s" % (mname, disabled))
+ target_config.pyqt_disabled_features.append(disabled)
# Include the module in the build.
target_config.pyqt_modules.append(mname)
--- a/configure.py
+++ b/configure.py
@@ -965,7 +965,7 @@ class TargetConfiguration:
# it where it is.
if not self.static:
pro_lines.extend(['win32 {',
- ' LIBS += ' + self.get_pylib_link_arguments(name=False),
+ ' LIBS += ' + self.get_pylib_link_arguments(),
'}'])
@staticmethod
@@ -1977,7 +1977,7 @@ def run_make(target_config, verbose, exe, makefile_name):
remove_file(platform_exe)
- args = [make, '-f', makefile_name]
+ args = [make, '-f', makefile_name, 'CXXFLAGS=-D_hypot=hypot']
if makefile_target != '':
args.append(makefile_target)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment