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

6:4.11.3-5 

- respin autostart debuging patch
- %check: support regression tests (default off)
This commit is contained in:
Rex Dieter 2013-12-06 18:29:04 -06:00
parent a5e6d24f31
commit 487dc84f06
2 changed files with 82 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
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.000000000 +0100
+++ kdelibs-4.11.3/kinit/autostart.cpp 2013-12-06 17:58:38.202910694 +0000
--- 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"
@ -21,15 +21,22 @@ diff -up kdelibs-4.11.3/kinit/autostart.cpp.autostart-debug kdelibs-4.11.3/kinit
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-12-06 16:40:58.000000000 +0000
+++ kdelibs-4.11.3/kinit/klauncher.cpp 2013-12-06 17:54:47.369608109 +0000
@@ -537,11 +537,13 @@ KLauncher::slotAutoStart()
--- 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())
{
@ -37,7 +44,31 @@ diff -up kdelibs-4.11.3/kinit/klauncher.cpp.autostart-debug kdelibs-4.11.3/kinit
mAutoStart.setPhaseDone();
switch( mAutoStart.phase())
{
@@ -816,6 +818,7 @@ KLauncher::start_service(KService::Ptr s
@@ -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)
{
@ -45,15 +76,31 @@ diff -up kdelibs-4.11.3/kinit/klauncher.cpp.autostart-debug kdelibs-4.11.3/kinit
QStringList urls = _urls;
bool runPermitted = KDesktopFile::isAuthorizedDesktopFile(service->entryPath());
@@ -908,6 +911,7 @@ KLauncher::start_service(KService::Ptr s
@@ -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() << "Queueing service request";
+ kWarning() << "Service queued on this run";;
queueRequest(request);
return true;
}
@@ -1051,6 +1055,7 @@ KLauncher::slotDequeue()
@@ -1050,6 +1066,7 @@ KLauncher::slotDequeue()
KLaunchRequest *request = requestQueue.takeFirst();
// process request
request->status = KLaunchRequest::Launching;
@ -61,3 +108,13 @@ diff -up kdelibs-4.11.3/kinit/klauncher.cpp.autostart-debug kdelibs-4.11.3/kinit
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: " << request->name;
continue;
}
} while(requestQueue.count());

17
kdelibs.spec
View File

@ -25,6 +25,11 @@
%define cmake_pkg cmake
%define upower 1
%endif
# enable tests (disabled by default)
#global tests 1
%if 0%{?tests}
%global _kde4_build_tests -DKDE4_BUILD_TESTS:BOOL=ON
%endif
%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
%global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver})
@ -37,7 +42,7 @@
Summary: KDE Libraries
Version: 4.11.3
Release: 4%{?dist}
Release: 5%{?dist}
Name: kdelibs
Epoch: 6
@ -473,6 +478,12 @@ install -p -m644 -D %{SOURCE10} %{buildroot}/etc/kde/env/SOLID_HAL_LEGACY.sh
rm -fv %{buildroot}%{_mandir}/man1/kdecmake.1*
%check
%if 0%{?tests}
time make -C %{_target_platform}/ test ||:
%endif
%post
/sbin/ldconfig
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
@ -615,6 +626,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Fri Dec 06 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.11.3-5
- respin autostart debuging patch
- %%check: support regression tests (default off)
* Fri Dec 06 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.11.3-4
- add some autostart debugging