rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename to qt-x11-opensource-src-4.5.2-pulseaudio.patch

Browse Source
This commit is contained in:
Than Ngo 2009-08-21 09:39:23 +00:00
parent 5ec98dafb1
commit 0e9f1a4810
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phonon-4.2.96-pulseaudio.patch → qt-x11-opensource-src-4.5.2-pulseaudio.patch
View File

@ -1,6 +1,6 @@
diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp
--- phonon-4.2.96/phonon/globalconfig.cpp 2008-11-27 16:41:41.000000000 +0100
+++ phonon-4.2.96.pulseaudio/phonon/globalconfig.cpp 2009-01-08 21:29:18.000000000 +0100
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp.phonon-pulseaudio qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp
--- qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp.phonon-pulseaudio 2009-06-20 06:57:54.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/phonon/globalconfig.cpp 2009-08-21 00:11:55.000000000 +0200
@@ -31,6 +31,7 @@
#include "phononnamespace_p.h"
@ -9,7 +9,7 @@ diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phono
#include <QtCore/QVariant>
QT_BEGIN_NAMESPACE
@@ -167,6 +168,15 @@
@@ -167,6 +168,15 @@ QList<int> GlobalConfig::audioOutputDevi
| ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
);
}
@ -25,7 +25,7 @@ diff -Naurw phonon-4.2.96/phonon/globalconfig.cpp phonon-4.2.96.pulseaudio/phono
defaultList += list;
}
@@ -222,6 +232,15 @@
@@ -222,6 +232,15 @@ QList<int> GlobalConfig::audioCaptureDev
| ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
);
}

6
qt.spec
View File

@ -45,7 +45,7 @@ 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: phonon-4.2.96-pulseaudio.patch
Patch17: qt-x11-opensource-src-4.5.2-pulseaudio.patch
Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
Patch21: qt-x11-opensource-src-4.5.2-gst-pulsaudio.patch
@ -377,9 +377,7 @@ Qt libraries used for drawing widgets and OpenGL items.
%patch13 -p1 -b .gcc_hack
%patch15 -p1 -b .enable_ft_lcdfilter
%patch16 -p1 -b .kde4_plugins
pushd src/3rdparty/phonon
%patch17 -p1 -b .phonon-pulseaudio
popd
%patch19 -p1 -b .servicesfile
%patch21 -p1 -b .gst-pulsaudio
%patch51 -p1 -b .qdoc3
@ -393,7 +391,7 @@ popd
# kde-qt branch
%patch200 -p1 -b .kde-qt-patches-20090820git
%patch201 -p1 -b .0118-qtcopy-define
%patch201 -p0 -b .0118-qtcopy-define
%patch202 -p0 -b .0283-do-not-deduce-scrollbar-extent-twice
%patch203 -p0 -b .0285-qgv-dontshowchildren