Hello community, here is the log from the commit of package kaffeine for openSUSE:Factory checked in at 2012-02-29 14:08:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kaffeine (Old) and /work/SRC/openSUSE:Factory/.kaffeine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kaffeine", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kaffeine/kaffeine.changes 2011-11-07 14:18:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kaffeine.new/kaffeine.changes 2012-02-29 14:08:04.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 11:27:56 CET 2012 - jslaby@suse.de + +- fix crash on resume + +------------------------------------------------------------------- New: ---- crash-on-resume-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kaffeine.spec ++++++ --- /var/tmp/diff_new_pack.HcMN1O/_old 2012-02-29 14:08:06.000000000 +0100 +++ /var/tmp/diff_new_pack.HcMN1O/_new 2012-02-29 14:08:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kaffeine # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: kaffeine Version: 1.2.2 -Release: 1 +Release: 0 Summary: Xine-Based Multimedia Player - License: GPL-2.0+ -Url: http://kaffeine.kde.org/ Group: Productivity/Multimedia/Video/Players + +Url: http://kaffeine.kde.org/ # http://sourceforge.net/projects/kaffeine/files/current/kaffeine-1.2.2.tar.gz Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-icons.tar.bz2 @@ -39,6 +37,8 @@ Patch4: build-fix.diff # PATCH-FIX-OPENSUSE support_mimetypes_bnc671581.diff bnc#671581 ctrippe@gmx.net -- Support audio/webm and video/x-theora+ogg Patch5: support_mimetypes_bnc671581.diff +# PATCH-FIX-UPSTREAM +Patch6: crash-on-resume-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libkde4-devel @@ -70,6 +70,7 @@ %if 0%{?suse_version} > 1130 %patch5 %endif +%patch6 -p1 %build %cmake_kde4 -d build ++++++ crash-on-resume-fix.patch ++++++ --- src/dvb/dvbmanager.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) --- a/src/dvb/dvbmanager.cpp +++ b/src/dvb/dvbmanager.cpp @@ -448,15 +448,17 @@ void DvbManager::deviceAdded(DvbBackendD void DvbManager::deviceRemoved(DvbBackendDevice *backendDevice) { for (int i = 0; i < deviceConfigs.size(); ++i) { - if (deviceConfigs.at(i).device->getBackendDevice() == backendDevice) { - if (deviceConfigs[i].useCount != 0) { - deviceConfigs[i].useCount = 0; - deviceConfigs[i].prioritizedUseCount = 0; - deviceConfigs[i].device->release(); + DvbDeviceConfig &it = deviceConfigs[i]; + + if (it.device && it.device->getBackendDevice() == backendDevice) { + if (it.useCount != 0) { + it.useCount = 0; + it.prioritizedUseCount = 0; + it.device->release(); } - delete deviceConfigs[i].device; - deviceConfigs[i].device = NULL; + delete it.device; + it.device = NULL; break; } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org