diff -Nru pyqt5-5.7+dfsg/debian/changelog pyqt5-5.7+dfsg/debian/changelog --- pyqt5-5.7+dfsg/debian/changelog 2017-07-08 08:36:01.000000000 +0000 +++ pyqt5-5.7+dfsg/debian/changelog 2017-08-22 11:41:04.000000000 +0000 @@ -1,18 +1,13 @@ -pyqt5 (5.7+dfsg-5ubuntu1) artful; urgency=medium +pyqt5 (5.7+dfsg-6) unstable; urgency=medium - * Enable webengine support on arm64 and armhf. - * Add patches from upstream to support Qt 5.9: + * Add patches from upstream to support Qt 5.9 (closes: #872892): - no_license_check.diff - qt59_support.diff - opengl_detection.diff + * Build against Qt 5.9.1. + * Enable Qt WebEngine support on arm64, armhf and mipsel (closes: #867733). - -- Dmitry Shachnev Sat, 08 Jul 2017 11:36:01 +0300 - -pyqt5 (5.7+dfsg-5build1) artful; urgency=medium - - * No change rebuild to add Python 3.6 support. - - -- Michael Hudson-Doyle Wed, 07 Jun 2017 14:32:55 -0700 + -- Dmitry Shachnev Tue, 22 Aug 2017 14:41:04 +0300 pyqt5 (5.7+dfsg-5) unstable; urgency=medium diff -Nru pyqt5-5.7+dfsg/debian/control pyqt5-5.7+dfsg/debian/control --- pyqt5-5.7+dfsg/debian/control 2017-07-08 08:36:01.000000000 +0000 +++ pyqt5-5.7+dfsg/debian/control 2017-08-22 11:41:04.000000000 +0000 @@ -1,8 +1,7 @@ Source: pyqt5 Section: python Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Python Modules Team +Maintainer: Debian Python Modules Team Uploaders: Dmitry Shachnev , Scott Kitterman Build-Depends: debhelper (>= 9), @@ -43,7 +42,7 @@ qtmultimedia5-dev (>= 5.9.1), qtpositioning5-dev (>= 5.9.1), qttools5-dev (>= 5.9.1), - qtwebengine5-dev (>= 5.9.1) [amd64 arm64 armhf i386] + qtwebengine5-dev (>= 5.9.1) [amd64 arm64 armhf i386 mipsel] Build-Depends-Indep: fdupes, python3-sphinx (>= 1.3) X-Python-Version: >= 2.7 X-Python3-Version: >= 3.3 @@ -247,7 +246,7 @@ This package contains the extension built for the Python 3 debug interpreter. Package: python3-pyqt5.qtwebengine -Architecture: amd64 arm64 armhf i386 +Architecture: amd64 arm64 armhf i386 mipsel Depends: python3-pyqt5.qtwebchannel (= ${binary:Version}), ${misc:Depends}, ${python3:Depends}, @@ -261,7 +260,7 @@ Package: python3-pyqt5.qtwebengine-dbg Priority: extra Section: debug -Architecture: amd64 arm64 armhf i386 +Architecture: amd64 arm64 armhf i386 mipsel Depends: python3-dbg, python3-pyqt5.qtwebchannel-dbg (= ${binary:Version}), python3-pyqt5.qtwebengine (= ${binary:Version}), @@ -689,7 +688,7 @@ This package contains the extension built for the Python 2 debug interpreter. Package: python-pyqt5.qtwebengine -Architecture: amd64 arm64 armhf i386 +Architecture: amd64 arm64 armhf i386 mipsel Depends: python-pyqt5.qtwebchannel (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, @@ -703,7 +702,7 @@ Package: python-pyqt5.qtwebengine-dbg Priority: extra Section: debug -Architecture: amd64 arm64 armhf i386 +Architecture: amd64 arm64 armhf i386 mipsel Depends: python-dbg, python-pyqt5.qtwebchannel-dbg (= ${binary:Version}), python-pyqt5.qtwebengine (= ${binary:Version}), diff -Nru pyqt5-5.7+dfsg/debian/.git-dpm pyqt5-5.7+dfsg/debian/.git-dpm --- pyqt5-5.7+dfsg/debian/.git-dpm 2017-01-21 08:26:05.000000000 +0000 +++ pyqt5-5.7+dfsg/debian/.git-dpm 2017-08-22 11:41:04.000000000 +0000 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -07a7844cecb63f4e5462cf1d0bcd66d86de6bead -07a7844cecb63f4e5462cf1d0bcd66d86de6bead +aa9edd51decd034cb3f14685404517169ff8a592 +aa9edd51decd034cb3f14685404517169ff8a592 5dba8adc259ac59a6c48bb424a42bc723b40db66 5dba8adc259ac59a6c48bb424a42bc723b40db66 pyqt5_5.7+dfsg.orig.tar.gz diff -Nru pyqt5-5.7+dfsg/debian/patches/no_license_check.diff pyqt5-5.7+dfsg/debian/patches/no_license_check.diff --- pyqt5-5.7+dfsg/debian/patches/no_license_check.diff 2017-07-08 08:36:01.000000000 +0000 +++ pyqt5-5.7+dfsg/debian/patches/no_license_check.diff 2017-08-22 11:41:04.000000000 +0000 @@ -1,10 +1,19 @@ -Description: disable Qt license check, does not work with new Qt +From ebaaebe9bc3302ece02390c34b8db81967d7c60a Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Sat, 22 Jul 2017 10:08:54 +0300 +Subject: Disable Qt license check, does not work with new Qt + Origin: upstream, from 5.8 release -Last-Update: 2017-07-08 +Patch-Name: no_license_check.diff +--- + configure.py | 37 +++++++------------------------------ + 1 file changed, 7 insertions(+), 30 deletions(-) +diff --git a/configure.py b/configure.py +index cb580084..474aafce 100644 --- a/configure.py +++ b/configure.py -@@ -32,10 +32,6 @@ +@@ -32,10 +32,6 @@ PYQT_VERSION_STR = "5.7" SIP_MIN_VERSION = '4.18' @@ -15,7 +24,7 @@ class ModuleMetadata: """ This class encapsulates the meta-data about a PyQt5 module. """ -@@ -531,7 +527,6 @@ +@@ -531,7 +527,6 @@ class TargetConfiguration: self.qml_plugin_dir = '' self.qsci_api = False self.qsci_api_dir = '' @@ -23,7 +32,7 @@ self.qtconf_prefix = '' self.qt_shared = False self.qt_version = 0 -@@ -638,8 +633,6 @@ +@@ -638,8 +633,6 @@ int main(int argc, char **argv) QTextStream out(&outf); @@ -32,7 +41,7 @@ #if defined(QT_SHARED) || defined(QT_DLL) out << "shared\\n"; #else -@@ -721,9 +714,8 @@ +@@ -721,9 +714,8 @@ int main(int argc, char **argv) lines = f.read().split('\n') f.close() @@ -44,7 +53,7 @@ # Get the details of the Python interpreter library. py_major = self.py_version >> 16 -@@ -1807,15 +1799,8 @@ +@@ -1807,15 +1799,8 @@ def inform_user(target_config, sip_version): the target configuration. sip_version is the SIP version string. """ @@ -62,7 +71,7 @@ inform("The qmake executable is %s." % target_config.qmake) -@@ -2636,11 +2621,10 @@ +@@ -2636,11 +2621,10 @@ def fix_license(src_lfile, dst_lfile): f.close() @@ -76,7 +85,7 @@ """ try: -@@ -2666,12 +2650,6 @@ +@@ -2666,12 +2650,6 @@ def check_license(target_config, license_confirmed, introspecting): (ltype, PYQT_VERSION_STR, lname, sys.version.split()[0], sys.platform)) @@ -89,7 +98,7 @@ # Confirm the license if not already done. if not license_confirmed: loptions = """ -@@ -2859,8 +2837,7 @@ +@@ -2859,8 +2837,7 @@ def main(argv): target_config.apply_post_options(opts) # Check the licenses are compatible. diff -Nru pyqt5-5.7+dfsg/debian/patches/opengl_detection.diff pyqt5-5.7+dfsg/debian/patches/opengl_detection.diff --- pyqt5-5.7+dfsg/debian/patches/opengl_detection.diff 2017-07-08 08:36:01.000000000 +0000 +++ pyqt5-5.7+dfsg/debian/patches/opengl_detection.diff 2017-08-22 11:41:04.000000000 +0000 @@ -1,10 +1,19 @@ -Description: fixes for the OpenGL detection needed by changes in Qt v5.8.0 +From aa9edd51decd034cb3f14685404517169ff8a592 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Sat, 22 Jul 2017 10:11:07 +0300 +Subject: Fixes for the OpenGL detection needed by changes in Qt v5.8.0 + Origin: upstream, changeset bf6caed84fd3 (from 5.8.2 release) -Last-Update: 2017-07-08 +Patch-Name: opengl_detection.diff +--- + configure.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +diff --git a/configure.py b/configure.py +index 474aafce..c84c58a8 100644 --- a/configure.py +++ b/configure.py -@@ -618,7 +618,7 @@ +@@ -618,7 +618,7 @@ class TargetConfiguration: out_file = 'qtdetail.out' @@ -13,7 +22,7 @@ #include #include #include -@@ -676,7 +676,7 @@ +@@ -676,7 +676,7 @@ int main(int argc, char **argv) #if defined(QT_NO_OPENGL) out << "PyQt_OpenGL\\n"; out << "PyQt_Desktop_OpenGL\\n"; @@ -22,7 +31,7 @@ out << "PyQt_Desktop_OpenGL\\n"; #endif -@@ -696,7 +696,7 @@ +@@ -696,7 +696,7 @@ int main(int argc, char **argv) } ''' % out_file diff -Nru pyqt5-5.7+dfsg/debian/patches/qt59_support.diff pyqt5-5.7+dfsg/debian/patches/qt59_support.diff --- pyqt5-5.7+dfsg/debian/patches/qt59_support.diff 2017-07-08 08:36:01.000000000 +0000 +++ pyqt5-5.7+dfsg/debian/patches/qt59_support.diff 2017-08-22 11:41:04.000000000 +0000 @@ -1,7 +1,21 @@ -Description: add support for Qt 5.9 +From f6bbff36c7f6bae62e244757e32ea4dc7f933391 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Sat, 22 Jul 2017 10:10:08 +0300 +Subject: Add support for Qt 5.9 + Origin: upstream, from 5.8 and 5.9 releases -Last-Update: 2017-07-08 +Patch-Name: qt59_support.diff +--- + sip/QtCore/QtCoremod.sip | 2 +- + sip/QtCore/qnamespace.sip | 2 -- + sip/QtCore/qobject.sip | 4 ++-- + sip/QtQml/qqmlapplicationengine.sip | 2 +- + sip/QtQuick/qquickitemgrabresult.sip | 2 +- + sip/QtSql/qsql.sip | 2 +- + 6 files changed, 6 insertions(+), 8 deletions(-) +diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip +index 94601426..e0c247a3 100644 --- a/sip/QtCore/QtCoremod.sip +++ b/sip/QtCore/QtCoremod.sip @@ -22,7 +22,7 @@ @@ -13,9 +27,11 @@ %Platforms {WS_X11 WS_WIN WS_MACX} +diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip +index 2db83b7c..559f4101 100644 --- a/sip/QtCore/qnamespace.sip +++ b/sip/QtCore/qnamespace.sip -@@ -209,8 +209,6 @@ +@@ -209,8 +209,6 @@ namespace Qt WindowContextHelpButtonHint, WindowShadeButtonHint, WindowStaysOnTopHint, @@ -24,9 +40,11 @@ WindowStaysOnBottomHint, WindowCloseButtonHint, MacWindowToolBarButtonHint, +diff --git a/sip/QtCore/qobject.sip b/sip/QtCore/qobject.sip +index d4e02477..2d77ed76 100644 --- a/sip/QtCore/qobject.sip +++ b/sip/QtCore/qobject.sip -@@ -527,8 +527,8 @@ +@@ -527,8 +527,8 @@ callable. void setParent(QObject * /TransferThis/); void installEventFilter(QObject *); void removeEventFilter(QObject *); @@ -37,9 +55,11 @@ QList dynamicPropertyNames() const; bool setProperty(const char *name, const QVariant &value); QVariant property(const char *name) const; +diff --git a/sip/QtQml/qqmlapplicationengine.sip b/sip/QtQml/qqmlapplicationengine.sip +index 529a3709..a8459741 100644 --- a/sip/QtQml/qqmlapplicationengine.sip +++ b/sip/QtQml/qqmlapplicationengine.sip -@@ -33,7 +33,7 @@ +@@ -33,7 +33,7 @@ public: QQmlApplicationEngine(const QUrl &url, QObject *parent /TransferThis/ = 0); QQmlApplicationEngine(const QString &filePath, QObject *parent /TransferThis/ = 0); virtual ~QQmlApplicationEngine(); @@ -48,9 +68,11 @@ public slots: void load(const QUrl &url) /ReleaseGIL/; +diff --git a/sip/QtQuick/qquickitemgrabresult.sip b/sip/QtQuick/qquickitemgrabresult.sip +index 15ac42e0..6c27075c 100644 --- a/sip/QtQuick/qquickitemgrabresult.sip +++ b/sip/QtQuick/qquickitemgrabresult.sip -@@ -31,7 +31,7 @@ +@@ -31,7 +31,7 @@ class QQuickItemGrabResult : QObject public: QImage image() const; QUrl url() const; @@ -59,6 +81,8 @@ protected: virtual bool event(QEvent *); +diff --git a/sip/QtSql/qsql.sip b/sip/QtSql/qsql.sip +index f7d3e449..758362f1 100644 --- a/sip/QtSql/qsql.sip +++ b/sip/QtSql/qsql.sip @@ -23,7 +23,7 @@ diff -Nru pyqt5-5.7+dfsg/debian/rules pyqt5-5.7+dfsg/debian/rules --- pyqt5-5.7+dfsg/debian/rules 2017-07-08 08:34:33.000000000 +0000 +++ pyqt5-5.7+dfsg/debian/rules 2017-08-22 11:41:04.000000000 +0000 @@ -35,7 +35,7 @@ ALLPYTHONS := $(PYTHON3S) $(PYTHON) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -QTWEBENGINE_ARCHS := amd64 arm64 armhf i386 +QTWEBENGINE_ARCHS := amd64 arm64 armhf i386 mipsel PYQT_MODULES := opengl sql webchannel webkit websockets xmlpatterns svg \ multimedia quick serialport sensors x11extras positioning