[SCM] solid packaging branch, master, updated. debian/5.28.0-4-12-g2ded2c3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/solid.git;a=commitdiff;h=a188028

The following commit has been merged in the master branch:
commit a188028f0d9a55bc59b4c863717fbaa5f85cc575
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jun 29 14:22:17 2017 +0200

    Drop upstream patches
---
 ...-2-Device-Add-description-for-Floppy-Disk.patch | 26 ---------
 .../Work-round-DBus-property-fetching-bug.patch    | 68 ----------------------
 debian/patches/series                              |  2 -
 3 files changed, 96 deletions(-)

diff --git a/debian/patches/UDisks-2-Device-Add-description-for-Floppy-Disk.patch b/debian/patches/UDisks-2-Device-Add-description-for-Floppy-Disk.patch
deleted file mode 100644
index 2f25387..0000000
--- a/debian/patches/UDisks-2-Device-Add-description-for-Floppy-Disk.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Kai Uwe Broulik <kde at privat.broulik.de>
-Date: Sat, 11 Feb 2017 17:06:15 +0100
-Subject: [UDisks 2 Device] Add description for Floppy Disk
-
-Ensures a floppy disk shows up as "Floppy Disk" instead of "0 Byte Removable Media"
-
-CHANGELOG: Floppy disks now show up as "Floppy Disk" instead of "0 B Removable Media"
-
-Differential Revision: https://phabricator.kde.org/D4570
----
- src/solid/devices/backends/udisks2/udisksdevice.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/solid/devices/backends/udisks2/udisksdevice.cpp b/src/solid/devices/backends/udisks2/udisksdevice.cpp
-index 5208ece..b0a6b51 100644
---- a/src/solid/devices/backends/udisks2/udisksdevice.cpp
-+++ b/src/solid/devices/backends/udisks2/udisksdevice.cpp
-@@ -573,6 +573,8 @@ QString Device::volumeDescription() const
-                 description = tr("Hard Drive");
-             }
-         }
-+    } else if (drive_type == Solid::StorageDrive::Floppy) {
-+        description = tr("Floppy Disk");
-     } else {
-         if (drive_is_removable) {
-             description = tr("%1 Removable Media", "%1 is the size").arg(size_str);
diff --git a/debian/patches/Work-round-DBus-property-fetching-bug.patch b/debian/patches/Work-round-DBus-property-fetching-bug.patch
deleted file mode 100644
index 2194f6f..0000000
--- a/debian/patches/Work-round-DBus-property-fetching-bug.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: David Edmundson <kde at davidedmundson.co.uk>
-Date: Fri, 27 Jan 2017 09:11:17 +0000
-Subject: Work round DBus property fetching bug
-
-Summary:
-property() works in a slightly different way to just calling Get().
-It allocates the variant of the relevant type in advance in QObject
-code, and then calls
-the DBus code to populate it.
-
-This fails for QByteArrayList, before it reaches DBus code.
-I don't know why, but we need a wokraround in Solid anyway.
-
->From a DBus traffic perspective this code is identical, we just avoid
-going through Qt properties.
-
-This shouldn't introduce any new bugs, as we already use GetAll
-directly, if anything this brings it more
-in line.
-
-BUG: 345871
-
-Test Plan:
-Commented out the checkCache so that it always loads data.
-Instead of failing, it now works.
-
-Subscribers: #frameworks
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D4305
----
- .../backends/udisks2/udisksdevicebackend.cpp       | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp b/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp
-index c49001f..eaaa307 100644
---- a/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp
-+++ b/src/solid/devices/backends/udisks2/udisksdevicebackend.cpp
-@@ -182,15 +182,19 @@ void DeviceBackend::checkCache(const QString &key) const
-         return;
-     }
- 
--    QVariant reply = m_device->property(key.toUtf8());
--    m_propertyCache.insert(key, reply);
--
--    if (!reply.isValid()) {
--        /* Store the item in the cache anyway so next time we don't have to
--         * do the DBus call to find out it does not exist but just check whether
--         * prop(key).isValid() */
--//         qDebug() << m_udi << ": property" << key << "does not exist";
--    }
-+    QDBusMessage call = QDBusMessage::createMethodCall(UD2_DBUS_SERVICE, m_udi, DBUS_INTERFACE_PROPS, "Get");
-+    /*
-+     * Interface is set to an empty string as in this QDBusInterface is a meta-object of multiple interfaces on the same path
-+     * The DBus properties also interface supports this, and will find the appropriate interface if none is explicitly set.
-+     * This matches what QDBusAbstractInterface would do
-+     */
-+    call.setArguments(QVariantList() << QString() << key);
-+    QDBusPendingReply<QVariant> reply = QDBusConnection::systemBus().call(call);
-+
-+    /* We don't check for error here and store the item in the cache anyway so next time we don't have to
-+     * do the DBus call to find out it does not exist but just check whether
-+     * prop(key).isValid() */
-+    m_propertyCache.insert(key, reply.value());
- }
- 
- void DeviceBackend::slotPropertiesChanged(const QString &ifaceName, const QVariantMap &changedProps, const QStringList &invalidatedProps)
diff --git a/debian/patches/series b/debian/patches/series
index bc9e955..28007b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 use_shortest_filepath.diff
 fix-FTBFS-on-mipsel-and-m68k-src-solid-predicate_parser.c.patch
-Work-round-DBus-property-fetching-bug.patch
-UDisks-2-Device-Add-description-for-Floppy-Disk.patch
 cmake-build-udisks2-backend-on-FreeBSD-only-when-ena.patch

-- 
solid packaging