Hello community, here is the log from the commit of package kdeconnect-kde for openSUSE:Factory checked in at 2016-09-12 13:25:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeconnect-kde (Old) and /work/SRC/openSUSE:Factory/.kdeconnect-kde.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdeconnect-kde" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeconnect-kde/kdeconnect-kde.changes 2016-03-12 12:31:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdeconnect-kde.new/kdeconnect-kde.changes 2016-09-12 13:25:38.000000000 +0200 @@ -1,0 +2,27 @@ +Wed Sep 7 10:19:34 UTC 2016 - [email protected] + +- 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) + +------------------------------------------------------------------- +Fri Aug 26 22:28:10 UTC 2016 - [email protected] + +- Add firewalld service file + +------------------------------------------------------------------- +Fri Aug 26 19:26:49 UTC 2016 - [email protected] + +- Build docs again +- Require at least Qt 5.6 + +------------------------------------------------------------------- +Fri Aug 26 19:14:41 UTC 2016 - [email protected] + +- New upstream version 1.0 + * Trigger custom commands from phone + * Reply to SMS messages from the desktop + * Receive desktop notifications on phone + * TLS encryption + +------------------------------------------------------------------- Old: ---- kdeconnect-kde-0.9g.tar.xz New: ---- fix-build-with-older-qt.patch kdeconnect-kde-1.0.tar.xz kdeconnect-kde-firewalld.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeconnect-kde.spec ++++++ --- /var/tmp/diff_new_pack.84dEGX/_old 2016-09-12 13:25:39.000000000 +0200 +++ /var/tmp/diff_new_pack.84dEGX/_new 2016-09-12 13:25:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdeconnect-kde # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,17 @@ Name: kdeconnect-kde -Version: 0.9g -# dirver only needed for this "fixed" version, shouldn't be needed in next release -%define dirver 0.9 +Version: 1.0 Release: 0 Summary: KDE Android integration License: GPL-2.0+ Group: Productivity/Networking/Other Url: https://projects.kde.org/projects/playground/base/kdeconnect-kde -Source: http://download.kde.org/unstable/kdeconnect/%{dirver}/src/%{name}-%{version}.tar.xz +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 @@ -34,6 +35,7 @@ BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5Declarative) +BuildRequires: cmake(KF5DocTools) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5KCMUtils) @@ -70,6 +72,7 @@ %{lang_package} %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build @@ -85,6 +88,8 @@ # susefirewall config file install -D -m 0644 %{S:100} \ %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +install -D -m 0644 %{S:101} \ + %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml %suse_update_desktop_file %{buildroot}%{_kf5_applicationsdir}/org.kde.kdeconnect.nonplasma.desktop Network RemoteAccess @@ -95,6 +100,9 @@ %defattr(-,root,root) %doc COPYING README* %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +%dir %{_libexecdir}/firewalld +%dir %{_libexecdir}/firewalld/services +%{_libexecdir}/firewalld/services/%{name}.xml %{_kf5_libdir}/libkdeconnect*.so.* %{_kf5_plugindir}/ %{_kf5_applicationsdir}/*.desktop @@ -111,7 +119,7 @@ %{_kf5_sharedir}/dbus-1/services/org.kde.kdeconnect.service %{_kf5_configdir}/autostart/kdeconnectd.desktop %{_kf5_iconsdir}/hicolor/*/status/* -# %{_kf5_htmldir}/en/kdeconnect/ +%{_kf5_htmldir}/en/kdeconnect-kde/ %files lang -f %{name}.lang %defattr(-,root,root) ++++++ fix-build-with-older-qt.patch ++++++ From: Albert Vaca <[email protected]> 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"; ++++++ kdeconnect-kde-0.9g.tar.xz -> kdeconnect-kde-1.0.tar.xz ++++++ ++++ 34748 lines of diff (skipped)
