[Python-modules-commits] [pyqt5] 01/01: Backport upstream patch to fix handling of disabled features.

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch debian/master
in repository pyqt5.

commit 376b8adfa866ea38e586f0c691ccc95f399fd3c8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Aug 16 11:37:59 2017 +0300

    Backport upstream patch to fix handling of disabled features.
    
    Fixes build on architectures with OpenGL ES.
---
 debian/changelog                      |  7 +++++++
 debian/patches/disabled_features.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4268435..45c83c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pyqt5 (5.9+dfsg-2) UNRELEASED; urgency=medium
+
+  * Backport upstream patch to fix handling of disabled features (fixes
+    build on architectures with OpenGL ES).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 16 Aug 2017 11:37:20 +0300
+
 pyqt5 (5.9+dfsg-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/disabled_features.diff b/debian/patches/disabled_features.diff
new file mode 100644
index 0000000..f835e32
--- /dev/null
+++ b/debian/patches/disabled_features.diff
@@ -0,0 +1,26 @@
+From: Dmitry Shachnev <mitya57 at debian.org>
+Date: Wed, 16 Aug 2017 11:29:33 +0300
+Subject: Fixed the configuration tests' handling of disabled features.
+
+Origin: upstream, changeset 1a7f9ba28fed
+---
+ configure.py | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index b24866d..8bfdd1a 100644
+--- a/configure.py
++++ b/configure.py
+@@ -2168,10 +2168,8 @@ int main(int, char **)
+     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 feature: %s" % (mname, disabled))
++                target_config.pyqt_disabled_features.append(disabled)
+ 
+     # Include the module in the build.
+     target_config.pyqt_modules.append(mname)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bb6042b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disabled_features.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyqt5.git