Source: pyqt5 Version: 5.7+dfsg-5 Severity: important Tags: patch Hello,
With the latest update to Qt 5.9 pyqt5 fails to build from source blocking the update of many Qt packages on my system. The attached two patches seem to fix the build, but I think the latest pyqt5 upstream version should be tried first (but I haven't checked if it added support for Qt 5.9). qt58.patch was authored by Heiko Becker [1]. Regards Simon [1]: https://www.riverbankcomputing.com/pipermail/pyqt/2017-January/038665.html -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9
Index: pyqt5-5.7+dfsg/configure.py
===================================================================
--- pyqt5-5.7+dfsg.orig/configure.py
+++ pyqt5-5.7+dfsg/configure.py
@@ -2666,12 +2666,6 @@ def check_license(target_config, license
(ltype, PYQT_VERSION_STR, lname, sys.version.split()[0],
sys.platform))
- # Common checks.
- if introspecting and target_config.qt_licensee not in OPEN_SOURCE_LICENSEES and ltype == 'GPL':
- error(
- "This version of PyQt5 and the commercial version of Qt have "
- "incompatible licenses.")
-
# Confirm the license if not already done.
if not license_confirmed:
loptions = """
Index: pyqt5-5.7+dfsg/sip/QtCore/qnamespace.sip
===================================================================
--- pyqt5-5.7+dfsg.orig/sip/QtCore/qnamespace.sip
+++ pyqt5-5.7+dfsg/sip/QtCore/qnamespace.sip
@@ -209,8 +209,6 @@ namespace Qt
WindowContextHelpButtonHint,
WindowShadeButtonHint,
WindowStaysOnTopHint,
- WindowOkButtonHint,
- WindowCancelButtonHint,
WindowStaysOnBottomHint,
WindowCloseButtonHint,
MacWindowToolBarButtonHint,
@@ -232,6 +230,10 @@ namespace Qt
%If (Qt_5_5_0 -)
MaximizeUsingFullscreenGeometryHint,
%End
+%If (- Qt_5_8_0)
+ WindowOkButtonHint,
+ WindowCancelButtonHint,
+%End
};
typedef QFlags<Qt::WindowType> WindowFlags;
Index: pyqt5-5.7+dfsg/sip/QtCore/QtCoremod.sip
===================================================================
--- pyqt5-5.7+dfsg.orig/sip/QtCore/QtCoremod.sip
+++ pyqt5-5.7+dfsg/sip/QtCore/QtCoremod.sip
@@ -22,7 +22,7 @@
%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1)
-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0}
+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0 Qt_5_8_0}
%Platforms {WS_X11 WS_WIN WS_MACX}
signature.asc
Description: PGP signature
