commit kdeconnect-kde for openSUSE:Factory

Hello community, here is the log from the commit of package kdeconnect-kde for openSUSE:Factory checked in at 2019-04-02 09:23:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeconnect-kde (Old) and /work/SRC/openSUSE:Factory/.kdeconnect-kde.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdeconnect-kde" Tue Apr 2 09:23:45 2019 rev:14 rq:690439 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/kdeconnect-kde/kdeconnect-kde.changes 2018-11-15 12:42:03.330140359 +0100 +++ /work/SRC/openSUSE:Factory/.kdeconnect-kde.new.25356/kdeconnect-kde.changes 2019-04-02 09:23:45.696768533 +0200 @@ -1,0 +2,17 @@ +Mon Mar 25 15:00:43 UTC 2019 - wbauer@tmo.at + +- Update to 1.3.4 + * Always play when call ended (kde#400787) + * [cli] Show all reachable devices (kde#402088) + * [sftp] Get device ID from URL + * Retry the network packet if it failed to unserialize + * Fix sending keys via CLI + * [kio] Fix file browsing with non-KIO file managers +- Run spec-cleaner +- Refresh 0001-Fix-build-on-Leap-42.3.patch +- Add 0001-Revert-Retry-the-network-packet-if-it-failed-to-unse.patch + to make it build on Leap 42.3 +- Drop Provides/Obsoletes for kdeconnect-kde-devel, that package + doesn't exist anymore since 2015 and nothing should need it + +------------------------------------------------------------------- Old: ---- kdeconnect-kde-1.3.3.tar.xz kdeconnect-kde-1.3.3.tar.xz.sig New: ---- 0001-Revert-Retry-the-network-packet-if-it-failed-to-unse.patch kdeconnect-kde-1.3.4.tar.xz kdeconnect-kde-1.3.4.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeconnect-kde.spec ++++++ --- /var/tmp/diff_new_pack.XFJ4Oe/_old 2019-04-02 09:23:46.416769015 +0200 +++ /var/tmp/diff_new_pack.XFJ4Oe/_new 2019-04-02 09:23:46.416769015 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdeconnect-kde # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,26 +12,29 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: kdeconnect-kde -Version: 1.3.3 +Version: 1.3.4 Release: 0 Summary: Integrate Android with Linux desktops -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Other -Url: https://community.kde.org/KDEConnect -Source: https://download.kde.org/stable/kdeconnect/%{version}/src/%{name}-%{version}.tar.xz -Source1: https://download.kde.org/stable/kdeconnect/%{version}/src/%{name}-%{version}.tar.xz.sig +URL: https://community.kde.org/KDEConnect +Source: https://download.kde.org/stable/kdeconnect/%{version}/%{name}-%{version}.tar.xz +Source1: https://download.kde.org/stable/kdeconnect/%{version}/%{name}-%{version}.tar.xz.sig Source100: kdeconnect-kde.SuSEfirewall Source101: kdeconnect-kde-firewalld.xml # PATCH-FIX-OPENSUSE -Patch: 0001-Fix-build-on-Leap-42.3.patch +Patch0: 0001-Fix-build-on-Leap-42.3.patch +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-Retry-the-network-packet-if-it-failed-to-unse.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5DBusAddons) @@ -50,12 +53,9 @@ BuildRequires: pkgconfig(libfakekey) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xtst) -Provides: %{name}-devel = %{version} -Obsoletes: %{name}-devel < %{version} -Conflicts: kdeconnect-kde4 -Recommends: %{name}-lang = %{version} Requires: sshfs -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: %{name}-lang = %{version} +Conflicts: kdeconnect-kde4 %description Integrate Android with Linux desktops. @@ -71,11 +71,13 @@ https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp or https://f-droid.org/en/packages/org.kde.kdeconnect_tp/ -%{lang_package} +%lang_package + %prep -%setup -q -n %{name}-%{version} +%setup -q %if 0%{?suse_version} < 1500 -%patch -p1 +%patch0 -p1 +%patch1 -p1 %endif %build @@ -86,13 +88,13 @@ %kf5_makeinstall -C build for translation_file in kdeconnect-{cli,core,kcm,kded,kio,plugins,urlhandler} plasma_applet_org.kde.kdeconnect; do - %{find_lang} $translation_file %{name}.lang + %find_lang $translation_file %{name}.lang done # susefirewall config file -install -D -m 0644 %{S:100} \ +install -D -m 0644 %{SOURCE100} \ %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} -install -D -m 0644 %{S:101} \ +install -D -m 0644 %{SOURCE101} \ %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml %suse_update_desktop_file %{buildroot}%{_kf5_applicationsdir}/org.kde.kdeconnect.nonplasma.desktop Network RemoteAccess @@ -101,7 +103,6 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root) %license COPYING %doc README* %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} @@ -133,6 +134,5 @@ %{_kf5_appstreamdir}/org.kde.kdeconnect.kcm.appdata.xml %files lang -f %{name}.lang -%defattr(-,root,root) %changelog ++++++ 0001-Fix-build-on-Leap-42.3.patch ++++++ --- /var/tmp/diff_new_pack.XFJ4Oe/_old 2019-04-02 09:23:46.436769029 +0200 +++ /var/tmp/diff_new_pack.XFJ4Oe/_new 2019-04-02 09:23:46.436769029 +0200 @@ -28,7 +28,7 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ set(KDECONNECT_VERSION_MINOR 3) - set(KDECONNECT_VERSION_PATCH 3) + set(KDECONNECT_VERSION_PATCH 4) set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}") -set(QT_MIN_VERSION "5.7.0") ++++++ 0001-Revert-Retry-the-network-packet-if-it-failed-to-unse.patch ++++++

From 902474c5d99403194ca613fb853483e81356c658 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Mon, 25 Mar 2019 21:34:00 +0100 Subject: [PATCH] Revert "Retry the network packet if it failed to unserialize"

It requires at least Qt 5.7.0, but Leap 42.3 only has 5.6.2. This reverts commit a2c6f0a8064f4426129018daa15cb82c6d33b69c. --- core/backends/lan/lanlinkprovider.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp index 77a50d3d..a6dda376 100644 --- a/core/backends/lan/lanlinkprovider.cpp +++ b/core/backends/lan/lanlinkprovider.cpp @@ -350,7 +350,6 @@ void LanLinkProvider::newConnection() void LanLinkProvider::dataReceived() { QSslSocket* socket = qobject_cast(sender()); - socket->startTransaction(); const QByteArray data = socket->readLine(); @@ -361,10 +360,8 @@ void LanLinkProvider::dataReceived() if (!success) { delete np; - socket->rollbackTransaction(); return; } - socket->commitTransaction(); if (np->type() != PACKET_TYPE_IDENTITY) { qCWarning(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Expected identity, received " << np->type(); -- 2.16.4 ++++++ kdeconnect-kde-1.3.3.tar.xz -> kdeconnect-kde-1.3.4.tar.xz ++++++ ++++ 23695 lines of diff (skipped)