rpms/kdebase-runtime/F-9 kdebase-runtime-4.1.2-kioexec.patch, NONE, 1.1 kdebase-runtime.spec, 1.57, 1.58
Than Ngo
than at fedoraproject.org
Tue Oct 14 08:59:55 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdebase-runtime/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28287
Modified Files:
kdebase-runtime.spec
Added Files:
kdebase-runtime-4.1.2-kioexec.patch
Log Message:
apply upstream patch, kioexec processes never terminate
kdebase-runtime-4.1.2-kioexec.patch:
--- NEW FILE kdebase-runtime-4.1.2-kioexec.patch ---
Index: kdebase-runtime/kioexec/main.cpp
===================================================================
--- kdebase-runtime/kioexec/main.cpp (Revision 870759)
+++ kdebase-runtime/kioexec/main.cpp (Revision 870760)
@@ -47,6 +47,7 @@
KIOExec::KIOExec()
+ : mExited(false)
{
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
if (args->count() < 1)
@@ -162,6 +163,7 @@
{
if ( fileList.isEmpty() ) {
kDebug() << "No files downloaded -> exiting";
+ mExited = true;
QApplication::exit(1);
return;
}
@@ -244,6 +246,7 @@
}
}
+ mExited = true;
QApplication::exit(0);
}
@@ -271,7 +274,10 @@
KIOExec exec;
- kDebug() << "Constructor returned...";
+ // Don't go into the event loop if we already want to exit (#172197)
+ if (exec.exited())
+ return 0;
+
return app.exec();
}
Index: kdebase-runtime/kioexec/main.h
===================================================================
--- kdebase-runtime/kioexec/main.h (Revision 870759)
+++ kdebase-runtime/kioexec/main.h (Revision 870760)
@@ -36,11 +36,14 @@
public:
KIOExec();
+ bool exited() const { return mExited; }
+
public Q_SLOTS:
void slotResult( KJob * );
void slotRunApp();
protected:
+ bool mExited;
bool tempfiles;
QString suggestedFileName;
int counter;
Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kdebase-runtime.spec 30 Sep 2008 15:56:30 -0000 1.57
+++ kdebase-runtime.spec 14 Oct 2008 08:59:24 -0000 1.58
@@ -10,7 +10,7 @@
Name: kdebase-runtime
Summary: K Desktop Environment - Runtime
Version: 4.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: User Interface/Desktops
@@ -30,6 +30,8 @@
Patch1: kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
Patch2: kdebase-runtime-4.1.1-knetattach.patch
Patch3: kdebase-runtime-4.1.1-iconthemes-inherit.patch
+# Upstream patces
+Patch100: kdebase-runtime-4.1.2-kioexec.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifarch noarch
@@ -125,6 +127,7 @@
%patch3 -p1 -b .iconthemes-inherit
# upstream patches
+%patch100 -p1 -b .kioexec
%build
@@ -380,6 +383,9 @@
%changelog
+* Tue Oct 14 2008 Than Ngo <than at redhat.com> 4.1.2-5
+- apply upstream patch, kioexec processes never terminate
+
* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-4
- fix broken audio-backend-jack.svgz
More information about the fedora-extras-commits
mailing list