[kde-runtime/f17] Fix Phonon KCM which is set always as changed

[Jan Grulich]

commit 45432069b498aad5e2142e3a2ba8d67a3fe4a5a4
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Sat May 18 18:41:49 2013 +0200

    Fix Phonon KCM which is set always as changed

 kde-runtime-4.10.3-phononkcm.patch |   50 ++++++++++++++++++++++++++++++++++++
 kde-runtime.spec                   |    9 ++++++-
 2 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/kde-runtime-4.10.3-phononkcm.patch b/kde-runtime-4.10.3-phononkcm.patch
new file mode 100644
index 0000000..1793d1a
--- /dev/null
+++ b/kde-runtime-4.10.3-phononkcm.patch
@@ -0,0 +1,50 @@
+Pouze v kde-runtime-4.10.3_new/: kde-runtime-4.10.3-phononkcm.patch
+diff -upr kde-runtime-4.10.3/phonon/kcm/audiosetup.cpp kde-runtime-4.10.3_new/phonon/kcm/audiosetup.cpp
+--- kde-runtime-4.10.3/phonon/kcm/audiosetup.cpp	2013-05-03 06:36:37.121198340 +0200
++++ kde-runtime-4.10.3_new/phonon/kcm/audiosetup.cpp	2013-05-18 17:20:10.629819881 +0200
+@@ -509,12 +509,13 @@ void AudioSetup::removeSource(uint32_t i
+ 
+ void AudioSetup::updateFromPulse()
+ {
++    bool setupReady = false;
+     if (m_OutstandingRequests > 0) {
+         if (0 == --m_OutstandingRequests) {
+             // Work out which seclector to pick by default (we want to choose a real Card if possible)
+             if (s_Cards.size() != cardBox->count())
+                 cardBox->setCurrentIndex(1);
+-            emit ready();
++            setupReady = true;
+         }
+     }
+ 
+@@ -540,6 +541,10 @@ void AudioSetup::updateFromPulse()
+             deviceBox->setEnabled(true);
+             deviceChanged();
+         }
++
++        if (setupReady) {
++            emit ready();
++        }
+     }
+ }
+ 
+diff -upr kde-runtime-4.10.3/phonon/kcm/main.cpp kde-runtime-4.10.3_new/phonon/kcm/main.cpp
+--- kde-runtime-4.10.3/phonon/kcm/main.cpp	2013-05-03 06:36:37.128198273 +0200
++++ kde-runtime-4.10.3_new/phonon/kcm/main.cpp	2013-05-18 17:19:13.414800962 +0200
+@@ -72,7 +72,6 @@ PhononKcm::PhononKcm(QWidget *parent, co
+     m_speakerSetup = new AudioSetup(this);
+     m_speakerSetup->setVisible(false);
+     connect(m_speakerSetup, SIGNAL(ready()), SLOT(speakerSetupReady()));
+-    connect(m_speakerSetup, SIGNAL(changed()), SLOT(changed()));
+ #endif
+ }
+ 
+@@ -99,7 +98,7 @@ void PhononKcm::speakerSetupReady()
+ {
+   m_tabs->insertTab(1, m_speakerSetup, i18n("Audio Hardware Setup"));
+   m_devicePreferenceWidget->pulseAudioEnabled();
+-  emit changed();
++  connect(m_speakerSetup, SIGNAL(changed()), SLOT(changed()));
+ }
+ #endif
+ 
diff --git a/kde-runtime.spec b/kde-runtime.spec
index f374dd1..5107d9c 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -6,7 +6,7 @@
 Name:    kde-runtime
 Summary: KDE Runtime
 Version: 4.10.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+ and GPLv2+
@@ -49,6 +49,9 @@ Patch50: kde-runtime-4.7.90-nepomuk_onlyshowin_kde.patch
 # increase some timeouts in an effort to see (some) errors before close
 Patch51: kde-runtime-4.9.0-installdbgsymbols.patch
 
+# do not set Phonon KCM as changed at startup when using PulseAudio
+Patch52: kde-runtime-4.10.3-phononkcm.patch
+
 ## upstream patches
 
 
@@ -188,6 +191,7 @@ Requires: %{name} = %{version}-%{release}
 %endif
 %patch50 -p1 -b .nepomuk_onlyshowin_kde
 %patch51 -p1 -b .installdgbsymbols
+%patch52 -p1 -b .phononkcm
 
 %if ! 0%{?webkit}
 %patch300 -p1 -b .webkit
@@ -404,6 +408,9 @@ fi
 
 
 %changelog
+* Sat May 18 2013 Jan Grulich <jgrulich at redhat.com> - 4.10.3-3
+- fix: phonon systemsettings module gets 'modified' without any changes
+
 * Mon May 13 2013 Than Ngo <than at redhat.com> - 4.10.3-2
 - add mssing buildroot