commit kded for openSUSE:Factory
Hello community,
here is the log from the commit of package kded for openSUSE:Factory checked in at 2015-10-19 22:23:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kded (Old)
and /work/SRC/openSUSE:Factory/.kded.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kded"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kded/kded.changes 2015-09-24 07:10:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kded.new/kded.changes 2015-10-19 22:23:42.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Oct 5 17:37:09 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.15.0
+ * Simplify logic around sycoca; just call ensureCacheValid.
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.15.0.php
+
+-------------------------------------------------------------------
Old:
----
kded-5.14.0.tar.xz
New:
----
kded-5.15.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kded.spec ++++++
--- /var/tmp/diff_new_pack.1Fi8AG/_old 2015-10-19 22:23:42.000000000 +0200
+++ /var/tmp/diff_new_pack.1Fi8AG/_new 2015-10-19 22:23:42.000000000 +0200
@@ -17,9 +17,9 @@
%bcond_without lang
-%define _tar_path 5.14
+%define _tar_path 5.15
Name: kded
-Version: 5.14.0
+Version: 5.15.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
++++++ kded-5.14.0.tar.xz -> kded-5.15.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.14.0/CMakeLists.txt new/kded-5.15.0/CMakeLists.txt
--- old/kded-5.14.0/CMakeLists.txt 2015-09-05 10:55:59.000000000 +0200
+++ new/kded-5.15.0/CMakeLists.txt 2015-10-05 09:58:33.000000000 +0200
@@ -3,7 +3,7 @@
project(KDED)
include(FeatureSummary)
-find_package(ECM 5.14.0 NO_MODULE)
+find_package(ECM 5.15.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -16,8 +16,8 @@
include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
-set(KF5_VERSION "5.14.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.14.0") # handled by release scripts
+set(KF5_VERSION "5.15.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.15.0") # handled by release scripts
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.14.0/src/kded.cpp new/kded-5.15.0/src/kded.cpp
--- old/kded-5.14.0/src/kded.cpp 2015-09-05 10:55:59.000000000 +0200
+++ new/kded-5.15.0/src/kded.cpp 2015-10-05 09:58:33.000000000 +0200
@@ -57,11 +57,9 @@
Kded *Kded::_self = 0;
-static bool checkStamps;
static bool delayedCheck;
static bool bCheckSycoca;
static bool bCheckUpdates;
-static bool s_checkStampsDefault = true;
#ifdef Q_DBUS_EXPORT
extern Q_DBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage &));
@@ -69,33 +67,6 @@
extern QDBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage &));
#endif
-static void runBuildSycoca(QObject *callBackObj = 0, const char *callBackSlot = 0)
-{
- const QString exe = QStandardPaths::findExecutable(KBUILDSYCOCA_EXENAME);
- Q_ASSERT(!exe.isEmpty());
- QStringList args;
- if (QStandardPaths::isTestModeEnabled()) {
- args.append("--testmode");
- }
- if (checkStamps) {
- args.append("--checkstamps");
- }
- if (delayedCheck) {
- args.append("--nocheckfiles");
- } else {
- checkStamps = false; // useful only during kded startup
- }
- if (callBackObj) {
- QVariantList argList;
- argList << exe << args << QStringList() << QString();
- KToolInvocation::ensureKdeinitRunning();
- QDBusInterface klauncher(QStringLiteral("org.kde.klauncher5"), QStringLiteral("/KLauncher"), QStringLiteral("org.kde.KLauncher"), QDBusConnection::sessionBus());
- klauncher.callWithCallback("kdeinit_exec_wait", argList, callBackObj, callBackSlot);
- } else {
- KToolInvocation::kdeinitExecWait(exe, args);
- }
-}
-
static void runKonfUpdate()
{
KToolInvocation::kdeinitExecWait(QStringLiteral(KCONF_UPDATE_EXE),
@@ -105,8 +76,6 @@
Kded::Kded()
: m_pDirWatch(0)
, m_pTimer(new QTimer(this))
- , m_recreateCount(0)
- , m_recreateBusy(false)
, m_needDelayedCheck(false)
{
_self = this;
@@ -534,19 +503,19 @@
void Kded::recreate(bool initial)
{
- m_recreateBusy = true;
// Using KLauncher here is difficult since we might not have a
// database
if (!initial) {
updateDirWatch(); // Update tree first, to be sure to miss nothing.
- runBuildSycoca(this, SLOT(recreateDone()));
+ KSycoca::self()->ensureCacheValid();
+ recreateDone();
} else {
if (!delayedCheck) {
updateDirWatch(); // this would search all the directories
}
if (bCheckSycoca) {
- runBuildSycoca();
+ KSycoca::self()->ensureCacheValid();
}
recreateDone();
if (delayedCheck) {
@@ -564,19 +533,7 @@
{
updateResourceList();
- for (; m_recreateCount; m_recreateCount--) {
- QDBusMessage msg = m_recreateRequests.takeFirst();
- QDBusConnection::sessionBus().send(msg.createReply());
- }
- m_recreateBusy = false;
-
- // Did a new request come in while building?
- if (!m_recreateRequests.isEmpty()) {
- m_pTimer->start(2000);
- m_recreateCount = m_recreateRequests.count();
- } else {
- initModules();
- }
+ initModules();
}
void Kded::dirDeleted(const QString &path)
@@ -586,23 +543,7 @@
void Kded::update(const QString &)
{
- if (!m_recreateBusy) {
- m_pTimer->start(10000);
- }
-}
-
-void Kded::recreate(const QDBusMessage &msg)
-{
- if (!m_recreateBusy) {
- if (m_recreateRequests.isEmpty()) {
- m_pTimer->start(0);
- m_recreateCount = 0;
- }
- m_recreateCount++;
- }
- msg.setDelayedReply(true);
- m_recreateRequests.append(msg);
- return;
+ m_pTimer->start(10000);
}
void Kded::readDirectory(const QString &_path)
@@ -710,16 +651,18 @@
{
}
-void KBuildsycocaAdaptor::recreate(const QDBusMessage &msg)
+void KBuildsycocaAdaptor::recreate()
{
- Kded::self()->recreate(msg);
+ Kded::self()->recreate();
}
+// KF6: remove
bool KBuildsycocaAdaptor::isTestModeEnabled()
{
return QStandardPaths::isTestModeEnabled();
}
+// KF6: remove
void KBuildsycocaAdaptor::enableTestMode()
{
QStandardPaths::enableTestMode(true);
@@ -744,11 +687,7 @@
QCoreApplication app(argc, argv);
setupAppInfo(&app);
- KSharedConfig::Ptr config = KSharedConfig::openConfig();
- KConfigGroup cg(config, "General");
- checkStamps = cg.readEntry("CheckFileStamps", s_checkStampsDefault);
-
- runBuildSycoca();
+ KSycoca::self()->ensureCacheValid();
runKonfUpdate();
return 0;
}
@@ -765,7 +704,6 @@
bCheckSycoca = cg.readEntry("CheckSycoca", true);
bCheckUpdates = cg.readEntry("CheckUpdates", true);
- checkStamps = cg.readEntry("CheckFileStamps", s_checkStampsDefault);
delayedCheck = cg.readEntry("DelayedCheck", false);
#ifndef Q_OS_WIN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kded-5.14.0/src/kded.h new/kded-5.15.0/src/kded.h
--- old/kded-5.14.0/src/kded.h 2015-09-05 10:55:59.000000000 +0200
+++ new/kded-5.15.0/src/kded.h 2015-10-05 09:58:33.000000000 +0200
@@ -37,7 +37,6 @@
class KPluginMetaData;
class KDirWatch;
-// No need for this in libkio - apps only get readonly access
class Kded : public QObject
{
Q_OBJECT
@@ -72,7 +71,6 @@
*/
void unregisterWindowId(qlonglong windowId, const QString &sender);
//@}
- void recreate(const QDBusMessage &);
void recreate(bool initial);
void loadSecondPhase();
@@ -199,10 +197,6 @@
*/
QTimer *m_pTimer;
- QList<QDBusMessage> m_recreateRequests;
- int m_recreateCount;
- bool m_recreateBusy;
-
QHash
participants (1)
-
root@hilbert.suse.de