[Python-modules-commits] r26453 - in packages/python-qt4/trunk/debian (3 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Sunday, November 10, 2013 @ 16:45:44
  Author: mitya57-guest
Revision: 26453

Add a patch (phonon_cfgtest.diff) to fix detection of new Phonon
versions.

Added:
  packages/python-qt4/trunk/debian/patches/phonon_cfgtest.diff
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/patches/series

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2013-11-10 16:30:53 UTC (rev 26452)
+++ packages/python-qt4/trunk/debian/changelog	2013-11-10 16:45:44 UTC (rev 26453)
@@ -8,6 +8,8 @@
   * Update debian/watch to mangle dfsg version.
   * Drop debian/python-qt4-doc.docs, we install docs directly.
   * Pass --debug to configure-ng.py when doing debug builds.
+  * Add a patch (phonon_cfgtest.diff) to fix detection of new Phonon
+    versions.
   * Add myself to Uploaders.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 01 Nov 2013 11:12:39 +0400

Added: packages/python-qt4/trunk/debian/patches/phonon_cfgtest.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/phonon_cfgtest.diff	                        (rev 0)
+++ packages/python-qt4/trunk/debian/patches/phonon_cfgtest.diff	2013-11-10 16:45:44 UTC (rev 26453)
@@ -0,0 +1,16 @@
+Description: fix detection of Phonon ≥ 4.7
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: no
+Last-Update: 2013-11-10
+
+--- a/configure.py
++++ b/configure.py
+@@ -1256,6 +1256,8 @@
+     qt = [mname]
+     if mname in ("QtAssistant", "QtHelp", "QtOpenGL", "QtWebKit"):
+         qt.append("QtCore")
++    if mname == "phonon":
++        qt.append("QtGui")
+ 
+     makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
+             opengl=opengl, debug=opts.debug, arch=sipcfg.arch,

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2013-11-10 16:30:53 UTC (rev 26452)
+++ packages/python-qt4/trunk/debian/patches/series	2013-11-10 16:45:44 UTC (rev 26453)
@@ -1,3 +1,4 @@
 debian_configure_changes.diff
 config_extra_headers.diff
 qreal_float_support.diff
+phonon_cfgtest.diff