From 8d8fa95c0cfa60d7deb305440c87cf46bdbbf99c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Jun 17 2015 19:16:15 +0000
Subject: kcm_phonon does not display all HDMI audio ports (#1232903)


---

diff --git a/0018-Don-t-overwrite-audio-profile-entries-with-same-prio.patch b/0018-Don-t-overwrite-audio-profile-entries-with-same-prio.patch
new file mode 100644
index 0000000..3a8be30
--- /dev/null
+++ b/0018-Don-t-overwrite-audio-profile-entries-with-same-prio.patch
@@ -0,0 +1,27 @@
+From 4b576cd02867672069c8077a43bb7caf442de8cc Mon Sep 17 00:00:00 2001
+From: Bernie Innocenti <bernie@codewiz.org>
+Date: Wed, 17 Jun 2015 10:26:46 -0700
+Subject: [PATCH 18/18] Don't overwrite audio profile entries with same
+ priority
+
+REVIEW: 124108
+---
+ kcms/phonon/audiosetup.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/phonon/audiosetup.h b/kcms/phonon/audiosetup.h
+index dfb25bf..72fb2be 100644
+--- a/kcms/phonon/audiosetup.h
++++ b/kcms/phonon/audiosetup.h
+@@ -33,7 +33,7 @@ typedef struct {
+     quint32 index;
+     QString name;
+     QString icon;
+-    QMap<quint32, QPair<QString, QString> > profiles;
++    QMultiMap<quint32, QPair<QString, QString> > profiles;
+     QString activeProfile;
+ } cardInfo;
+ 
+-- 
+2.4.3
+
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index dc41516..08b1c46 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -1,6 +1,6 @@
 Name:           plasma-desktop
 Version:        5.3.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plasma Desktop shell
 
 License:        GPLv2+ and (GPLv2 or GPLv3)
@@ -25,6 +25,7 @@ Patch102: plasma-desktop-fedora_layout.patch
 ## upstream patches
 Patch14: 0014-Fix-dropping-files-onto-the-desktop-containment.patch
 Patch15: 0015-Remove-X-KDE-Library-from-the-trash-library.patch
+Patch18: 0018-Don-t-overwrite-audio-profile-entries-with-same-prio.patch
 
 BuildRequires:  libusb-devel
 BuildRequires:  fontconfig-devel
@@ -282,6 +283,9 @@ fi
 
 
 %changelog
+* Wed Jun 17 2015 Rex Dieter <rdieter@fedoraproject.org> 5.3.1-6
+- kcm_phonon does not display all HDMI audio ports (#1232903)
+
 * Tue Jun 16 2015 Rex Dieter <rdieter@fedoraproject.org> 5.3.1-5
 - backport trashcan applet fix (#1231972,kde#349207)