From owner-svn-ports-all@FreeBSD.ORG Tue Nov 12 19:01:35 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 395E0368; Tue, 12 Nov 2013 19:01:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 286992D57; Tue, 12 Nov 2013 19:01:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACJ1ZFR065288; Tue, 12 Nov 2013 19:01:35 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACJ1Zwf065287; Tue, 12 Nov 2013 19:01:35 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201311121901.rACJ1Zwf065287@svn.freebsd.org> From: Raphael Kubo da Costa Date: Tue, 12 Nov 2013 19:01:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333600 - head/devel/py-qt4-core/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2013 19:01:35 -0000 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))