From bb04e0a72d1dc81fb581c2bf11fdcb08b4e2aa77 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Tue, 5 Feb 2013 09:57:06 -0600
Subject: [PATCH] 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 deletion(-)
 create mode 100644 kdelibs-udisks2_2_stage.patch

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 3e35ac6..95ba69f 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -23,7 +23,7 @@
 
 Summary: KDE Libraries
 Version: 4.10.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -141,6 +141,9 @@ Patch55: kdelibs-4.9.90-FindSamba_samba4.patch
 # make filter working, TODO: upstream?  -- rex
 Patch59: kdelibs-4.9.3-kcm_ssl.patch
 
+# solid/udisks2 fix/workaround for 2-stage devides
+Patch60: kdelibs-udisks2_2_stage.patch
+
 ## upstream
 
 ## security fix
@@ -309,6 +312,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch54 -p1 -b .kjs-locale
 %patch55 -p1 -b .FindSamba-samba4
 %patch59 -p1 -b .filter
+%patch60 -p1 -b .udisks2_2_stage
 
 # upstream patches
 
@@ -551,6 +555,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
+* Tue Feb 05 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.10.0-2
+- kdelibs-udisks2_2_stage.patch (fix for some phones/mtp-device detection)
+
 * Thu Jan 31 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.10.0-1
 - 4.10.0