rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drop autostart-debug.patch

This commit is contained in:
Rex Dieter 2014-02-02 13:26:49 -06:00
parent 67b4fc4653
commit 0378c1266a
2 changed files with 4 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
kdelibs-4.11.3-autostart-debug.patch
View File

@ -1,120 +0,0 @@
diff -up kdelibs-4.11.3/kinit/autostart.cpp.autostart-debug kdelibs-4.11.3/kinit/autostart.cpp
--- kdelibs-4.11.3/kinit/autostart.cpp.autostart-debug 2013-06-28 18:03:41.331387754 +0100
+++ kdelibs-4.11.3/kinit/autostart.cpp 2013-12-06 23:59:49.664514325 +0000
@@ -20,6 +20,7 @@
#define QT_NO_CAST_FROM_ASCII
#include "autostart.h"
+#include <kdebug.h>
#include <kautostart.h>
#include <kglobal.h>
#include <kstandarddirs.h>
@@ -97,8 +98,10 @@ AutoStart::loadAutoStartList()
item->phase = config.startPhase();
if (item->phase < 0)
item->phase = 0;
+ kWarning() << "Loading autostart list item: name=" << item->name << " phase=" << item->phase;
m_startList->append(item);
}
+ kWarning() << "Loading complete";
}
QString
diff -up kdelibs-4.11.3/kinit/klauncher.cpp.autostart-debug kdelibs-4.11.3/kinit/klauncher.cpp
--- kdelibs-4.11.3/kinit/klauncher.cpp.autostart-debug 2013-11-01 15:45:56.413145482 +0000
+++ kdelibs-4.11.3/kinit/klauncher.cpp 2013-12-07 00:00:43.745672891 +0000
@@ -535,12 +535,20 @@ KLauncher::slotAutoStart()
KService::Ptr s;
do
{
+ // Return each service from current phase in turn. These are pre-sorted accroding to dependencies
+ // TODO: Debug startService to ensure we are not stuck in function
+ kWarning() << "Finding next AutoStart service to run";
QString service = mAutoStart.startService();
+ kWarning() << "Autostarting service: " << service;
+ //If we have a service then we start is in the while condition
if (service.isEmpty())
{
+ //Otherwise we report back to ksmserver and we are all done
+ kWarning() << "End of services list";
// Done
if( !mAutoStart.phaseDone())
{
+ kWarning() << "Autostarting done. Reporting back to ksmserver";
mAutoStart.setPhaseDone();
switch( mAutoStart.phase())
{
@@ -555,12 +563,15 @@ KLauncher::slotAutoStart()
break;
}
}
+ kWarning() << "End of services but already reported ?????";
return;
}
+
s = new KService(service);
}
while (!start_service(s, QStringList(), QStringList(), "0", false, true, QDBusMessage()));
// Loop till we find a service that we can start.
+ // We loop until we have someting to run. We return here because once a service is done we post another timer even and recall this entire method.
}
void
@@ -607,6 +618,7 @@ KLauncher::requestDone(KLaunchRequest *r
if (request->autoStart)
{
+ kWarning() << "Posting slotAutoStart";
mAutoTimer.start(0);
}
@@ -815,6 +827,7 @@ KLauncher::start_service(KService::Ptr s
const QStringList &envs, const QByteArray &startup_id,
bool blind, bool autoStart, const QDBusMessage &msg)
{
+ kWarning() << "Preparing start: " << service->name();
QStringList urls = _urls;
bool runPermitted = KDesktopFile::isAuthorizedDesktopFile(service->entryPath());
@@ -826,6 +839,7 @@ KLauncher::start_service(KService::Ptr s
else
requestResult.error = i18n("Service '%1' is malformatted.", service->entryPath());
cancel_service_startup_info( NULL, startup_id, envs ); // cancel it if any
+ kWarning() << "Service skipped on this run: valid=" << service->isValid() << " runPermitted=" << runPermitted;
return false;
}
KLaunchRequest *request = new KLaunchRequest;
@@ -863,6 +877,7 @@ KLauncher::start_service(KService::Ptr s
requestResult.error = i18n("Service '%1' is malformatted.", service->entryPath());
delete request;
cancel_service_startup_info( NULL, startup_id, envs );
+ kWarning() << "Service skipped on this run: no arguments";
return false;
}
@@ -907,6 +922,7 @@ KLauncher::start_service(KService::Ptr s
msg.setDelayedReply(true);
request->transaction = msg;
}
+ kWarning() << "Service queued on this run";;
queueRequest(request);
return true;
}
@@ -1050,6 +1066,7 @@ KLauncher::slotDequeue()
KLaunchRequest *request = requestQueue.takeFirst();
// process request
request->status = KLaunchRequest::Launching;
+ kWarning() << "Starting: " << request->name;
requestStart(request);
if (request->status != KLaunchRequest::Launching)
{
@@ -1057,7 +1074,9 @@ KLauncher::slotDequeue()
#ifdef KLAUNCHER_VERBOSE_OUTPUT
kDebug(7016) << "Request handled already";
#endif
+ kWarning() << "Completing: " << request->name;
requestDone( request );
+ kWarning() << "Completed.";
continue;
}
} while(requestQueue.count());

8
kdelibs.spec
View File

@ -39,7 +39,7 @@
Summary: KDE Libraries
Version: 4.12.2
Release: 1%{?dist}
Release: 2%{?dist}
Name: kdelibs
Epoch: 6
@ -87,8 +87,6 @@ Requires: strigi-libs%{?_isa} >= %{strigi_version}
# make kdelibs-devel parallel-installable with kdelibs3-devel
Patch0: kdelibs-4.9.95-parallel_devel.patch
Patch1: http://john5342.fedorapeople.org/patches/kdelibs-4.11.3-autostart-debug.patch
# fix http://bugs.kde.org/149705
Patch2: kdelibs-4.10.0-kde149705.patch
@ -338,7 +336,6 @@ format for use with the Qt 4 Assistant or KDevelop 4.
%setup -q -n kdelibs-%{version}
%patch0 -p1 -b .parallel_devel
%patch1 -p1 -b .autostart_debug
%patch2 -p1 -b .kde149705
%patch8 -p1 -b .install_all_css
%patch9 -p1 -b .branding
@ -633,6 +630,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Sun Feb 02 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.12.2-2
- drop autostart-debug.patch
* Fri Jan 31 2014 Rex Dieter <rdieter@fedoraproject.org> - 6:4.12.2-1
- 4.12.2