From 0e9f1a48101a9eea696803f1e65f378d7bc16838 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Aug 21 2009 09:39:23 +0000
Subject: rename to qt-x11-opensource-src-4.5.2-pulseaudio.patch


---

diff --git a/phonon-4.2.96-pulseaudio.patch b/phonon-4.2.96-pulseaudio.patch
deleted file mode 100644
index 1253402..0000000
--- a/phonon-4.2.96-pulseaudio.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-@@ -31,6 +31,7 @@
- #include "phononnamespace_p.h"
- 
- #include <QtCore/QList>
-+#include <QtCore/QHash>
- #include <QtCore/QVariant>
- 
- QT_BEGIN_NAMESPACE
-@@ -167,6 +168,15 @@
-                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
-                     );
-         }
-+        // make PulseAudio the global default (assume it is already default in this list)
-+        if (!list.isEmpty()) {
-+            int firstIndex = list.first();
-+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
-+                  firstIndex)["name"].toString() == "PulseAudio") {
-+                list.removeFirst();
-+                defaultList.prepend(firstIndex);
-+            }
-+        }
-         defaultList += list;
-     }
- 
-@@ -222,6 +232,15 @@
-                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
-                   );
-         }
-+        // make PulseAudio the global default (assume it is already default in this list)
-+        if (!list.isEmpty()) {
-+            int firstIndex = list.first();
-+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
-+                  firstIndex)["name"].toString() == "PulseAudio") {
-+                list.removeFirst();
-+                defaultList.prepend(firstIndex);
-+            }
-+        }
-         defaultList += list;
-     }
- 
diff --git a/qt-x11-opensource-src-4.5.2-pulseaudio.patch b/qt-x11-opensource-src-4.5.2-pulseaudio.patch
new file mode 100644
index 0000000..871000a
--- /dev/null
+++ b/qt-x11-opensource-src-4.5.2-pulseaudio.patch
@@ -0,0 +1,43 @@
+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"
+ 
+ #include <QtCore/QList>
++#include <QtCore/QHash>
+ #include <QtCore/QVariant>
+ 
+ QT_BEGIN_NAMESPACE
+@@ -167,6 +168,15 @@ QList<int> GlobalConfig::audioOutputDevi
+                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
+                     );
+         }
++        // make PulseAudio the global default (assume it is already default in this list)
++        if (!list.isEmpty()) {
++            int firstIndex = list.first();
++            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
++                  firstIndex)["name"].toString() == "PulseAudio") {
++                list.removeFirst();
++                defaultList.prepend(firstIndex);
++            }
++        }
+         defaultList += list;
+     }
+ 
+@@ -222,6 +232,15 @@ QList<int> GlobalConfig::audioCaptureDev
+                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
+                   );
+         }
++        // make PulseAudio the global default (assume it is already default in this list)
++        if (!list.isEmpty()) {
++            int firstIndex = list.first();
++            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
++                  firstIndex)["name"].toString() == "PulseAudio") {
++                list.removeFirst();
++                defaultList.prepend(firstIndex);
++            }
++        }
+         defaultList += list;
+     }
+ 
diff --git a/qt.spec b/qt.spec
index 52bb41a..322bf7d 100644
--- a/qt.spec
+++ b/qt.spec
@@ -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