svn commit: r333600 - head/devel/py-qt4-core/files

[Raphael Kubo da Costa]

Author: rakuco
Date: Tue Nov 12 19:01:34 2013
New Revision: 333600
URL: http://svnweb.freebsd.org/changeset/ports/333600

Log:
  Fix the multimedia/py-qt4-phonon build with multimedia/phonon 4.7.0.
  
  Change the configure.py so that the Phonon test program uses a different
  Phonon header, as upstream commit b51f5bf2 changed the QWidget include in a
  way that breaks PyQt's detection, and PyQt refuses to support KDE's Phonon
  for some reason and is thus unwilling to fix its configuration program.
  
  See https://bugs.kde.org/show_bug.cgi?id=306261 for more information.

Modified:
  head/devel/py-qt4-core/files/patch-configure.py

Modified: head/devel/py-qt4-core/files/patch-configure.py
==============================================================================
--- head/devel/py-qt4-core/files/patch-configure.py	Tue Nov 12 18:52:03 2013	(r333599)
+++ head/devel/py-qt4-core/files/patch-configure.py	Tue Nov 12 19:01:34 2013	(r333600)
@@ -9,6 +9,17 @@
  
          check_module("QtGui", "qwidget.h", "new QWidget()")
          if qt_version < 0x050000: check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
+@@ -371,8 +371,8 @@
+         check_module("QtTest", "QtTest", "QTest::qSleep(0)")
+         check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
+         check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
+-        check_module("phonon", "phonon/videowidget.h",
+-                "new Phonon::VideoWidget()")
++        check_module("phonon", "phonon/mediacontroller.h",
++                "new Phonon::MediaController(0)")
+         check_module("QtAssistant", "qassistantclient.h",
+                 "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
+                 extra_libs=ass_libs)
 @@ -648,21 +648,6 @@
          if opts.staticplugins:
              sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins))