From b2caf7e47a3ed50b41ac893a67bb0e790f5a262c8dc805e431ac3e43c78d9999 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 22 Feb 2018 14:02:34 +0000 Subject: [PATCH] Accepting request 578840 from KDE:Extra OBS-URL: https://build.opensuse.org/request/show/578840 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeconnect-kde?expand=0&rev=8 --- 0001-Fix-null-dereference.patch | 31 +++++++++++++++++++++++++++++++ kdeconnect-kde-v1.2.1.tar.xz.sig | 11 +++++++++++ kdeconnect-kde.changes | 7 +++++++ kdeconnect-kde.spec | 4 ++++ 4 files changed, 53 insertions(+) create mode 100644 0001-Fix-null-dereference.patch create mode 100644 kdeconnect-kde-v1.2.1.tar.xz.sig diff --git a/0001-Fix-null-dereference.patch b/0001-Fix-null-dereference.patch new file mode 100644 index 0000000..a50e176 --- /dev/null +++ b/0001-Fix-null-dereference.patch @@ -0,0 +1,31 @@ +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-v1.2.1.tar.xz.sig b/kdeconnect-kde-v1.2.1.tar.xz.sig new file mode 100644 index 0000000..a91e839 --- /dev/null +++ b/kdeconnect-kde-v1.2.1.tar.xz.sig @@ -0,0 +1,11 @@ +-----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 11b673c..e81688c 100644 --- a/kdeconnect-kde.changes +++ b/kdeconnect-kde.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 20 15:47:11 UTC 2018 - alarrosa@suse.com + +- Add 0001-Fix-null-dereference.patch to fix a null dereference. + +- Add signature file kdeconnect-kde-v1.2.1.tar.xz.sig + ------------------------------------------------------------------- Thu Jan 18 16:38:28 UTC 2018 - wbauer@tmo.at diff --git a/kdeconnect-kde.spec b/kdeconnect-kde.spec index 4a8051a..fe38381 100644 --- a/kdeconnect-kde.spec +++ b/kdeconnect-kde.spec @@ -24,8 +24,11 @@ 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 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 @@ -70,6 +73,7 @@ https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp %{lang_package} %prep %setup -q -n %{name}-v%{version} +%patch0 -p1 %build %cmake_kf5 -d build