diff -Nru kded-5.67.0/CMakeLists.txt kded-5.68.0/CMakeLists.txt --- kded-5.67.0/CMakeLists.txt 2020-02-02 12:46:22.000000000 +0000 +++ kded-5.68.0/CMakeLists.txt 2020-03-07 09:39:03.000000000 +0000 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.67.0") # handled by release scripts -set(KF5_DEP_VERSION "5.67.0") # handled by release scripts +set(KF5_VERSION "5.68.0") # handled by release scripts +set(KF5_DEP_VERSION "5.68.0") # handled by release scripts project(KDED VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.67.0 NO_MODULE) +find_package(ECM 5.68.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) @@ -27,6 +27,7 @@ include(CMakePackageConfigHelpers) +include(ECMQtDeclareLoggingCategory) include(ECMSetupVersion) include(ECMMarkNonGuiExecutable) @@ -40,7 +41,7 @@ # We don't install kded_version.h, it's only useful internally # (given that this framework produces no library) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054300) add_definitions(-DQT_NO_FOREACH) if (KF5DocTools_FOUND) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") @@ -68,7 +69,6 @@ COMPONENT Devel ) -install(FILES kded.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) install(FILES org.kde.kded5.desktop DESTINATION ${KDE_INSTALL_APPDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru kded-5.67.0/debian/changelog kded-5.68.0/debian/changelog --- kded-5.67.0/debian/changelog 2020-02-08 09:48:59.000000000 +0000 +++ kded-5.68.0/debian/changelog 2020-03-25 20:56:32.000000000 +0000 @@ -1,3 +1,9 @@ +kded (5.68.0-0ubuntu1) focal; urgency=medium + + * New upstream release (5.68.0) + + -- Rik Mills Wed, 25 Mar 2020 20:56:32 +0000 + kded (5.67.0-0ubuntu1) focal; urgency=medium * New upstream release (5.67.0) diff -Nru kded-5.67.0/debian/control kded-5.68.0/debian/control --- kded-5.67.0/debian/control 2020-02-08 09:48:59.000000000 +0000 +++ kded-5.68.0/debian/control 2020-03-25 20:56:32.000000000 +0000 @@ -5,14 +5,14 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 3.0~), debhelper (>= 11~), - extra-cmake-modules (>= 5.67.0~), - kinit-dev (>= 5.67.0~), - libkf5config-dev (>= 5.67.0~), - libkf5coreaddons-dev (>= 5.67.0~), - libkf5crash-dev (>= 5.67.0~), - libkf5dbusaddons-dev (>= 5.67.0~), - libkf5doctools-dev (>= 5.67.0~), - libkf5service-dev (>= 5.67.0~), + extra-cmake-modules (>= 5.68.0~), + kinit-dev (>= 5.68.0~), + libkf5config-dev (>= 5.68.0~), + libkf5coreaddons-dev (>= 5.68.0~), + libkf5crash-dev (>= 5.68.0~), + libkf5dbusaddons-dev (>= 5.68.0~), + libkf5doctools-dev (>= 5.68.0~), + libkf5service-dev (>= 5.68.0~), pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.8.0~), Standards-Version: 4.1.4 @@ -31,10 +31,10 @@ Architecture: any Section: libdevel Depends: kded5 (= ${binary:Version}), - libkf5coreaddons-dev (>= 5.67.0~), - libkf5crash-dev (>= 5.67.0~), - libkf5dbusaddons-dev (>= 5.67.0~), - libkf5service-dev (>= 5.67.0~), + libkf5coreaddons-dev (>= 5.68.0~), + libkf5crash-dev (>= 5.68.0~), + libkf5dbusaddons-dev (>= 5.68.0~), + libkf5service-dev (>= 5.68.0~), ${misc:Depends}, Description: Extensible daemon for providing session services KDED runs in the background and performs a number of small tasks. diff -Nru kded-5.67.0/.gitignore kded-5.68.0/.gitignore --- kded-5.67.0/.gitignore 2020-02-02 12:46:22.000000000 +0000 +++ kded-5.68.0/.gitignore 2020-03-07 09:39:03.000000000 +0000 @@ -19,3 +19,4 @@ /build*/ CMakeLists.txt.user* *.unc-backup* +.cmake/ diff -Nru kded-5.67.0/kded.categories kded-5.68.0/kded.categories --- kded-5.67.0/kded.categories 2020-02-02 12:46:22.000000000 +0000 +++ kded-5.68.0/kded.categories 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -kf5.kded KDED DEFAULT_SEVERITY [WARNING] IDENTIFIER [KDED] diff -Nru kded-5.67.0/src/CMakeLists.txt kded-5.68.0/src/CMakeLists.txt --- kded-5.67.0/src/CMakeLists.txt 2020-02-02 12:46:22.000000000 +0000 +++ kded-5.68.0/src/CMakeLists.txt 2020-03-07 09:39:03.000000000 +0000 @@ -2,6 +2,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kded5.xml # just so that it gets generated ) +ecm_qt_export_logging_category( + IDENTIFIER KDED + CATEGORY_NAME kf5.kded + DEFAULT_SEVERITY Warning + DESCRIPTION "KDED" + EXPORT KDED +) + add_executable(kded5 ${kded_SRCS}) ecm_mark_nongui_executable(kded5) @@ -28,3 +36,9 @@ kdbusaddons_generate_dbus_service_file(kded5 org.kde.kded5 ${KDE_INSTALL_FULL_BINDIR}) install( FILES kdedmodule.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR} ) + +ecm_qt_install_logging_categories( + EXPORT KDED + FILE kded.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} +) diff -Nru kded-5.67.0/src/kded.cpp kded-5.68.0/src/kded.cpp --- kded-5.67.0/src/kded.cpp 2020-02-02 12:46:22.000000000 +0000 +++ kded-5.68.0/src/kded.cpp 2020-03-07 09:39:03.000000000 +0000 @@ -751,6 +751,8 @@ parser.addHelpOption(); parser.addVersionOption(); parser.addOption(QCommandLineOption(QStringLiteral("check"), QStringLiteral("Check cache validity"))); + QCommandLineOption replaceOption({QStringLiteral("replace")}, QStringLiteral("Replace an existing instance")); + parser.addOption(replaceOption); parser.process(app); // Parse command line before checking D-Bus @@ -761,7 +763,7 @@ return 0; } - KDBusService service(KDBusService::Unique); + KDBusService service(KDBusService::Unique | KDBusService::StartupOption(parser.isSet(replaceOption) ? KDBusService::Replace : 0)); QDBusConnectionInterface *bus = QDBusConnection::sessionBus().interface(); // Also register as all the names we should respond to (org.kde.kcookiejar, org.kde.khotkeys etc.)