diff --git a/PyQt-x11-gpl-4.10.2-phonon_detect.patch b/PyQt-x11-gpl-4.10.2-phonon_detect.patch index 64fb6b1..8f4c75b 100644 --- a/PyQt-x11-gpl-4.10.2-phonon_detect.patch +++ b/PyQt-x11-gpl-4.10.2-phonon_detect.patch @@ -1,35 +1,12 @@ diff -up PyQt-x11-gpl-4.10.2/configure.py.phonon_detect PyQt-x11-gpl-4.10.2/configure.py ---- PyQt-x11-gpl-4.10.2/configure.py.phonon_detect 2013-11-14 15:22:04.307578123 -0600 -+++ PyQt-x11-gpl-4.10.2/configure.py 2013-11-14 15:40:33.947995130 -0600 -@@ -69,6 +69,7 @@ pydbusmoddir = None - dbusincdirs = [] - dbuslibdirs = [] - dbuslibs = [] -+phononincdirs = [] +--- PyQt-x11-gpl-4.10.2/configure.py.phonon_detect 2013-11-21 09:33:30.289460711 -0600 ++++ PyQt-x11-gpl-4.10.2/configure.py 2013-11-21 09:34:19.260561610 -0600 +@@ -1288,6 +1288,8 @@ def compile_qt_program(name, mname, extr + qt = [mname] + if mname in ("QtAssistant", "QtHelp", "QtOpenGL", "QtWebKit"): + qt.append("QtCore") ++ if mname in ("phonon"): ++ qt.append("QtGui") - - # Under Windows qmake and the Qt DLLs must be on the system PATH otherwise the -@@ -340,6 +341,14 @@ class ConfigurePyQt4: - ass_lib_dirs = None - ass_libs = None - -+ phonon_sout = get_command_stdout("pkg-config --cflags-only-I phonon") -+ phonon_iflags = phonon_sout.read().strip() -+ if sys.hexversion >= 0x03000000: -+ phonon_iflags = phonon_iflags.decode() -+ for f in phonon_iflags.split(): -+ if f.startswith("-I"): -+ phononincdirs.append(f[2:]) -+ - # Note that the order in which we check is important for the - # consolidated module - a module's dependencies must be checked first. - pyqt_modules.append("QtCore") -@@ -370,7 +379,7 @@ class ConfigurePyQt4: - check_module("QtXml", "qdom.h", "new QDomDocument()") - check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()") - check_module("phonon", "phonon/videowidget.h", -- "new Phonon::VideoWidget()") -+ "new Phonon::VideoWidget()", extra_include_dirs=phononincdirs) - check_module("QtAssistant", "qassistantclient.h", - "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs, - extra_libs=ass_libs) + makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0, + opengl=opengl, debug=opts.debug, arch=sipcfg.arch, diff --git a/PyQt4.spec b/PyQt4.spec index 205ccd6..0301bfe 100644 --- a/PyQt4.spec +++ b/PyQt4.spec @@ -9,7 +9,7 @@ Summary: Python bindings for Qt4 Name: PyQt4 Version: 4.10.2 -Release: 4%{?dist} +Release: 5%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: (GPLv3 or GPLv2 with exceptions) and BSD @@ -374,6 +374,9 @@ diff -u ./sip/QtOpenGL/opengl_types.sip.orig \ %changelog +* Thu Nov 21 2013 Rex Dieter 4.10.2-5 +- simpler phonon_detect.patch + * Thu Nov 14 2013 Rex Dieter 4.10.2-4 - fix build against phonon-4.7+ (kde#306261)