[packages/qt4] - disable gstreamer-0.10 in internal WebKit instead of BuildConflicts

[qboosh]

commit b6c50c30027503709d2f803bdde5df7d0afb6c09
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Aug 20 21:05:25 2021 +0200

    - disable gstreamer-0.10 in internal WebKit instead of BuildConflicts

 qt4.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/qt4.spec b/qt4.spec
index 567fab3..94b88d3 100644
--- a/qt4.spec
+++ b/qt4.spec
@@ -179,7 +179,6 @@ BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRequires:	xorg-lib-libXv-devel
 BuildRequires:	zlib-devel
-%{?with_system_phonon:BuildConflicts:	gstreamer0.10-devel}
 Obsoletes:	qt-extensions
 Obsoletes:	qt-utils
 Conflicts:	kdelibs <= 8:3.2-0.030602.1
@@ -1605,6 +1604,9 @@ Programas exemplo para o Qt versão.
 	s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|;
 	' mkspecs/common/linux.conf
 
+# disable gstreamer-0.10 based multimedia
+%{__sed} -i -e 's/gstreamer-0.10/&-disabled/' src/3rdparty/webkit/Source/WebCore/features.pri
+
 # disable webkit tests, broken build
 %{__rm} -r src/3rdparty/webkit/Source/WebKit/qt/tests
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/b6c50c30027503709d2f803bdde5df7d0afb6c09