Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2014-10-11 19:26:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2014-10-07 15:59:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kservice.new/kservice.changes 2014-10-11 19:28:36.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 9 21:31:30 UTC 2014 - [email protected] + +- Add 0001-Don-t-call-enableTestMode-when-QStandardPaths-isTest.patch + from upstream: fixes bug where kded would be called in test mode, + which made it use ~/.qttest as home dir + +------------------------------------------------------------------- New: ---- 0001-Don-t-call-enableTestMode-when-QStandardPaths-isTest.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.gbh9Dm/_old 2014-10-11 19:28:37.000000000 +0200 +++ /var/tmp/diff_new_pack.gbh9Dm/_new 2014-10-11 19:28:37.000000000 +0200 @@ -44,6 +44,8 @@ Source1: baselibs.conf # PATCH-FIX-OPENSUSE menu.patch Patch0: menu.patch +# PATCH-FIX-UPSTREAM 0001-Don-t-call-enableTestMode-when-QStandardPaths-isTest.patch +Patch1: 0001-Don-t-call-enableTestMode-when-QStandardPaths-isTest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -70,6 +72,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build -- -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} ++++++ 0001-Don-t-call-enableTestMode-when-QStandardPaths-isTest.patch ++++++ >From 94303e392907f1cbcbb7c66011bda188dbc216e8 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan <[email protected]> Date: Wed, 8 Oct 2014 22:12:08 +0200 Subject: [PATCH 1/1] Don't call 'enableTestMode' when QStandardPaths::isTestModeEnabled is false This prevents amongst other things, creation of ~/.qttest dir during 'normal' usage REVIEW: 120519 --- src/sycoca/ksycoca.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sycoca/ksycoca.cpp b/src/sycoca/ksycoca.cpp index a2c8c2f..9434c80 100644 --- a/src/sycoca/ksycoca.cpp +++ b/src/sycoca/ksycoca.cpp @@ -477,10 +477,11 @@ bool KSycocaPrivate::checkDatabase(BehaviorsIfNotFound ifNotFound) // the same module with a different name, for test mode. // On the other hand, the use of other kded modules (cookies, timezone, etc.) // is also better separated from the user's kded anyway. + } else { + sycoca.call(QLatin1String("enableTestMode")); + Q_ASSERT(QDBusReply<bool>(sycoca.call(QLatin1String("isTestModeEnabled"))).value()); } } - sycoca.call(QLatin1String("enableTestMode")); - Q_ASSERT(QDBusReply<bool>(sycoca.call(QLatin1String("isTestModeEnabled"))).value()); } //qDebug() << "We have no database.... asking kded to create it"; -- 2.1.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
