Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kidletime for openSUSE:Factory checked in at 2021-06-16 20:33:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kidletime (Old) and /work/SRC/openSUSE:Factory/.kidletime.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kidletime" Wed Jun 16 20:33:58 2021 rev:91 rq:899740 version:5.83.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kidletime/kidletime.changes 2021-05-10 15:37:11.438084154 +0200 +++ /work/SRC/openSUSE:Factory/.kidletime.new.32437/kidletime.changes 2021-06-16 20:35:32.687192248 +0200 @@ -1,0 +2,11 @@ +Sat Jun 5 11:58:54 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.83.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.83.0 +- Changes since 5.82.0: + * Bump required CMake version to 3.16 + * add std::chrono overload for addIdleTimeout + +------------------------------------------------------------------- Old: ---- kidletime-5.82.0.tar.xz kidletime-5.82.0.tar.xz.sig New: ---- kidletime-5.83.0.tar.xz kidletime-5.83.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kidletime.spec ++++++ --- /var/tmp/diff_new_pack.72NUGO/_old 2021-06-16 20:35:33.131193006 +0200 +++ /var/tmp/diff_new_pack.72NUGO/_new 2021-06-16 20:35:33.135193012 +0200 @@ -17,7 +17,7 @@ %define lname libKF5IdleTime5 -%define _tar_path 5.82 +%define _tar_path 5.83 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kidletime -Version: 5.82.0 +Version: 5.83.0 Release: 0 Summary: User and system idle time reporting singleton License: LGPL-2.1-or-later ++++++ kidletime-5.82.0.tar.xz -> kidletime-5.83.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/.gitignore new/kidletime-5.83.0/.gitignore --- old/kidletime-5.82.0/.gitignore 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/.gitignore 2021-06-05 10:55:19.000000000 +0200 @@ -25,3 +25,4 @@ .clangd .idea /cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/CMakeLists.txt new/kidletime-5.83.0/CMakeLists.txt --- old/kidletime-5.82.0/CMakeLists.txt 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/CMakeLists.txt 2021-06-05 10:55:19.000000000 +0200 @@ -1,11 +1,11 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.82.0") # handled by release scripts +set(KF_VERSION "5.83.0") # handled by release scripts project(KIdleTime VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.82.0 NO_MODULE) +find_package(ECM 5.83.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) @@ -79,7 +79,6 @@ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") -add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) # Subdirectories add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/examples/CMakeLists.txt new/kidletime-5.83.0/examples/CMakeLists.txt --- old/kidletime-5.82.0/examples/CMakeLists.txt 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/examples/CMakeLists.txt 2021-06-05 10:55:19.000000000 +0200 @@ -1,3 +1,2 @@ -set(kidletime_example_SRCS main.cpp KIdleTest.cpp) -add_executable(kidletime_example ${kidletime_example_SRCS}) +add_executable(kidletime_example main.cpp KIdleTest.cpp) target_link_libraries(kidletime_example KF5::IdleTime Qt5::Gui) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/examples/KIdleTest.cpp new/kidletime-5.83.0/examples/KIdleTest.cpp --- old/kidletime-5.82.0/examples/KIdleTest.cpp 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/examples/KIdleTest.cpp 2021-06-05 10:55:19.000000000 +0200 @@ -14,7 +14,7 @@ { // connect to idle events connect(KIdleTime::instance(), &KIdleTime::resumingFromIdle, this, &KIdleTest::resumeEvent); - connect(KIdleTime::instance(), SIGNAL(timeoutReached(int, int)), this, SLOT(timeoutReached(int, int))); + connect(KIdleTime::instance(), QOverload<int, int>::of(&KIdleTime::timeoutReached), this, &KIdleTest::timeoutReached); // register to get informed for the very next user event KIdleTime::instance()->catchNextResumeEvent(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/src/CMakeLists.txt new/kidletime-5.83.0/src/CMakeLists.txt --- old/kidletime-5.82.0/src/CMakeLists.txt 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/src/CMakeLists.txt 2021-06-05 10:55:19.000000000 +0200 @@ -1,14 +1,15 @@ -######## kidletime #################### - configure_file(config-kidletime.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kidletime.h ) -set(kidletime_LIB_SRCS +add_library(KF5IdleTime) +add_library(KF5::IdleTime ALIAS KF5IdleTime) + +target_sources(KF5IdleTime PRIVATE kidletime.cpp abstractsystempoller.cpp widgetbasedpoller.cpp # TODO it doesn't actually use widgets, just GUI. Rename? ) -ecm_qt_declare_logging_category(kidletime_LIB_SRCS +ecm_qt_declare_logging_category(KF5IdleTime HEADER logging.h IDENTIFIER KIDLETIME CATEGORY_NAME kf.idletime @@ -17,7 +18,6 @@ EXPORT KIDLETIME ) -add_library(KF5IdleTime ${kidletime_LIB_SRCS}) ecm_generate_export_header(KF5IdleTime BASE_NAME KIdleTime GROUP_BASE_NAME KF @@ -26,13 +26,12 @@ DEPRECATION_VERSIONS 5.76 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -add_library(KF5::IdleTime ALIAS KF5IdleTime) target_include_directories(KF5IdleTime INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIdleTime>") target_link_libraries(KF5IdleTime PUBLIC Qt5::Core) target_link_libraries(KF5IdleTime PRIVATE Qt5::Gui) -set_target_properties(KF5IdleTime PROPERTIES VERSION ${KIDLETIME_VERSION_STRING} +set_target_properties(KF5IdleTime PROPERTIES VERSION ${KIDLETIME_VERSION} SOVERSION ${KIDLETIME_SOVERSION} EXPORT_NAME IdleTime ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/src/kidletime.cpp new/kidletime-5.83.0/src/kidletime.cpp --- old/kidletime-5.82.0/src/kidletime.cpp 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/src/kidletime.cpp 2021-06-05 10:55:19.000000000 +0200 @@ -59,8 +59,8 @@ void loadSystem(); void unloadCurrentSystem(); - void _k_resumingFromIdle(); - void _k_timeoutReached(int msec); + void resumingFromIdle(); + void timeoutReached(int msec); QPointer<AbstractSystemPoller> poller; bool catchResume; @@ -81,8 +81,12 @@ Q_D(KIdleTime); d->loadSystem(); - connect(d->poller.data(), SIGNAL(resumingFromIdle()), this, SLOT(_k_resumingFromIdle())); - connect(d->poller.data(), SIGNAL(timeoutReached(int)), this, SLOT(_k_timeoutReached(int))); + connect(d->poller.data(), &AbstractSystemPoller::resumingFromIdle, this, [d]() { + d->resumingFromIdle(); + }); + connect(d->poller.data(), &AbstractSystemPoller::timeoutReached, this, [d](int msec) { + d->timeoutReached(msec); + }); } KIdleTime::~KIdleTime() @@ -257,7 +261,7 @@ } } -void KIdleTimePrivate::_k_resumingFromIdle() +void KIdleTimePrivate::resumingFromIdle() { Q_Q(KIdleTime); @@ -267,7 +271,7 @@ } } -void KIdleTimePrivate::_k_timeoutReached(int msec) +void KIdleTimePrivate::timeoutReached(int msec) { Q_Q(KIdleTime); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/src/kidletime.h new/kidletime-5.83.0/src/kidletime.h --- old/kidletime-5.82.0/src/kidletime.h 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/src/kidletime.h 2021-06-05 10:55:19.000000000 +0200 @@ -1,5 +1,6 @@ /* This file is part of the KDE libraries * SPDX-FileCopyrightText: 2009 Dario Freddi <drf at kde.org> + * SPDX-FileCopyrightText: 2021 Harald Sitter <sit...@kde.org> * * SPDX-License-Identifier: LGPL-2.0-only */ @@ -12,6 +13,10 @@ #include <kidletime_export.h> #include <memory> +#if __has_include(<chrono>) +#include <chrono> +#endif + class KIdleTimePrivate; /** @@ -92,6 +97,17 @@ */ int addIdleTimeout(int msec); +#if __has_include(<chrono>) + /** + * Convenience overload suporting C++ chrono types. May also be used with chrono literals. + * @since 5.83 + */ + int addIdleTimeout(std::chrono::milliseconds msec) + { + return addIdleTimeout(int(msec.count())); + } +#endif + /** * Stops catching the idle timeout identified by the token \c identifier, * if it was registered earlier with addIdleTimeout. @@ -186,9 +202,6 @@ KIdleTime(); std::unique_ptr<KIdleTimePrivate> const d_ptr; - - Q_PRIVATE_SLOT(d_func(), void _k_resumingFromIdle()) - Q_PRIVATE_SLOT(d_func(), void _k_timeoutReached(int)) }; #endif /* KIDLETIME_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/src/plugins/osx/CMakeLists.txt new/kidletime-5.83.0/src/plugins/osx/CMakeLists.txt --- old/kidletime-5.82.0/src/plugins/osx/CMakeLists.txt 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/src/plugins/osx/CMakeLists.txt 2021-06-05 10:55:19.000000000 +0200 @@ -1,8 +1,9 @@ -set(osx_plugin_SRCS +add_library(KF5IdleTimeOsxPlugin MODULE) + +target_sources(KF5IdleTimeOsxPlugin PRIVATE macpoller.cpp ) -add_library(KF5IdleTimeOsxPlugin MODULE ${osx_plugin_SRCS}) target_link_libraries(KF5IdleTimeOsxPlugin KF5IdleTime "-framework CoreFoundation -framework Carbon" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/src/plugins/windows/CMakeLists.txt new/kidletime-5.83.0/src/plugins/windows/CMakeLists.txt --- old/kidletime-5.82.0/src/plugins/windows/CMakeLists.txt 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/src/plugins/windows/CMakeLists.txt 2021-06-05 10:55:19.000000000 +0200 @@ -1,8 +1,9 @@ -set(windows_plugin_SRCS +add_library(KF5IdleTimeWindowsPlugin MODULE) + +target_sources(KF5IdleTimeWindowsPlugin PRIVATE windowspoller.cpp ) -add_library(KF5IdleTimeWindowsPlugin MODULE ${windows_plugin_SRCS}) target_link_libraries(KF5IdleTimeWindowsPlugin KF5IdleTime ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/src/plugins/windows/windowspoller.cpp new/kidletime-5.83.0/src/plugins/windows/windowspoller.cpp --- old/kidletime-5.82.0/src/plugins/windows/windowspoller.cpp 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/src/plugins/windows/windowspoller.cpp 2021-06-05 10:55:19.000000000 +0200 @@ -43,7 +43,7 @@ bool WindowsPoller::additionalSetUp() { m_idleTimer = new QTimer(this); - connect(m_idleTimer, SIGNAL(timeout()), this, SLOT(checkForIdle())); + connect(m_idleTimer, &QTimer::timeout, this, &WindowsPoller::checkForIdle); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/src/plugins/xscreensaver/CMakeLists.txt new/kidletime-5.83.0/src/plugins/xscreensaver/CMakeLists.txt --- old/kidletime-5.82.0/src/plugins/xscreensaver/CMakeLists.txt 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/src/plugins/xscreensaver/CMakeLists.txt 2021-06-05 10:55:19.000000000 +0200 @@ -1,10 +1,13 @@ -set(xscreensaver_plugin_SRCS +add_library(KF5IdleTimeXcbPlugin1 MODULE) + +set(xscreensaver_plugin_dbus_SRCS) +qt_add_dbus_interface(xscreensaver_plugin_dbus_SRCS org.freedesktop.ScreenSaver.xml screensaver_interface) + +target_sources(KF5IdleTimeXcbPlugin1 PRIVATE xscreensaverbasedpoller.cpp + ${xscreensaver_plugin_dbus_SRCS} ) -qt5_add_dbus_interface(xscreensaver_plugin_SRCS org.freedesktop.ScreenSaver.xml screensaver_interface) - -add_library(KF5IdleTimeXcbPlugin1 MODULE ${xscreensaver_plugin_SRCS}) target_link_libraries(KF5IdleTimeXcbPlugin1 KF5IdleTime Qt5::DBus @@ -19,4 +22,3 @@ DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/org.kde.kidletime.platforms/ ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp new/kidletime-5.83.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp --- old/kidletime-5.82.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp 2021-06-05 10:55:19.000000000 +0200 @@ -30,7 +30,7 @@ QDBusConnection::sessionBus(), this); - connect(m_screenSaverIface, SIGNAL(ActiveChanged(bool)), SLOT(screensaverActivated(bool))); + connect(m_screenSaverIface, &OrgFreedesktopScreenSaverInterface::ActiveChanged, this, &XScreensaverBasedPoller::screensaverActivated); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.82.0/src/plugins/xsync/CMakeLists.txt new/kidletime-5.83.0/src/plugins/xsync/CMakeLists.txt --- old/kidletime-5.82.0/src/plugins/xsync/CMakeLists.txt 2021-05-01 11:42:04.000000000 +0200 +++ new/kidletime-5.83.0/src/plugins/xsync/CMakeLists.txt 2021-06-05 10:55:19.000000000 +0200 @@ -1,11 +1,17 @@ -include_directories( ${XCB_XCB_INCLUDE_DIR} ${XCB_SYNC_INCLUDE_DIR}) +add_library(KF5IdleTimeXcbPlugin0 MODULE) -set(xsync_plugin_SRCS +target_include_directories(KF5IdleTimeXcbPlugin0 + PRIVATE + ${XCB_XCB_INCLUDE_DIR} + ${XCB_SYNC_INCLUDE_DIR} +) + +target_sources(KF5IdleTimeXcbPlugin0 PRIVATE xsyncbasedpoller.cpp ../../logging.cpp ) -ecm_qt_declare_logging_category(xsync_plugin_SRCS +ecm_qt_declare_logging_category(KF5IdleTimeXcbPlugin0 HEADER xsync_logging.h IDENTIFIER KIDLETIME_XSYNC_PLUGIN CATEGORY_NAME kf.idletime.xsync @@ -14,7 +20,6 @@ EXPORT KIDLETIME ) -add_library(KF5IdleTimeXcbPlugin0 MODULE ${xsync_plugin_SRCS}) target_link_libraries(KF5IdleTimeXcbPlugin0 KF5IdleTime Qt5::X11Extras
