rpms/qt/devel qt.spec, 1.388, 1.389 qt-x11-opensource-src-4.5.2-pulseaudio.patch, 1.1, NONE

Kevin Kofler kkofler at fedoraproject.org
Thu May 6 15:44:40 UTC 2010


Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13670/devel

Modified Files:
	qt.spec 
Removed Files:
	qt-x11-opensource-src-4.5.2-pulseaudio.patch 
Log Message:
rm qt-4.5.2-pulseaudio.patch entirely, not only is this a patch to the bundled Phonon which we aren't even building in Fedora, but it isn't needed at all for the Phonon which ships with Qt 4.7 even if we build Qt's Phonon. Qt 4.7 now ships a Phonon with the upstream PulseAudio integration.


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -p -r1.388 -r1.389
--- qt.spec	6 May 2010 14:56:18 -0000	1.388
+++ qt.spec	6 May 2010 15:44:40 -0000	1.389
@@ -42,8 +42,6 @@ Patch13: qt-x11-opensource-src-4.5.0-gcc
 Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 # include kde4 plugin path, http://bugzilla.redhat.com/498809
 Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch 
-# make PulseAudio the default device in Phonon
-Patch17: qt-x11-opensource-src-4.5.2-pulseaudio.patch
 Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
 Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
@@ -400,8 +398,6 @@ Qt libraries used for drawing widgets an
 %patch13 -p1 -b .gcc_hack
 %patch15 -p1 -b .enable_ft_lcdfilter
 %patch16 -p1 -b .kde4_plugins
-# pretty sure this isnt needed anymore, besides, doesnt' build as-is -- Rex
-#patch17 -p1 -b .phonon-pulseaudio
 %patch19 -p1 -b .servicesfile
 %patch22 -p1 -b .system_ca_certificates
 %patch51 -p1 -b .qdoc3


--- qt-x11-opensource-src-4.5.2-pulseaudio.patch DELETED ---



More information about the scm-commits mailing list