rpms/kdebase-runtime/devel kdebase-runtime-4.1.0-nepomuk.patch, NONE, 1.1 kdebase-runtime.spec, 1.62, 1.63
Than Ngo (than)
fedora-extras-commits at redhat.com
Tue Aug 12 14:06:57 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30362
Modified Files:
kdebase-runtime.spec
Added Files:
kdebase-runtime-4.1.0-nepomuk.patch
Log Message:
crash fix when stopping a service that is not yet initialized
kdebase-runtime-4.1.0-nepomuk.patch:
--- NEW FILE kdebase-runtime-4.1.0-nepomuk.patch ---
--- kdebase-runtime-4.1.0/nepomuk/server/servicecontroller.cpp (Revision 845704)
+++ kdebase-runtime-4.1.0/runtime/nepomuk/server/servicecontroller.cpp (Revision 845705)
@@ -202,6 +202,12 @@
if( d->processControl ) {
d->processControl->stop();
}
+
+ // make sure all loops waiting for the service to initialize
+ // are terminated.
+ foreach( QEventLoop* loop, d->loops ) {
+ loop->exit();
+ }
}
}
@@ -230,8 +236,10 @@
if ( timeout > 0 ) {
QTimer::singleShot( timeout, &loop, SLOT(quit()) );
}
+ QPointer<ServiceController> guard = this;
loop.exec();
- d->loops.removeAll( &loop );
+ if ( !guard.isNull() )
+ d->loops.removeAll( &loop );
}
return d->initialized;
Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kdebase-runtime.spec 25 Jul 2008 15:31:44 -0000 1.62
+++ kdebase-runtime.spec 12 Aug 2008 14:06:27 -0000 1.63
@@ -8,7 +8,7 @@
Name: kdebase-runtime
Summary: K Desktop Environment - Runtime
Version: 4.1.0
-Release: 1%{?dist}.1
+Release: 2%{?dist}
License: GPLv2
Group: User Interface/Desktops
@@ -17,6 +17,7 @@
Source1: khelpcenter.desktop
Patch0: kdebase-runtime-4.0.72-pulseaudio.patch
Patch1: kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
+Patch100: kdebase-runtime-4.1.0-nepomuk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifarch noarch
@@ -99,6 +100,9 @@
%patch0 -p1 -b .pulseaudio
%patch1 -p1 -b .searchproviders-shortcuts
+# upstream patches
+%patch100 -p1 -b .nepomuk-crash
+
%build
mkdir -p %{_target_platform}
@@ -332,6 +336,9 @@
%changelog
+* Tue Aug 12 2008 Than Ngo <than at redhat.com> 4.1.0-2
+- crash fix when stopping a service that is not yet initialized
+
* Fri Jul 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-1.1
- don't remove autostart directory on F8- (does not conflict, fixes build
failure due to nepomukserver.desktop listed in filelist but not found)
More information about the fedora-extras-commits
mailing list