Hello community, here is the log from the commit of package bluedevil for openSUSE:Factory checked in at 2015-02-12 10:21:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluedevil (Old) and /work/SRC/openSUSE:Factory/.bluedevil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluedevil" Changes: -------- --- /work/SRC/openSUSE:Factory/bluedevil/bluedevil.changes 2014-12-29 00:33:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bluedevil.new/bluedevil.changes 2015-02-12 10:21:33.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Feb 7 13:21:42 UTC 2015 - hrvoje.sen...@gmail.com + +- Add 0001-daemon-Don-t-try-to-infinitely-kill-monolithic-when-.patch, + kde#343682 + +------------------------------------------------------------------- New: ---- 0001-daemon-Don-t-try-to-infinitely-kill-monolithic-when-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluedevil.spec ++++++ --- /var/tmp/diff_new_pack.TzBuKj/_old 2015-02-12 10:21:34.000000000 +0100 +++ /var/tmp/diff_new_pack.TzBuKj/_new 2015-02-12 10:21:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bluedevil # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Raymond Wooninck <tittiatc...@gmail.com> # # All modifications and additions to the file contributed by third parties @@ -29,6 +29,8 @@ Source: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz Source1: preferences-system-bluetooth.png Patch0: typo2.diff +# PATCH-FIX-UPSTREAM 0001-daemon-Don-t-try-to-infinitely-kill-monolithic-when-.patch +Patch1: 0001-daemon-Don-t-try-to-infinitely-kill-monolithic-when-.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libbluedevil-devel >= %{version} @@ -57,6 +59,7 @@ %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 %build %cmake_kde4 -d build ++++++ 0001-daemon-Don-t-try-to-infinitely-kill-monolithic-when-.patch ++++++ >From 9d732a65008b54b10ea57eb33ae3648cab1fb41d Mon Sep 17 00:00:00 2001 From: David Rosca <now...@gmail.com> Date: Sat, 7 Feb 2015 14:11:53 +0100 Subject: [PATCH 1/1] daemon: Don't try to infinitely kill monolithic when it fails Killing monolithic may fail for various reasons (eg. it may not be running in the first place). Don't try to kill it again when it fails. BUG: 343682 --- src/daemon/kded/BlueDevilDaemon.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/daemon/kded/BlueDevilDaemon.cpp b/src/daemon/kded/BlueDevilDaemon.cpp index 12efc73004b7f0d4ec3d2e974567f3c12307b1cb..1a4c2504cfaf186a06c7acbcf639d05f2186b675 100644 --- a/src/daemon/kded/BlueDevilDaemon.cpp +++ b/src/daemon/kded/BlueDevilDaemon.cpp @@ -375,7 +375,6 @@ void BlueDevilDaemon::monolithicQuit(QDBusPendingCallWatcher* watcher) QDBusPendingReply<void> reply = *watcher; if (reply.isError()) { qDebug() << "Error response: " << reply.error().message(); - killMonolithic(); } } -- 2.2.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
