From f6a44607409e97a5c2e30f7c1fe64e0a66c340eb76e1d7ebf49fbbeb56dee895 Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Wed, 11 Apr 2018 12:01:18 +0000 Subject: [PATCH] Accepting request 595150 from KDE:Extra OBS-URL: https://build.opensuse.org/request/show/595150 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeconnect-kde?expand=0&rev=9 --- 0001-Fix-null-dereference.patch | 31 ------------------------------- kdeconnect-kde-1.3.0.tar.xz | 3 +++ kdeconnect-kde-1.3.0.tar.xz.sig | 11 +++++++++++ kdeconnect-kde-v1.2.1.tar.xz | 3 --- kdeconnect-kde-v1.2.1.tar.xz.sig | 11 ----------- kdeconnect-kde.changes | 16 ++++++++++++++++ kdeconnect-kde.spec | 26 +++++++++++++------------- 7 files changed, 43 insertions(+), 58 deletions(-) delete mode 100644 0001-Fix-null-dereference.patch create mode 100644 kdeconnect-kde-1.3.0.tar.xz create mode 100644 kdeconnect-kde-1.3.0.tar.xz.sig delete mode 100644 kdeconnect-kde-v1.2.1.tar.xz delete mode 100644 kdeconnect-kde-v1.2.1.tar.xz.sig diff --git a/0001-Fix-null-dereference.patch b/0001-Fix-null-dereference.patch deleted file mode 100644 index a50e176..0000000 --- a/0001-Fix-null-dereference.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6495e8dc538610fb679df0f1522243103a3a1789 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Tue, 30 Jan 2018 17:43:58 +0100 -Subject: On my system the notification is null - -It may be a bug, but we better not crash anyway ---- - plugins/notifications/notificationsdbusinterface.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/plugins/notifications/notificationsdbusinterface.cpp b/plugins/notifications/notificationsdbusinterface.cpp -index 47e54a3..c0505c6 100644 ---- a/plugins/notifications/notificationsdbusinterface.cpp -+++ b/plugins/notifications/notificationsdbusinterface.cpp -@@ -91,8 +91,11 @@ void NotificationsDbusInterface::processPackage(const NetworkPackage& np) - }); - } - } else { -- QString pubId = m_internalIdToPublicId[id]; -- Notification* noti = m_notifications[pubId]; -+ QString pubId = m_internalIdToPublicId.value(id); -+ Notification* noti = m_notifications.value(pubId); -+ if (!noti) -+ return; -+ - noti->update(np); - - if (noti->isReady()) { --- -cgit v0.11.2 - diff --git a/kdeconnect-kde-1.3.0.tar.xz b/kdeconnect-kde-1.3.0.tar.xz new file mode 100644 index 0000000..9bef1a8 --- /dev/null +++ b/kdeconnect-kde-1.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:954d4e9f7de06a7409d9e3e124c959481a1c2c20148576dc3d431a3d6129fb3f +size 281972 diff --git a/kdeconnect-kde-1.3.0.tar.xz.sig b/kdeconnect-kde-1.3.0.tar.xz.sig new file mode 100644 index 0000000..3c03c15 --- /dev/null +++ b/kdeconnect-kde-1.3.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEs0h8oP82JY4qLzOL0z5yHfh37+gFAlrKKNQACgkQ0z5yHfh3 +7+iBNgf/VCjPAhGZuSq7ZjGTvj52z1FzA+PAp7lE//QPvnXUZMOVQ/3/0Vz7QY6T +Q6B8CDtSwQfrYCYYN9/yoh3D08Eoy0Paucxd42Hn+B/HpkwmlbD7djcMzmxkqYgc +/6izJW8LPT3TojK8xKid50+lU7tklJxuy9M6ZpT5w21oIp+90HPCHG1i8eGoR190 +Z5pt1jOZJEtzA0MMNcxi8c4iPOhshCqZif0En2ZeYGlxXFxGfFPLniwf6i4nyCP2 +znwZhYstyjiOq3uJ59luMneNnA8RV72bsDHalw7yGN5iG8cjRjM4bqbV2nSFw1Ld +beaz5EmMzA3rxtDM1T5jHu4PTmpuWA== +=QEoq +-----END PGP SIGNATURE----- diff --git a/kdeconnect-kde-v1.2.1.tar.xz b/kdeconnect-kde-v1.2.1.tar.xz deleted file mode 100644 index 06b4d13..0000000 --- a/kdeconnect-kde-v1.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef23eb8de8676f426298b244db426ad22e5212f26b3b435fd29a539fae186407 -size 278612 diff --git a/kdeconnect-kde-v1.2.1.tar.xz.sig b/kdeconnect-kde-v1.2.1.tar.xz.sig deleted file mode 100644 index a91e839..0000000 --- a/kdeconnect-kde-v1.2.1.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEs0h8oP82JY4qLzOL0z5yHfh37+gFAlpegOAACgkQ0z5yHfh3 -7+hJMgf8CmkcGne6Ynr56vaxzqNkmRgMvTolukBeLZ+ogn7tp8tp5xcys+OT3dLt -SMMMdt6mPNL0GXY/4z5T40um6b0RFRZxUhw/Yezb2dsjG8z3djFRMEVWLqMdJn/c -kICE0oLOdWhc2Cpbhwcld9RGbsBQCv+aZMU7wz71+IQZr2YUUqE2noixTTcMy4XJ -fc6AbdbqHH1ZTH/y4Iw3LIFl3usMVQQs7MmGsLUjmurRBiT04COsDuvir84WbR50 -95LUv6EEhx88GU6n1DIBo2M60DPVC1WtXOr4/kVAdPz40DZ+wbOOU5ITaI9bCBce -2s/+gZEHAY5VDyJbUDMfBmcTEs265w== -=+3dV ------END PGP SIGNATURE----- diff --git a/kdeconnect-kde.changes b/kdeconnect-kde.changes index e81688c..6c498a9 100644 --- a/kdeconnect-kde.changes +++ b/kdeconnect-kde.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Apr 9 12:40:29 UTC 2018 - kamikazow@opensuse.org + +- Update to 1.3.0 + * Fixed frequent crash when receiving notifications + * Fixed MPRIS player entries never being deleted + * Added a Gnome Files (Nautilus) extension to send files from the + context menu + * Added handling of "tel:" links with KDE Connect + * Support sending album art in MPRIS plugin + * Allow sharing more than one file from the CI (eg: --share *.mp3) +- Remove patches, now upstream: + * 0001-Fix-null-dereference.patch +- Modified wording in Description to match that KDE Connect + runs under any Linux desktop (see upstream README.md file) + ------------------------------------------------------------------- Tue Feb 20 15:47:11 UTC 2018 - alarrosa@suse.com diff --git a/kdeconnect-kde.spec b/kdeconnect-kde.spec index fe38381..89db77c 100644 --- a/kdeconnect-kde.spec +++ b/kdeconnect-kde.spec @@ -17,18 +17,16 @@ Name: kdeconnect-kde -Version: 1.2.1 +Version: 1.3.0 Release: 0 -Summary: KDE Android integration +Summary: Integrate Android with Linux desktops License: GPL-2.0+ Group: Productivity/Networking/Other -Url: https://projects.kde.org/projects/playground/base/kdeconnect-kde -Source: http://download.kde.org/stable/kdeconnect/%{version}/src/%{name}-v%{version}.tar.xz -Source1: https://download.kde.org/stable/kdeconnect/%{version}/src/%{name}-v%{version}.tar.xz.sig +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 Source100: kdeconnect-kde.SuSEfirewall Source101: kdeconnect-kde-firewalld.xml -# PATCH-FIX-UPSTREAM 0001-Fix-null-dereference.patch -Patch0: 0001-Fix-null-dereference.patch BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.9 BuildRequires: kf5-filesystem @@ -58,22 +56,22 @@ Requires: sshfs BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Integrate Android with the KDE Desktop. +Integrate Android with Linux desktops. Current feature list: - Clipboard share: copy from or to your desktop -- Notifications sync (4.3+): Read your Android notifications from KDE +- Notifications sync (4.3+): Read your Android notifications - Multimedia remote control: Use your phone as a remote control -- WiFi connection: no usb wire or bluetooth needed +- WiFi connection: no USB wire or Bluetooth needed - RSA Encryption: your information is safe 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 +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} %prep -%setup -q -n %{name}-v%{version} -%patch0 -p1 +%setup -q -n %{name}-%{version} %build %cmake_kf5 -d build @@ -101,8 +99,10 @@ install -D -m 0644 %{S:101} \ %defattr(-,root,root) %doc COPYING README* %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +%dir %{_datadir}/nautilus-python %dir %{_libexecdir}/firewalld %dir %{_libexecdir}/firewalld/services +%{_datadir}/nautilus-python/extensions/ %{_libexecdir}/firewalld/services/%{name}.xml %{_kf5_libdir}/libkdeconnect*.so.* %{_kf5_plugindir}/