From 122b23a1fa2edae0a2acc3a72eb8f9409dd7579f Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: May 13 2008 17:21:55 +0000
Subject: * Tue May 13 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.4-2

- drop no longer needed ALSA default device Phonon hack

---

diff --git a/kdelibs-3.97.0-alsa-default-device.patch b/kdelibs-3.97.0-alsa-default-device.patch
deleted file mode 100644
index 57ee211..0000000
--- a/kdelibs-3.97.0-alsa-default-device.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodevice.cpp kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodevice.cpp
---- kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodevice.cpp	2007-11-20 23:02:30.000000000 +0100
-+++ kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodevice.cpp	2008-01-04 16:23:04.000000000 +0100
-@@ -349,6 +349,8 @@
-     if (lines.size() > 1) {
-         d->cardName = i18n("%1 (%2)", d->cardName, lines[1]);
-     }
-+    if (alsaDeviceName == "default")
-+        d->initialPreference = 1000;
-     if (alsaDeviceName.startsWith("front:") ||
-             alsaDeviceName.startsWith("rear:") ||
-             alsaDeviceName.startsWith("center_lfe:") ||
-diff -ur kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp
---- kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp	2007-11-27 18:17:14.000000000 +0100
-+++ kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp	2008-01-04 16:23:04.000000000 +0100
-@@ -188,6 +188,11 @@
-     }
-     snd_device_name_free_hint(hints);
- 
-+    DeviceHint defaultHint;
-+    defaultHint.name = QString::fromLatin1("default");
-+    defaultHint.description= QString::fromLatin1("ALSA Default Device");
-+    deviceHints << defaultHint;
-+
-     snd_config_update_free_global();
-     snd_config_update();
-     Q_ASSERT(snd_config);
diff --git a/kdelibs.spec b/kdelibs.spec
index 42e0804..19e9e79 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -51,9 +51,6 @@ Source2: kde4.csh
 Patch0: kdelibs-4.0.4-parallel_devel.patch
 # fix kde#149705
 Patch2: kdelibs-3.95.0-kde149705.patch
-# Force Phonon to use the ALSA default device by default
-# This should make it work better with PulseAudio.
-Patch4: kdelibs-3.97.0-alsa-default-device.patch
 # Hunspell support for K3Spell
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
@@ -181,7 +178,6 @@ format for easy browsing.
 
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
-%patch4 -p1 -b .alsa-default
 %if 0%{?fedora} >= 9
 %patch5 -p1 -b .k3spell-hunspell
 %else
@@ -357,6 +353,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May 13 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.4-2
+- drop no longer needed ALSA default device Phonon hack
+
 * Tue May 06 2008 Rex Dieter <rdieter@fedoraproject.org> - 4.0.4-1
 - kde-4.0.4