[Python-modules-commits] [pyqt5] 04/06: Add three patches from upstream to support Qt 5.9.
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat Jul 22 07:17:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch buster
in repository pyqt5.
commit 52da3d0bf79872799f5e2e3a53d631b8226f92f5
Merge: cbc5fda aa9edd5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Sat Jul 22 10:11:43 2017 +0300
Add three patches from upstream to support Qt 5.9.
configure.py | 43 ++++----------
debian/.git-dpm | 4 +-
debian/changelog | 9 +++
debian/patches/no_license_check.diff | 110 +++++++++++++++++++++++++++++++++++
debian/patches/opengl_detection.diff | 42 +++++++++++++
debian/patches/qt59_support.diff | 96 ++++++++++++++++++++++++++++++
debian/patches/series | 3 +
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 +-
13 files changed, 278 insertions(+), 43 deletions(-)
diff --cc debian/.git-dpm
index b3f6e90,0000000..99f8a91
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 07a7844cecb63f4e5462cf1d0bcd66d86de6bead
- 07a7844cecb63f4e5462cf1d0bcd66d86de6bead
++aa9edd51decd034cb3f14685404517169ff8a592
++aa9edd51decd034cb3f14685404517169ff8a592
+5dba8adc259ac59a6c48bb424a42bc723b40db66
+5dba8adc259ac59a6c48bb424a42bc723b40db66
+pyqt5_5.7+dfsg.orig.tar.gz
+21aec345deb6ac1aa4ab372113a5a5e22a7f74f4
+3080141
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index ac6560d,0000000..36c1e36
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,483 -1,0 +1,492 @@@
++pyqt5 (5.7+dfsg-6) UNRELEASED; urgency=medium
++
++ * Add patches from upstream to support Qt 5.9:
++ - no_license_check.diff
++ - qt59_support.diff
++ - opengl_detection.diff
++
++ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 22 Jul 2017 10:11:49 +0300
++
+pyqt5 (5.7+dfsg-5) unstable; urgency=medium
+
+ * Make WebEngine packages depend on WebChannel, to avoid import errors.
+ * Disable implicit qml_debug option for debug builds (no_qml_debug.diff).
+ Patch taken from openSUSE, thanks Hans-Peter Jansen!
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 21 Jan 2017 11:26:05 +0300
+
+pyqt5 (5.7+dfsg-4) unstable; urgency=medium
+
+ * Add Qt WebEngine support for amd64 and i386 (closes: #841830).
+ * Add Qt WebChannel support.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Mon, 09 Jan 2017 12:47:01 +0300
+
+pyqt5 (5.7+dfsg-3) experimental; urgency=medium
+
+ * Build against Qt 5.7 for experimental.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 13 Sep 2016 12:01:27 +0300
+
+pyqt5 (5.7+dfsg-2) unstable; urgency=medium
+
+ * Backport an upstream change to fix conversion of bytes values
+ (bytes_conversion.diff; closes: #834875).
+ * Update the pyuic5 and pyrcc5 manpages.
+ * Drop obsolete debian/README.source.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 27 Aug 2016 21:06:10 +0300
+
+pyqt5 (5.7+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop 0001-Use-all-D-Bus-include-directories-returned-by-pkg-co.patch,
+ applied upstream.
+ * Drop rule to remove pycache from orig tarball, it is no longer there.
+ * Update debian/copyright.
+ * Stop installing Qt.pyi, it is no longer generated.
+ * Update for upstream changes to pyrcc5 and pylupdate5:
+ - Add new files to debian/pyqt5-dev-tools.install.
+ - Fix shebangs in /usr/bin/pylupdate5 and /usr/bin/pyrcc5 files.
+ - Call make install to temporary location to be able to run pyrcc5.
+ - Call dh_python3 against pyqt5-dev-tools.
+ * Use --no-sip-files configure option instead of removing the .sip files
+ after they are installed.
+ * Only ship files installed by upstream build system in pyqt5-dev.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Fri, 12 Aug 2016 10:25:00 +0300
+
+pyqt5 (5.6+dfsg-2) experimental; urgency=medium
+
+ * Build against Qt 5.6 for experimental.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 30 Apr 2016 15:49:27 +0300
+
+pyqt5 (5.6+dfsg-1) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Add missing newline before clean target in debian/rules.
+ * Updated debian/watch for the new tarballs naming scheme.
+ * Bump sip build-dependencies to 4.18, following configure.py.
+ * Drop custom get-orig-source target, it makes no sense.
+ * Bump Standards-Version to 3.9.8, no changes needed.
+ * Override Lintian false positive error about tiger.js file.
+ * Fix detection of D-Bus include directories.
+ * Install Python type hint (*.pyi) files.
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Tue, 26 Apr 2016 16:02:09 +0300
+
+pyqt5 (5.5.1+dfsg-3) unstable; urgency=medium
+
+ * Move pyuic5-related sed call to install-arch target, it should not
+ be run during indep builds.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 25 Oct 2015 23:46:29 +0300
+
+pyqt5 (5.5.1+dfsg-2) unstable; urgency=medium
+
+ * Make pyuic5 shebang fixup really work.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 25 Oct 2015 20:04:40 +0300
+
+pyqt5 (5.5.1+dfsg-1) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Move fdupes from Build-Depends to Build-Depends-Indep, it is only
+ used to build pyqt5-examples package.
+ * Sort debian/pyqt5-dev-tools.manpages file.
+ * Remove examples/webkit/fancybrowser/__pycache__ from orig tarball,
+ it contains a compiled file without source.
+ * Remove uupdate call from debian/rules, not needed with git-dpm.
+
+ [ Matthias Klose ]
+ * pyuic5: Call the unversioned python3 interpreter.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 25 Oct 2015 19:17:22 +0300
+
+pyqt5 (5.5+dfsg-2) unstable; urgency=medium
+
+ * Remove gstreamer 0.10 packages from build-depends, no longer needed.
+ * Update Vcs fields for Git migration.
+ * Add support for Qt 5.5.1 (0001-Add-support-for-Qt-5.5.1.patch).
+ * Move python3-sphinx from Build-Depends to Build-Depends-Indep.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 22 Oct 2015 13:11:35 +0300
+
+pyqt5 (5.5+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Build against Qt 5.5.0.
+ * Add explicit build-dependency on dh-python.
+ * Drop Enginio packages. QtEnginio is no longer developed and
+ pending deprecation.
+ * Build with Sphinx 1.3.
+ * Specify repacksuffix in debian/watch.
+ * Drop XS-Testsuite header, no longer needed with new dpkg versions.
+ * Bump year in debian/copyright.
+ * Add QtLocation library to QtPositioning packages.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 20 Aug 2015 12:59:06 +0300
+
+pyqt5 (5.4.2+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop all patches, applied upstream.
+ * Add a temporary hack to use upstream stylesheet when building the
+ documentation with Sphinx 1.2.
+ * Build-depend on sip 4.16.8+dfsg-2, as the previous upload would
+ generate wrong dependencies for Python 3 packages.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 25 Jun 2015 14:30:12 +0300
+
+pyqt5 (5.4.1+dfsg-3) experimental; urgency=medium
+
+ * Update and unify descriptions of binary packages.
+ * Backport upstream change to add support for Qt 5.4.2.
+ * Let pyuic sort the import order (closes: #787251, thanks to Reiner
+ Herrmann for the patch).
+ * Build against Qt 5.4.2 to make sure we are ready for the transition.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 06 Jun 2015 12:10:46 +0300
+
+pyqt5 (5.4.1+dfsg-2) experimental; urgency=medium
+
+ * Backport some fixes to setZOrder() function from upstream
+ (uiparser_setzorder_fix.diff).
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 12 Mar 2015 10:49:35 +0300
+
+pyqt5 (5.4.1+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ - No longer inserts timestamps into generated files (closes: #774510).
+ - Require sip 4.16.6 for building.
+ * Build against Qt 5.4.1.
+ * Update list of possible options in pylupdate5 manpage.
+ * Add some Suggests to pyqt5-examples package (closes: #779369).
+ * No-op wrap and sort.
+ * Bump years in debian/copyright.
+ * Remove .pyc and .DS_Store files when cleaning.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Thu, 05 Mar 2015 22:14:15 +0300
+
+pyqt5 (5.4+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Drop add_dependency.diff, applied upstream.
+ * Bump required sip dependency to 4.16.4.
+ * Install QtXml module.
+ * Build against Qt 5.4.
+ * Fix descriptions of some binary packages (closes: #769468, #771713).
+ * Add missing licensing information to debian/copyright.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 28 Dec 2014 19:49:12 +0300
+
+pyqt5 (5.3.2+dfsg-3) unstable; urgency=medium
+
+ * Fix a typo in debian/tests/control.
+ * Test Enginio and QtWebSockets modules in autopkgtest.
+ * Add a patch from OpenSUSE to make pyqt5 build against Qt 5.3.2.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 24 Sep 2014 13:21:26 +0400
+
+pyqt5 (5.3.2+dfsg-2) unstable; urgency=medium
+
+ * Add new package for Enginio module.
+ * Add new package for QtWebSockets module.
+ * Fix Lintian warnings about too short and duplicate long descriptions.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sun, 14 Sep 2014 14:40:11 +0400
+
+pyqt5 (5.3.2+dfsg-1) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * New upstream release.
+ * Test Python 2 versions in autopkgtest.
+ * Set X-Python-Version to >= 2.7 as the current code in debian/rules
+ builds only for that version.
+ * Remove all strip calls from generated Makefiles.
+ * Update my e-mail address.
+ * Update debian/copyright.
+
+ [ Scott Kitterman ]
+ * Set minimum python3-all-dev version to 3.3.2-5~ due to use of configdir in
+ debian/rules (LP: #1365814)
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Sat, 13 Sep 2014 14:13:57 +0400
+
+pyqt5 (5.3.1+dfsg-4) unstable; urgency=medium
+
+ * Add support for python in addition to python3 because the upcoming calibre
+ 2.X series of releases will use PyQt5 with Python and not Python 3
+ - Add python build-depends to debian/control
+ - Add python-* equivalents of existing python3-* packages to debian/
+ control
+ - Update debian/rules to account for python as well as python3
+ - Set minimum python3 version to 3.3 since the revised debug configure
+ rule will not work for 3.2
+ - Replicate and update all python3-* .install files as python-*
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 03 Aug 2014 18:48:21 -0400
+
+pyqt5 (5.3.1+dfsg-3) unstable; urgency=medium
+
+ * debian/tests/import: Redirect stderr to stdout for debug interpreter.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 26 Jul 2014 21:57:58 +0400
+
+pyqt5 (5.3.1+dfsg-2) unstable; urgency=medium
+
+ * Workaround GCC bug #61918 by replacing -isystem with -I in Makefiles
+ (closes: #755767).
+ * Test importing from debug interpreters in autopkgtest.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 26 Jul 2014 09:59:30 +0400
+
+pyqt5 (5.3.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream release
+ - Drop debian/patches/fix_implicit_qtablewidget.patch, which had been
+ cherry picked from upstream
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 05 Jul 2014 00:05:42 -0400
+
+pyqt5 (5.3+dfsg-3) unstable; urgency=medium
+
+ * Added debian/patches/fix_implicit_qtablewidget.patch to fix a pyuic
+ regression in the handling of implicit QTableWidget dimensions
+
+ -- Scott Kitterman <scott at kitterman.com> Thu, 19 Jun 2014 00:20:35 -0400
+
+pyqt5 (5.3+dfsg-2) unstable; urgency=medium
+
+ * Bump Qt build-dependencies to 5.3, to make sure headers are in
+ correct (multi-arch) locations.
+ * Upload to unstable.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sun, 08 Jun 2014 17:01:30 +0400
+
+pyqt5 (5.3+dfsg-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Fix uscan warning about trailing / in Files-Excluded.
+ * Use new --no-tools configure flag on non-default Python versions.
+ * Bump required sip4 version to 4.16.
+ * Install QtQuickWidgets.so if it is available.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Mon, 02 Jun 2014 15:16:52 +0400
+
+pyqt5 (5.2.1+dfsg-3) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Drop get-orig-source.sh in favour of Files-Excluded field in
+ debian/copyright.
+
+ [ Scott Kitterman ]
+ * Upload to unstable
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 09 May 2014 09:38:52 -0400
+
+pyqt5 (5.2.1+dfsg-2) experimental; urgency=medium
+
+ * Add new package for QtPositioning module.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 19 Apr 2014 23:25:04 +0400
+
+pyqt5 (5.2.1+dfsg-1) experimental; urgency=medium
+
+ * New upstream bugfix release.
+ * Drop all patches, applied upstream.
+ * Bump python3-sip-dev build-dependency to 4.15.5.
+ * Update licensing information for pylupdate and pyrcc modules.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Tue, 11 Mar 2014 12:45:18 +0400
+
+pyqt5 (5.2+dfsg-4) unstable; urgency=medium
+
+ * Build-depend on libqt5x11extras5-dev instead of libqt5x11extras-dev,
+ which is now a transitional package.
+ * Drop QMAKESPEC export, seems to be not needed anymore.
+ * Drop hack for alpha, it is no longer supported and qtwebkit is
+ not built there anyway.
+ * Backport upstream patch to fix licensing for dbus module.
+ * Update debian/copyright to use the machine-readable DEP-5 format.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Mon, 10 Feb 2014 09:24:20 +0400
+
+pyqt5 (5.2+dfsg-3) unstable; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Medium urgency for auto-qtbase-opensource-src transition
+ * No longer create sip symlinks in build directories, that does not
+ have any effect.
+ * debian/patches/fix_qreal_check.diff: Fix qreal check for Qt 5.2.
+ * Adjust dh_compress call to make exclude list not match the whole
+ pyqt5-examples package.
+
+ [ Scott Kitterman ]
+ * Update QMAKESPEC definition in debian/rules for new location (Thanks to
+ Lisandro Damián Nicanor Pérez Meyer for the fix)
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Fri, 31 Jan 2014 20:03:53 +0400
+
+pyqt5 (5.2+dfsg-2) unstable; urgency=low
+
+ [ Dmitry Shachnev ]
+ * Add new package for QtX11Extras module.
+ * Autopkgtest improvements:
+ - Make import autopkgtest depend on python3-all.
+ - Don’t set -x in import autopkgtest.
+ - Test QtDBus and QtX11Extras modules as well.
+ * Split examples into their own package, pyqt5-examples.
+ * Rename qpair_old_qt.diff to old_qt.diff, and include a fix for
+ QtX11Extras module.
+
+ [ Scott Kitterman ]
+ * Update debian/copyright for 2014 references
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sun, 19 Jan 2014 12:05:05 +0400
+
+pyqt5 (5.2+dfsg-1) unstable; urgency=low
+
+ * Upload to unstable.
+ * New upstream release.
+ * Drop all patches, applied upstream.
+ * Backport a patch (qpair_old_qt.diff) to fix building against
+ Qt 5.1.
+ * Bump required sip version to 4.15.4.
+ * Bump Standards-Version to 3.9.5, no changes needed.
+ * Add XS-Testsuite header for autopkgtest.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Thu, 09 Jan 2014 11:48:59 +0400
+
+pyqt5 (5.1.1+dfsg-3) experimental; urgency=low
+
+ * Upload to experimental to build against Qt 5.2.
+ * Backport upstream patch (gluint64.sip) to disable GLuint64 on GL ES.
+ * Symlink duplicate files in examples using fdupes.
+ * Add an autopkgtest to make sure all packages are co-installable
+ and all modules are importable.
+ * Temporary build-depend on libudev-dev on Linux to workaround qmake
+ bug that adds -ludev when building QtSerialPort test code.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sun, 22 Dec 2013 11:13:52 +0400
+
+pyqt5 (5.1.1+dfsg-2) unstable; urgency=low
+
+ * Add pyqt5.qtopengl-dbg Breaks/Conflicts to fix file overwrite error
+ (Closes: #729737)
+
+ -- Scott Kitterman <scott at kitterman.com> Sat, 16 Nov 2013 16:42:07 -0500
+
+pyqt5 (5.1.1+dfsg-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * Add debian/get-orig-source.sh and explain how to use it in
+ README.source; add jquery_rc.py to list of non-free files.
+ * Use dh_link for linking jquery.js in examples.
+ * Install QOpenGLFunctions libraries in python3-pyqt5.qtopengl package.
+ * Call dh_install with --fail-missing option.
+ * Do not install Windows-specific activeqt examples.
+ * Add new packages for QtSerialPort and QtSensors modules.
+ * Make sure dpkg build flags are actually applied.
+ * Backport upstream patch to always apply passed qmake variables.
+ * Pass --debug option to configure.py when doing debug builds.
+ * Link with --as-needed.
+ * Simplify install code in debian/rules.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 09 Nov 2013 14:26:40 +0400
+
+pyqt5 (5.1+dfsg-1) unstable; urgency=low
+
+ [ Scott Kitterman ]
+ * New upstream release
+ * Install designer plugin in python3-pyqt5
+ * Move debug version of libpyqt5qmlplugin.so from python3-pyqt5-dbg to
+ python3-pyqt5.qtquick-dbg to match the regular file and avoid duplication
+ (Closes: #720679)
+ * Remove debian/patches/libpython_multiarch.diff, equivalent change
+ incorporated upstream (and debian/patches directory since there are no
+ other patches)
+ * Add README.source to document how to make DFSG tarball
+
+ [ Dmitry Shachnev ]
+ * Delete pycache directories in clean target.
+ * Regenerate resource files during build.
+ * Repack tarball to remove minified javascript from docs and fancybrowser
+ example (Closes: #722990).
+ * Update debian/watch to use dversionmangle.
+ * Build QML plugin only for the default Python version.
+
+ -- Scott Kitterman <scott at kitterman.com> Sun, 13 Oct 2013 07:53:00 -0400
+
+pyqt5 (5.0.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Bump python3-sip-dev build-dependency to 4.15.
+ * Drop all previous patches, applied upstream.
+ * Add new package, python3-pyqt5.qtquick, containing QtQuick and QtQml
+ extensions.
+ * Install QtMultimediaWidgets extension.
+ * Make pyqt5-doc recommend python3-pyqt5, because of the examples.
+ * Add a patch to support multiarch locations of libpython.
+ * Workaround useless warnings from dh_install --list-missing.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Thu, 22 Aug 2013 11:00:35 +0400
+
+pyqt5 (5.0-3) unstable; urgency=low
+
+ * Upload to unstable
+ * Set X-Python3-Version back to >= 3.2 as the work-around is not longer
+ neeeded (python3.2 is no longer supported in unstable)
+
+ -- Scott Kitterman <scott at kitterman.com> Mon, 12 Aug 2013 19:49:25 -0400
+
+pyqt5 (5.0-2) experimental; urgency=low
+
+ [ Dmitry Shachnev ]
+ * Update debian/copyright, thanks Paul Tagliamonte for comments.
+ * Use xz compression for binary packages.
+ * Install files to python3-dbus.mainloop.pyqt5{,-dbg} directly instead of
+ generating .install files. This fixes a problem of the -dbg package being
+ not installable because of unwanted debug-id files (closes: #718551).
+
+ [ Scott Kitterman ]
+ * Add debian/patches/arm_compile.patch, cherry picked from upstream to
+ enable builds on arm (replaces qreal_float_support.diff that was used in
+ python-qt4)
+ * Remove pycache directories left over in pyqt5-doc
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 09 Aug 2013 17:44:19 -0400
+
+pyqt5 (5.0-1) experimental; urgency=low
+
+ [ Dmitry Shachnev ]
+ * Initial release, based on python-qt4 packaging (closes: #712630).
+ * debian/patches/mainloop_rename.diff: upstream patch to rename
+ dbus.mainloop.qt module to dbus.mainloop.pyqt5, to prevent conflicts
+ with PyQt4.
+
+ [ Scott Kitterman ]
+ * Add call to dh_installdocs in debian/rules
+ * Added doc-base registration, debian/pyqt5-doc.doc-base
+ * Remove empty pyqt5-doc/examples/webkit/googlechat directory
+ * Add debian/pyqt5-doc.links to replace embedded copy of jquery.min.js in
+ the fancybrowser example with a symlink to the existing copy in the html
+ documentation
+ * Add debian/patches/fix-example-shebang to remove a buggy and unneeded
+ shebang in examples/sql/connection.py
+ * Set X-Python3-Version: >= 3.3 in debian/control as a temporary workaround
+ to a dh_python3 issue with extension renaming
+
+ -- Dmitry Shachnev <mitya57 at gmail.com> Sat, 28 Jul 2013 13:15:13 +0400
diff --cc debian/patches/no_license_check.diff
index 0000000,0000000..24ee3b8
new file mode 100644
--- /dev/null
+++ b/debian/patches/no_license_check.diff
@@@ -1,0 -1,0 +1,110 @@@
++From ebaaebe9bc3302ece02390c34b8db81967d7c60a Mon Sep 17 00:00:00 2001
++From: Dmitry Shachnev <mitya57 at gmail.com>
++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
++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 @@ PYQT_VERSION_STR = "5.7"
++
++ SIP_MIN_VERSION = '4.18'
++
++-# The different values QLibraryInfo::licensee() can return for the LGPL version
++-# of Qt.
++-OPEN_SOURCE_LICENSEES = ('Open Source', 'Builder Qt')
++-
++
++ class ModuleMetadata:
++ """ This class encapsulates the meta-data about a PyQt5 module. """
++@@ -531,7 +527,6 @@ class TargetConfiguration:
++ self.qml_plugin_dir = ''
++ self.qsci_api = False
++ self.qsci_api_dir = ''
++- self.qt_licensee = ''
++ self.qtconf_prefix = ''
++ self.qt_shared = False
++ self.qt_version = 0
++@@ -638,8 +633,6 @@ int main(int argc, char **argv)
++
++ QTextStream out(&outf);
++
++- out << QLibraryInfo::licensee() << '\\n';
++-
++ #if defined(QT_SHARED) || defined(QT_DLL)
++ out << "shared\\n";
++ #else
++@@ -721,9 +714,8 @@ int main(int argc, char **argv)
++ lines = f.read().split('\n')
++ f.close()
++
++- self.qt_licensee = lines[0]
++- self.qt_shared = (lines[1] == 'shared')
++- self.pyqt_disabled_features = lines[2:-1]
+++ self.qt_shared = (lines[0] == 'shared')
+++ self.pyqt_disabled_features = lines[1:-1]
++
++ # Get the details of the Python interpreter library.
++ py_major = self.py_version >> 16
++@@ -1807,15 +1799,8 @@ def inform_user(target_config, sip_version):
++ the target configuration. sip_version is the SIP version string.
++ """
++
++- if target_config.qt_licensee == '':
++- detail = ''
++- elif target_config.qt_licensee in OPEN_SOURCE_LICENSEES:
++- detail = " (Open Source)"
++- else:
++- detail = " licensed to %s" % target_config.qt_licensee
++-
++- inform("Qt v%s%s is being used." % (
++- version_to_string(target_config.qt_version), detail))
+++ inform("Qt v%s is being used." %
+++ version_to_string(target_config.qt_version))
++
++ inform("The qmake executable is %s." % target_config.qmake)
++
++@@ -2636,11 +2621,10 @@ def fix_license(src_lfile, dst_lfile):
++ f.close()
++
++
++-def check_license(target_config, license_confirmed, introspecting):
+++def check_license(target_config, license_confirmed):
++ """ Handle the validation of the PyQt5 license. target_config is the
++ target configuration. license_confirmed is set if the user has already
++- accepted the license. introspecting is set if the configuration is being
++- determined by introspection.
+++ accepted the license.
++ """
++
++ try:
++@@ -2666,12 +2650,6 @@ def check_license(target_config, license_confirmed, introspecting):
++ (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 = """
++@@ -2859,8 +2837,7 @@ def main(argv):
++ target_config.apply_post_options(opts)
++
++ # Check the licenses are compatible.
++- check_license(target_config, opts.license_confirmed,
++- (opts.config_file is None))
+++ check_license(target_config, opts.license_confirmed)
++
++ # Check Python is what we need.
++ check_python(target_config)
diff --cc debian/patches/opengl_detection.diff
index 0000000,0000000..0b0fc6c
new file mode 100644
--- /dev/null
+++ b/debian/patches/opengl_detection.diff
@@@ -1,0 -1,0 +1,42 @@@
++From aa9edd51decd034cb3f14685404517169ff8a592 Mon Sep 17 00:00:00 2001
++From: Dmitry Shachnev <mitya57 at gmail.com>
++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)
++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 @@ class TargetConfiguration:
++
++ out_file = 'qtdetail.out'
++
++- source = '''#include <QCoreApplication>
+++ source = '''#include <QGuiApplication>
++ #include <QFile>
++ #include <QLibraryInfo>
++ #include <QTextStream>
++@@ -676,7 +676,7 @@ int main(int argc, char **argv)
++ #if defined(QT_NO_OPENGL)
++ out << "PyQt_OpenGL\\n";
++ out << "PyQt_Desktop_OpenGL\\n";
++-#elif defined(QT_OPENGL_ES_2)
+++#elif defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_ES_3)
++ out << "PyQt_Desktop_OpenGL\\n";
++ #endif
++
++@@ -696,7 +696,7 @@ int main(int argc, char **argv)
++ }
++ ''' % out_file
++
++- cmd = compile_qt_program(self, verbose, 'qtdetail', source, 'QtCore',
+++ cmd = compile_qt_program(self, verbose, 'qtdetail', source, 'QtGui',
++ debug=debug)
++
++ if cmd is None:
diff --cc debian/patches/qt59_support.diff
index 0000000,0000000..6a2e1b9
new file mode 100644
--- /dev/null
+++ b/debian/patches/qt59_support.diff
@@@ -1,0 -1,0 +1,96 @@@
++From f6bbff36c7f6bae62e244757e32ea4dc7f933391 Mon Sep 17 00:00:00 2001
++From: Dmitry Shachnev <mitya57 at gmail.com>
++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
++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 @@
++
++ %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_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1}
++
++ %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 @@ namespace Qt
++ WindowContextHelpButtonHint,
++ WindowShadeButtonHint,
++ WindowStaysOnTopHint,
++- WindowOkButtonHint,
++- WindowCancelButtonHint,
++ 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 @@ callable.
++ void setParent(QObject * /TransferThis/);
++ void installEventFilter(QObject *);
++ void removeEventFilter(QObject *);
++- void dumpObjectInfo();
++- void dumpObjectTree();
+++ void dumpObjectInfo() const;
+++ void dumpObjectTree() const;
++ QList<QByteArray> 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 @@ public:
++ QQmlApplicationEngine(const QUrl &url, QObject *parent /TransferThis/ = 0);
++ QQmlApplicationEngine(const QString &filePath, QObject *parent /TransferThis/ = 0);
++ virtual ~QQmlApplicationEngine();
++- QList<QObject *> rootObjects();
+++ QList<QObject *> rootObjects() const;
++
++ 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 @@ class QQuickItemGrabResult : QObject
++ public:
++ QImage image() const;
++ QUrl url() const;
++- bool saveToFile(const QString &fileName);
+++ bool saveToFile(const QString &fileName) const;
++
++ 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 @@
++ namespace QSql
++ {
++ %TypeHeaderCode
++-#include <qsql.h>
+++#include <qtsqlglobal.h>
++ %End
++
++ enum Location
diff --cc debian/patches/series
index 3f41038,0000000..bbd75ce
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,5 @@@
+bytes_conversion.diff
+no_qml_debug.diff
++no_license_check.diff
++qt59_support.diff
++opengl_detection.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyqt5.git
More information about the Python-modules-commits
mailing list