Hello community, here is the log from the commit of package kservice for openSUSE:Factory checked in at 2020-10-12 13:56:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kservice (Old) and /work/SRC/openSUSE:Factory/.kservice.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kservice" Mon Oct 12 13:56:10 2020 rev:88 rq:840847 version:5.75.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kservice/kservice.changes 2020-09-18 14:43:13.404099960 +0200 +++ /work/SRC/openSUSE:Factory/.kservice.new.3486/kservice.changes 2020-10-12 13:58:05.238185392 +0200 @@ -1,0 +2,11 @@ +Mon Oct 5 08:33:34 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.75.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.75.0 +- Changes since 5.74.0: + * Fix shadow variable. Reported by cppcheck + * bring back disableAutoRebuild from the brink (kde#423931) + +------------------------------------------------------------------- Old: ---- kservice-5.74.0.tar.xz kservice-5.74.0.tar.xz.sig New: ---- kservice-5.75.0.tar.xz kservice-5.75.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kservice.spec ++++++ --- /var/tmp/diff_new_pack.zbncQM/_old 2020-10-12 13:58:06.870186072 +0200 +++ /var/tmp/diff_new_pack.zbncQM/_new 2020-10-12 13:58:06.874186073 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.74 +%define _tar_path 5.75 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kservice -Version: 5.74.0 +Version: 5.75.0 Release: 0 Summary: Plugin framework for desktop services License: LGPL-2.1-or-later ++++++ kservice-5.74.0.tar.xz -> kservice-5.75.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/CMakeLists.txt new/kservice-5.75.0/CMakeLists.txt --- old/kservice-5.74.0/CMakeLists.txt 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/CMakeLists.txt 2020-10-04 20:53:20.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.74.0") # handled by release scripts -set(KF5_DEP_VERSION "5.74.0") # handled by release scripts +set(KF5_VERSION "5.75.0") # handled by release scripts +set(KF5_DEP_VERSION "5.75.0") # handled by release scripts project(KService VERSION ${KF5_VERSION}) # Disallow in-source build @@ -11,7 +11,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.74.0 NO_MODULE) +find_package(ECM 5.75.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/po/ca/kservice5.po new/kservice-5.75.0/po/ca/kservice5.po --- old/kservice-5.74.0/po/ca/kservice5.po 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/po/ca/kservice5.po 2020-10-04 20:53:20.000000000 +0200 @@ -11,7 +11,7 @@ # Orestes Mas <ores...@tsc.upc.edu>, 2010. msgid "" msgstr "" -"Project-Id-Version: kservice5\n" +"Project-Id-Version: kservice\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-08-14 02:08+0200\n" "PO-Revision-Date: 2020-07-25 08:16+0200\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/po/ca@valencia/kservice5.po new/kservice-5.75.0/po/ca@valencia/kservice5.po --- old/kservice-5.74.0/po/ca@valencia/kservice5.po 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/po/ca@valencia/kservice5.po 2020-10-04 20:53:20.000000000 +0200 @@ -2,6 +2,7 @@ # Copyright (C) 1998-2019 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. +# # Sebastià Pla i Sanz <s...@sastia.com>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella Pérez <antonibel...@yahoo.com>, 2003, 2006, 2011, 2012, 2013, 2014, 2015. # Albert Astals Cid <aa...@kde.org>, 2004, 2005, 2007. @@ -11,7 +12,7 @@ # Empar <montoro_...@gva.es>, 2019. msgid "" msgstr "" -"Project-Id-Version: kservice5\n" +"Project-Id-Version: kservice\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-08-14 02:08+0200\n" "PO-Revision-Date: 2019-06-18 13:49+0200\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/po/ro/kservice5.po new/kservice-5.75.0/po/ro/kservice5.po --- old/kservice-5.74.0/po/ro/kservice5.po 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/po/ro/kservice5.po 2020-10-04 20:53:20.000000000 +0200 @@ -1,23 +1,23 @@ # Traducerea kdelibs4.po în Română # Laurenţiu Buzdugan <l...@rolix.org>, 2008, 2009. -# Sergiu Bivol <ser...@ase.md>, 2008, 2009, 2010. -# Sergiu Bivol <ser...@ase.md>, 2010, 2012, 2013, 2014. +# Sergiu Bivol <ser...@cip.md>, 2008, 2009, 2010. +# Sergiu Bivol <ser...@cip.md>, 2010, 2012, 2013, 2014, 2020. # Cristian Oneț <onet.crist...@gmail.com>, 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-08-14 02:08+0200\n" -"PO-Revision-Date: 2014-03-26 19:20+0200\n" -"Last-Translator: Sergiu Bivol <ser...@ase.md>\n" -"Language-Team: Romanian <kde-i18n...@kde.org>\n" +"PO-Revision-Date: 2020-09-16 01:49+0100\n" +"Last-Translator: Sergiu Bivol <ser...@cip.md>\n" +"Language-Team: Romanian\n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" +"X-Generator: Lokalize 19.12.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -27,46 +27,40 @@ #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr ",ser...@ase.md,l...@rolix.org,onet.crist...@gmail.com" +msgstr ",ser...@cip.md,l...@rolix.org,onet.crist...@gmail.com" #: kbuildsycoca/kbuildsycoca_main.cpp:47 -#, fuzzy, kde-format -#| msgid "KBuildSycoca" +#, kde-format msgctxt "application name" msgid "KBuildSycoca" msgstr "KBuildSycoca" #: kbuildsycoca/kbuildsycoca_main.cpp:49 -#, fuzzy, kde-format -#| msgid "Rebuilds the system configuration cache." +#, kde-format msgctxt "application description" msgid "Rebuilds the system configuration cache." msgstr "Recreează cache-ul de configurare al sistemului." #: kbuildsycoca/kbuildsycoca_main.cpp:51 -#, fuzzy, kde-format -#| msgid "(c) 1999-2002 KDE Developers" +#, kde-format msgctxt "@info:credit" msgid "Copyright 1999-2014 KDE Developers" -msgstr "(c) 1999-2002 Dezvoltatorii KDE" +msgstr "Drept de autor 1999-2014 Dezvoltatorii KDE" #: kbuildsycoca/kbuildsycoca_main.cpp:52 -#, fuzzy, kde-format -#| msgid "David Faure" +#, kde-format msgctxt "@info:credit" msgid "David Faure" msgstr "David Faure" #: kbuildsycoca/kbuildsycoca_main.cpp:53 kbuildsycoca/kbuildsycoca_main.cpp:56 -#, fuzzy, kde-format -#| msgid "Author" +#, kde-format msgctxt "@info:credit" msgid "Author" msgstr "Autor" #: kbuildsycoca/kbuildsycoca_main.cpp:55 -#, fuzzy, kde-format -#| msgid "Waldo Bastian" +#, kde-format msgctxt "@info:credit" msgid "Waldo Bastian" msgstr "Waldo Bastian" @@ -199,7 +193,7 @@ #: plugin/kdbusservicestarter.cpp:68 #, kde-format msgid "No service implementing %1" -msgstr "" +msgstr "Niciun serviciu nu implementează %1" #: services/kservice.cpp:1040 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/po/se/kservice5.po new/kservice-5.75.0/po/se/kservice5.po --- old/kservice-5.74.0/po/se/kservice5.po 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/po/se/kservice5.po 2020-10-04 20:53:20.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; -"POT-Creation-Date: 2020-03-30 03:00+0200\n" +"POT-Creation-Date: 2020-08-14 02:08+0200\n" "PO-Revision-Date: 2012-05-30 23:19+0200\n" "Last-Translator: Børre Gaup <boe...@skolelinux.no>\n" "Language-Team: Northern Sami <l10n...@lister.huftis.org>\n" @@ -29,43 +29,43 @@ msgid "Your emails" msgstr "boe...@skolelinux.no" -#: kbuildsycoca/kbuildsycoca_main.cpp:58 +#: kbuildsycoca/kbuildsycoca_main.cpp:47 #, fuzzy, kde-format msgctxt "application name" msgid "KBuildSycoca" msgstr "KBuildSycoca" -#: kbuildsycoca/kbuildsycoca_main.cpp:60 +#: kbuildsycoca/kbuildsycoca_main.cpp:49 #, fuzzy, kde-format msgctxt "application description" msgid "Rebuilds the system configuration cache." msgstr "Hukse vuogádatdiehtovuorká ođđasit." -#: kbuildsycoca/kbuildsycoca_main.cpp:62 +#: kbuildsycoca/kbuildsycoca_main.cpp:51 #, fuzzy, kde-format msgctxt "@info:credit" msgid "Copyright 1999-2014 KDE Developers" msgstr "© 1999–2002 KDE-ovdánahttit" -#: kbuildsycoca/kbuildsycoca_main.cpp:63 +#: kbuildsycoca/kbuildsycoca_main.cpp:52 #, kde-format msgctxt "@info:credit" msgid "David Faure" msgstr "David Faure" -#: kbuildsycoca/kbuildsycoca_main.cpp:64 kbuildsycoca/kbuildsycoca_main.cpp:67 +#: kbuildsycoca/kbuildsycoca_main.cpp:53 kbuildsycoca/kbuildsycoca_main.cpp:56 #, fuzzy, kde-format msgctxt "@info:credit" msgid "Author" msgstr "Čálli" -#: kbuildsycoca/kbuildsycoca_main.cpp:66 +#: kbuildsycoca/kbuildsycoca_main.cpp:55 #, fuzzy, kde-format msgctxt "@info:credit" msgid "Waldo Bastian" msgstr "Waldo Bastian" -#: kbuildsycoca/kbuildsycoca_main.cpp:75 +#: kbuildsycoca/kbuildsycoca_main.cpp:64 #, kde-format msgctxt "@info:shell command-line option" msgid "" @@ -73,48 +73,48 @@ "effect)" msgstr "" -#: kbuildsycoca/kbuildsycoca_main.cpp:78 +#: kbuildsycoca/kbuildsycoca_main.cpp:67 #, fuzzy, kde-format msgctxt "@info:shell command-line option" msgid "Disable incremental update, re-read everything" msgstr "Vállje eret lassáneaddji ođasmahttin, loga buot ođđasit" -#: kbuildsycoca/kbuildsycoca_main.cpp:81 +#: kbuildsycoca/kbuildsycoca_main.cpp:70 #, kde-format msgctxt "@info:shell command-line option" msgid "Check file timestamps (deprecated, no longer having any effect)" msgstr "" -#: kbuildsycoca/kbuildsycoca_main.cpp:84 +#: kbuildsycoca/kbuildsycoca_main.cpp:73 #, kde-format msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" msgstr "" -#: kbuildsycoca/kbuildsycoca_main.cpp:87 +#: kbuildsycoca/kbuildsycoca_main.cpp:76 #, fuzzy, kde-format msgctxt "@info:shell command-line option" msgid "Perform menu generation test run only" msgstr "Dušše geahččal ráhkadit fáluid" -#: kbuildsycoca/kbuildsycoca_main.cpp:90 +#: kbuildsycoca/kbuildsycoca_main.cpp:79 #, fuzzy, kde-format msgctxt "@info:shell command-line option" msgid "Track menu id for debug purposes" msgstr "Fákte fállo-ID:a dihkkoma dihte" -#: kbuildsycoca/kbuildsycoca_main.cpp:94 +#: kbuildsycoca/kbuildsycoca_main.cpp:83 #, kde-format msgctxt "@info:shell command-line option" msgid "Switch QStandardPaths to test mode, for unit tests only" msgstr "" -#: kdeinit/ktoolinvocation.cpp:70 +#: kdeinit/ktoolinvocation.cpp:58 #, kde-format msgid "Function must be called from the main thread." msgstr "Fertet gohččot funkšuvnna váldoárppus." -#: kdeinit/ktoolinvocation.cpp:108 +#: kdeinit/ktoolinvocation.cpp:101 #, kde-format msgid "" "Error launching %1. Either KLauncher is not running anymore, or it failed to " @@ -123,7 +123,7 @@ "Meattáhus álggahettiin %1. KLauncher ii leat jođus šat, dahje ii sáhttán " "álggahit prográmma." -#: kdeinit/ktoolinvocation.cpp:111 +#: kdeinit/ktoolinvocation.cpp:104 #, kde-format msgid "" "KLauncher could not be reached via D-Bus. Error when calling %1:\n" @@ -133,7 +133,7 @@ "gohččodettiin %1:\n" "%2\n" -#: kdeinit/ktoolinvocation_x11.cpp:240 +#: kdeinit/ktoolinvocation_x11.cpp:228 #, kde-format msgid "" "Could not launch the mail client:\n" @@ -144,7 +144,7 @@ "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:241 +#: kdeinit/ktoolinvocation_x11.cpp:229 #, kde-format msgid "Could not launch Mail Client" msgstr "Ii sáhttán álggahit e-boastaprográmma" @@ -152,8 +152,8 @@ #. i18n("Could not launch %1:\n\n%2", exe, error), #. i18n("Could not launch %1:\n\n%2", htmlApp->exec(), error), #. i18n("Could not launch %1:\n\n%2", exe, error), -#: kdeinit/ktoolinvocation_x11.cpp:291 kdeinit/ktoolinvocation_x11.cpp:316 -#: kdeinit/ktoolinvocation_x11.cpp:335 +#: kdeinit/ktoolinvocation_x11.cpp:279 kdeinit/ktoolinvocation_x11.cpp:304 +#: kdeinit/ktoolinvocation_x11.cpp:323 #, kde-format msgid "" "Could not launch the browser:\n" @@ -164,13 +164,13 @@ "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:292 kdeinit/ktoolinvocation_x11.cpp:317 -#: kdeinit/ktoolinvocation_x11.cpp:336 +#: kdeinit/ktoolinvocation_x11.cpp:280 kdeinit/ktoolinvocation_x11.cpp:305 +#: kdeinit/ktoolinvocation_x11.cpp:324 #, kde-format msgid "Could not launch Browser" msgstr "Ii sáhttán álggahit fierpmádatlogana" -#: kdeinit/ktoolinvocation_x11.cpp:376 +#: kdeinit/ktoolinvocation_x11.cpp:365 #, kde-format msgid "" "Could not launch the terminal client:\n" @@ -181,22 +181,22 @@ "\n" "%1" -#: kdeinit/ktoolinvocation_x11.cpp:377 +#: kdeinit/ktoolinvocation_x11.cpp:366 #, kde-format msgid "Could not launch Terminal Client" msgstr "Ii sáhttán álggahit terminalprográmma" -#: plugin/kdbusservicestarter.cpp:79 +#: plugin/kdbusservicestarter.cpp:68 #, kde-format msgid "No service implementing %1" msgstr "Ii gávdno bálvalus %1 várás" -#: services/kservice.cpp:1050 +#: services/kservice.cpp:1040 #, kde-format msgid "The provided service is not valid" msgstr "Addon bálvalus ii gusto" -#: services/kservice.cpp:1054 +#: services/kservice.cpp:1044 #, kde-format msgid "The service '%1' provides no library or the Library key is missing" msgstr "«%1»-bálvalusas ii leat bibliotehka dahje «Library»-čoavdda ii gávdno " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/po/vi/kservice5.po new/kservice-5.75.0/po/vi/kservice5.po --- old/kservice-5.74.0/po/vi/kservice5.po 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/po/vi/kservice5.po 2020-10-04 20:53:20.000000000 +0200 @@ -78,7 +78,7 @@ msgid "" "Do not signal applications to update (deprecated, no longer having any " "effect)" -msgstr "Tắt chạy kiểm tra tập tin (nguy hiểm)" +msgstr "Tắt chạy kiểm tra tệp (nguy hiểm)" #: kbuildsycoca/kbuildsycoca_main.cpp:67 #, fuzzy, kde-format @@ -98,7 +98,7 @@ #| msgid "Disable checking files (dangerous)" msgctxt "@info:shell command-line option" msgid "Disable checking files (deprecated, no longer having any effect)" -msgstr "Tắt chạy kiểm tra tập tin (nguy hiểm)" +msgstr "Tắt chạy kiểm tra tệp (nguy hiểm)" #: kbuildsycoca/kbuildsycoca_main.cpp:76 #, fuzzy, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/po/zh_CN/kservice5.po new/kservice-5.75.0/po/zh_CN/kservice5.po --- old/kservice-5.74.0/po/zh_CN/kservice5.po 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/po/zh_CN/kservice5.po 2020-10-04 20:53:20.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-08-14 02:08+0200\n" -"PO-Revision-Date: 2020-09-05 05:17\n" +"PO-Revision-Date: 2020-09-23 12:19\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/src/kdeinit/ktoolinvocation_x11.cpp new/kservice-5.75.0/src/kdeinit/ktoolinvocation_x11.cpp --- old/kservice-5.74.0/src/kdeinit/ktoolinvocation_x11.cpp 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/src/kdeinit/ktoolinvocation_x11.cpp 2020-10-04 20:53:20.000000000 +0200 @@ -209,9 +209,9 @@ const QString previousStr = cmdTokens.at(i-1); cmdTokens.removeAt(i); const int currentPos = i; - for(const QString &url : attachURLs) { + for(const QString &attachUrl : attachURLs) { cmdTokens.insert(currentPos, previousStr); - cmdTokens.insert(currentPos, url); + cmdTokens.insert(currentPos, attachUrl); i += 2; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/src/sycoca/ksycoca.cpp new/kservice-5.75.0/src/sycoca/ksycoca.cpp --- old/kservice-5.74.0/src/sycoca/ksycoca.cpp 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/src/sycoca/ksycoca.cpp 2020-10-04 20:53:20.000000000 +0200 @@ -3,6 +3,7 @@ SPDX-FileCopyrightText: 1999-2000 Waldo Bastian <bast...@kde.org> SPDX-FileCopyrightText: 2005-2009 David Faure <fa...@kde.org> SPDX-FileCopyrightText: 2008 Hamish Rodda <ro...@kde.org> + SPDX-FileCopyrightText: 2020 Harald Sitter <sit...@kde.org> SPDX-License-Identifier: LGPL-2.0-only */ @@ -79,6 +80,7 @@ timeStamp(0), m_databasePath(), updateSig(0), + m_fileWatcher(new KDirWatch), m_haveListeners(false), q(q), sycoca_size(0), @@ -189,13 +191,15 @@ const QString path = KSycoca::absoluteFilePath(); const QFileInfo info(path); if (info.isReadable()) { - if (m_haveListeners) { - m_fileWatcher.addFile(path); + if (m_haveListeners && m_fileWatcher) { + m_fileWatcher->addFile(path); } return path; } // Let's be notified when it gets created - by another process or by ourselves - m_fileWatcher.addFile(path); + if (m_fileWatcher) { + m_fileWatcher->addFile(path); + } return QString(); } @@ -204,10 +208,12 @@ KSycoca::KSycoca() : d(new KSycocaPrivate(this)) { - // We always delete and recreate the DB, so KDirWatch normally emits created - connect(&d->m_fileWatcher, &KDirWatch::created, this, [this](){ d->slotDatabaseChanged(); }); - // In some cases, KDirWatch only thinks the file was modified though - connect(&d->m_fileWatcher, &KDirWatch::dirty, this, [this](){ d->slotDatabaseChanged(); }); + if (d->m_fileWatcher) { + // We always delete and recreate the DB, so KDirWatch normally emits created + connect(d->m_fileWatcher.get(), &KDirWatch::created, this, [this](){ d->slotDatabaseChanged(); }); + // In some cases, KDirWatch only thinks the file was modified though + connect(d->m_fileWatcher.get(), &KDirWatch::dirty, this, [this]() { d->slotDatabaseChanged(); }); + } } bool KSycocaPrivate::openDatabase() @@ -291,7 +297,7 @@ qCDebug(SYCOCA) << QThread::currentThread() << "got a notifyDatabaseChanged signal"; // KDirWatch tells us the database file changed // We would have found out in the next call to ensureCacheValid(), but for - // now keep the call to closeDatabase, to help refcounting to 0 the old mmaped file earlier. + // now keep the call to closeDatabase, to help refcounting to 0 the old mmapped file earlier. closeDatabase(); // Start monitoring the new file right away m_databasePath = findDatabase(); @@ -723,12 +729,10 @@ return false; } -#if KSERVICE_BUILD_DEPRECATED_SINCE(5, 15) void KSycoca::disableAutoRebuild() { - qCWarning(SYCOCA) << "KSycoca::disableAutoRebuild() is internal, do not call it."; + ksycocaInstance->sycoca()->d->m_fileWatcher = nullptr; } -#endif QDataStream *&KSycoca::stream() { @@ -741,8 +745,8 @@ d->m_haveListeners = true; if (d->m_databasePath.isEmpty()) { d->m_databasePath = d->findDatabase(); - } else { - d->m_fileWatcher.addFile(d->m_databasePath); + } else if (d->m_fileWatcher) { + d->m_fileWatcher->addFile(d->m_databasePath); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/src/sycoca/ksycoca.h new/kservice-5.75.0/src/sycoca/ksycoca.h --- old/kservice-5.74.0/src/sycoca/ksycoca.h 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/src/sycoca/ksycoca.h 2020-10-04 20:53:20.000000000 +0200 @@ -2,6 +2,7 @@ This file is part of the KDE libraries SPDX-FileCopyrightText: 1999 Waldo Bastian <bast...@kde.org> SPDX-FileCopyrightText: 2005-2008 David Faure <fa...@kde.org> + SPDX-FileCopyrightText: 2020 Harald Sitter <sit...@kde.org> SPDX-License-Identifier: LGPL-2.0-only */ @@ -145,14 +146,14 @@ */ virtual bool isBuilding(); -#if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 15) /** - * @internal - disables launching of kbuildsycoca - * @deprecated since 5.15, it only outputs a warning + * Disables automatic rebuilding of the cache on service file changes. + * Be extremely careful when using this. Only threads that definitely have no use for + * automatic reloading should use this. Specifically shared runner threads (as seen in + * the threadweaver framework) can avoid claiming persistent resources this way + * (e.g. inotify instances on Linux). */ - KSERVICE_DEPRECATED_VERSION(5, 15, "Feature no longer exists.") - static void disableAutoRebuild(); // KF6: remove -#endif + static void disableAutoRebuild(); #if KSERVICE_ENABLE_DEPRECATED_SINCE(5, 0) /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kservice-5.74.0/src/sycoca/ksycoca_p.h new/kservice-5.75.0/src/sycoca/ksycoca_p.h --- old/kservice-5.74.0/src/sycoca/ksycoca_p.h 2020-09-06 12:35:42.000000000 +0200 +++ new/kservice-5.75.0/src/sycoca/ksycoca_p.h 2020-10-04 20:53:20.000000000 +0200 @@ -3,6 +3,7 @@ SPDX-FileCopyrightText: 1999-2000 Waldo Bastian <bast...@kde.org> SPDX-FileCopyrightText: 2005-2009 David Faure <fa...@kde.org> SPDX-FileCopyrightText: 2008 Hamish Rodda <ro...@kde.org> + SPDX-FileCopyrightText: 2020 Harald Sitter <sit...@kde.org> SPDX-License-Identifier: LGPL-2.0-only */ @@ -15,6 +16,9 @@ #include <QElapsedTimer> #include <QDateTime> #include <KDirWatch> + +#include <memory> + class QFile; class QDataStream; class KSycocaAbstractDevice; @@ -120,7 +124,8 @@ // QFileSystemWatcher's inotify implementation easily gets confused between "removed" and "changed", // and fails to re-add an inotify watch after the file was replaced at some point (KServiceTest::testThreads), // thinking it only got changed and not removed+recreated. - KDirWatch m_fileWatcher; + // NOTE: this may be nullptr when file watching is disabled on the current thread + std::unique_ptr<KDirWatch> m_fileWatcher; bool m_haveListeners; KSycoca *q;
