pool/kdeconnect-kde
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 429356 from KDE:Extra

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/429356
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeconnect-kde?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2016-09-23 09:40:00 +00:00 committed by Git OBS Bridge
parent ac91308257
commit 07b5458b67
5 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,33 +0,0 @@
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";

3
kdeconnect-kde-1.0.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:553bcc338b62e00fc9f98152e6dfe21d95f5e7eb6109a4e5b5900274a7b4e102
size 218652

3
kdeconnect-kde-1.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:207faf0bb8174d15cc0b04ef5eeacb86db21dd941a645dbf3f6c2ac301c7a85d
size 217672

7
kdeconnect-kde.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 21 17:42:05 UTC 2016 - wbauer@tmo.at
- Update to 1.0.1
* fixes some issues found in 1.0
- Drop upstreamed fix-build-with-older-qt.patch
-------------------------------------------------------------------
Wed Sep 7 10:19:34 UTC 2016 - wbauer@tmo.at

7
kdeconnect-kde.spec
View File

@ -17,7 +17,7 @@
Name: kdeconnect-kde
Version: 1.0
Version: 1.0.1
Release: 0
Summary: KDE Android integration
License: GPL-2.0+
@ -26,8 +26,6 @@ Url: https://projects.kde.org/projects/playground/base/kdeconnect-kde
Source: http://download.kde.org/stable/kdeconnect/%{version}/src/%{name}-%{version}.tar.xz
Source100: kdeconnect-kde.SuSEfirewall
Source101: kdeconnect-kde-firewalld.xml
# PATCH-FIX-UPSTREAM fix-build-with-older-qt.patch -- Make it compile with Qt < 5.6
Patch: fix-build-with-older-qt.patch
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= 0.0.9
BuildRequires: kf5-filesystem
@ -72,7 +70,6 @@ https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp
%{lang_package}
%prep
%setup -q
%patch -p1
%build
%cmake_kf5 -d build
@ -120,6 +117,8 @@ install -D -m 0644 %{S:101} \
%{_kf5_configdir}/autostart/kdeconnectd.desktop
%{_kf5_iconsdir}/hicolor/*/status/*
%{_kf5_htmldir}/en/kdeconnect-kde/
%dir %{_kf5_appstreamdir}
%{_kf5_appstreamdir}/org.kde.kdeconnect.kcm.appdata.xml
%files lang -f %{name}.lang
%defattr(-,root,root)