rpm/kdeconnect-kde
SHA256
1
0
Fork 0
forked from pool/kdeconnect-kde
Code Pull Requests Activity

Accepting request 425341 from KDE:Extra

Browse Source 
- Add fix-build-with-older-qt.patch from upstream to make it
  compile with Qt < 5.6, and lower the Qt requirement to 5.2 again
  (as demanded by CMakeLists.txt)

- Add firewalld service file

- Build docs again
- Require at least Qt 5.6

- New upstream version 1.0
  * Trigger custom commands from phone
  * Reply to SMS messages from the desktop
  * Receive desktop notifications on phone
  * TLS encryption

OBS-URL: https://build.opensuse.org/request/show/425341
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeconnect-kde?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger
2016-09-12 11:25:37 +00:00
committed by Git OBS Bridge
parent e756352b2e
commit ac91308257
6 changed files with 84 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
fix-build-with-older-qt.patch Normal file
View File

@@ -0,0 +1,33 @@
From: Albert Vaca <albertvaka@gmail.com>
Date: Sun, 28 Aug 2016 09:19:00 +0000
Subject: Make it compile with Qt < 5.6
X-Git-Url: http://quickgit.kde.org/?p=kdeconnect-kde.git&a=commitdiff&h=6281b9c232058759b21bf8e60c2f374fb5d42739
---
Make it compile with Qt < 5.6
---
--- a/core/pluginloader.cpp
+++ b/core/pluginloader.cpp
@@ -109,8 +109,18 @@
const QSet<QString> pluginIncomingCapabilities = KPluginMetaData::readStringList(service.rawData(), "X-KdeConnect-SupportedPackageType").toSet();
const QSet<QString> pluginOutgoingCapabilities = KPluginMetaData::readStringList(service.rawData(), "X-KdeConnect-OutgoingPackageType").toSet();
- if ((pluginIncomingCapabilities.isEmpty() && pluginOutgoingCapabilities.isEmpty())
- || incoming.intersects(pluginOutgoingCapabilities) || outgoing.intersects(pluginIncomingCapabilities)) {
+ bool capabilitiesEmpty = (pluginIncomingCapabilities.isEmpty() && pluginOutgoingCapabilities.isEmpty());
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+ bool capabilitiesIntersect = (outgoing.intersects(pluginIncomingCapabilities) || incoming.intersects(pluginOutgoingCapabilities));
+#else
+ QSet<QString> commonIncoming = incoming;
+ commonIncoming.intersect(pluginOutgoingCapabilities);
+ QSet<QString> commonOutgoing = outgoing;
+ commonOutgoing.intersect(pluginIncomingCapabilities);
+ bool capabilitiesIntersect = (!commonIncoming.isEmpty() || !commonOutgoing.isEmpty());
+#endif
+
+ if (capabilitiesIntersect || capabilitiesEmpty) {
ret += service.pluginId();
} else {
qCDebug(KDECONNECT_CORE) << "Not loading plugin" << service.pluginId() << "because device doesn't support it";