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

Accepting request 690439 from KDE:Extra

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/690439
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeconnect-kde?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2019-04-02 07:23:45 +00:00 committed by Git OBS Bridge
parent 9b0d82c59b
commit 23045b7cc4
8 changed files with 91 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-Fix-build-on-Leap-42.3.patch
View File

@ -28,7 +28,7 @@ index 0c759d11..52d13d66 100644
--- 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")

38
0001-Revert-Retry-the-network-packet-if-it-failed-to-unse.patch Normal file
View File

@ -0,0 +1,38 @@
From 902474c5d99403194ca613fb853483e81356c658 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
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<QSslSocket*>(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

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

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f3f7709255757233bd6406acb0bff9c30e0e2a36737154ce63afb1a78054ced
size 284712

11
kdeconnect-kde-1.3.3.tar.xz.sig
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEs0h8oP82JY4qLzOL0z5yHfh37+gFAlvhmA4ACgkQ0z5yHfh3
7+iu1gf+PiDokHh71wFmKWz72uXzZKKPqwD+kcb3BXGPPpPubQXx76Wc2SZ0sDC3
KE7VvEBc+y3YLPHf4zRhtAS4XfflOQWu5eUjfx50hFprNjz6s70/MyyMSeptCP41
ix/YemCzTCjKOPtEG7fnH3zDswKFejTtnbdevr1FxC4lLZ/SshxKAyAn4IzNj0bi
gTLqorSJzYSRM2AT3AznlqM0kI0PPLA3nTXtwzBgwmxVBmubvhs1gAyxA1inYdyj
bdgooC7f6JlOrEGoA0FFOiQD/6AGtdlj4cW4HCIkiOUxWrrh7hxAo8AM1odtZwhS
nnwiSpqNtZKvNgUbnFwo3onlILHS0w==
=g03o
-----END PGP SIGNATURE-----

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:501057b752c3ec9791ca83f8fe592d8fd706d880fdfaf75a40d3546ed0dd328a
size 286724

11
kdeconnect-kde-1.3.4.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEE9TIj8zN2ZcLM6hIuhzrDRZu89cAFAlyYo0AACgkQhzrDRZu8
9cDd8Af+PHrF+2C42riNWU46izSKDyc18rAEQA6ZAWE9NGkkkieFJkTNguZKjs+L
Lebs4QhX7ltueITFIOlf1v8gqBZkk4lXGoppwjvCGdCmyR9mdHwkqKleOoZONkwm
3S6TCUA5/gJGAKRqhwZGPp+H8VXOcLPJeDLjcvsy0x0nonPr94oGSRmIPQtotrLJ
qKhm181szFs5MGC25Jm2+e7UoL6N85eOA6l3pFiAP32nQ1jUz99Ejq5RUoyNueEF
gLK+XBNSlT17y5mvFRC3LpvzgkzoEvUWnOE6qa7HDBCwf4ED0j6eFoWYB9zHPCYY
2Ue9cSM80YTa50arDrjMj/ShIoIE+w==
=3Wmd
-----END PGP SIGNATURE-----

17
kdeconnect-kde.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Nov 14 22:10:19 UTC 2018 - wbauer@tmo.at

42
kdeconnect-kde.spec
View File

@ -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(dbus-1)
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 @@ Please note you will need to install KDE Connect on Android for this app to work
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 @@ https://f-droid.org/en/packages/org.kde.kdeconnect_tp/
%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 @@ install -D -m 0644 %{S:101} \
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%license COPYING
%doc README*
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
@ -133,6 +134,5 @@ install -D -m 0644 %{S:101} \
%{_kf5_appstreamdir}/org.kde.kdeconnect.kcm.appdata.xml
%files lang -f %{name}.lang
%defattr(-,root,root)
%changelog