[kdelibs/f18] kdelibs-udisks2_2_stage.patch (fix for some phones/mtp-device detection)

[Rex Dieter]

commit 80419ac53ac90e9a1b79f5ea49dae0481573b942
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Feb 1 10:43:45 2013 -0600

    kdelibs-udisks2_2_stage.patch (fix for some phones/mtp-device detection)

 kdelibs-udisks2_2_stage.patch |   14 ++++++++++++++
 kdelibs.spec                  |    9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/kdelibs-udisks2_2_stage.patch b/kdelibs-udisks2_2_stage.patch
new file mode 100644
index 0000000..d81f967
--- /dev/null
+++ b/kdelibs-udisks2_2_stage.patch
@@ -0,0 +1,14 @@
+diff -up kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2_2_stage kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp
+--- kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2_2_stage	2013-01-23 15:44:27.000000000 -0600
++++ kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp	2013-02-01 09:43:49.032367743 -0600
+@@ -203,6 +203,10 @@ void Manager::slotInterfacesAdded(const
+         m_deviceCache.append(udi);
+         Q_EMIT deviceAdded(udi);
+     }
++    // re-emit in case of 2-stage devices like N9 or some Android phones
++    else if (m_deviceCache.contains(udi) && interfaces_and_properties.keys().contains(UD2_DBUS_INTERFACE_FILESYSTEM)) {
++        Q_EMIT deviceAdded(udi);
++    }
+ }
+ 
+ void Manager::slotInterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces)
diff --git a/kdelibs.spec b/kdelibs.spec
index 5d7f167..945c41d 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -25,7 +25,7 @@
 
 Summary: KDE Libraries
 Version: 4.9.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -163,6 +163,9 @@ Patch58: kdelibs-cmake_python3.patch
 # make filter working
 Patch59: kdelibs-4.9.3-kcm_ssl.patch
 
+# solid/udisks2 fix/workaround for 2-stage devides
+Patch60: kdelibs-udisks2_2_stage.patch
+
 ## upstream
 # FindKdcraw.cmake fixes
 Patch100: kdelibs-FindKdcraw.patch
@@ -339,6 +342,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch56 -p1 -b .FindKipi-libkipi2
 %patch58 -p1 -b .cmake_python3
 %patch59 -p1 -b .filter
+%patch60 -p1 -b .udisks2_2_stage
 
 # upstream patches
 %patch100 -p1 -b .FindKdcraw
@@ -601,6 +605,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb 01 2013 Rex Dieter <rdieter at fedoraproject.org> 6:4.9.5-3
+- kdelibs-udisks2_2_stage.patch (fix for some phones/mtp-device detection)
+
 * Tue Jan 01 2013 Rex Dieter <rdieter at fedoraproject.org> 6:4.9.5-2
 - FindKdcraw.cmake fixes(kde#311936)