Hello community, here is the log from the commit of package kidletime for openSUSE:Factory checked in at 2018-06-22 13:20:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kidletime (Old) and /work/SRC/openSUSE:Factory/.kidletime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kidletime" Fri Jun 22 13:20:37 2018 rev:54 rq:616765 version:5.47.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kidletime/kidletime.changes 2018-05-18 14:21:41.624043991 +0200 +++ /work/SRC/openSUSE:Factory/.kidletime.new/kidletime.changes 2018-06-22 13:20:39.799291814 +0200 @@ -1,0 +2,13 @@ +Tue Jun 12 21:35:07 UTC 2018 - [email protected] + +- Update to 5.47.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.47.0.php +- Changes since 5.46.0: + * Add categories file + * Generate logging categories + * Add missing override + * Use override + +------------------------------------------------------------------- Old: ---- kidletime-5.46.0.tar.xz New: ---- kidletime-5.47.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kidletime.spec ++++++ --- /var/tmp/diff_new_pack.1uqi9i/_old 2018-06-22 13:20:40.527264916 +0200 +++ /var/tmp/diff_new_pack.1uqi9i/_new 2018-06-22 13:20:40.531264768 +0200 @@ -17,13 +17,13 @@ %define lname libKF5IdleTime5 -%define _tar_path 5.46 +%define _tar_path 5.47 # 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: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kidletime -Version: 5.46.0 +Version: 5.47.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} @@ -98,6 +98,7 @@ %dir %{_kf5_plugindir}/kf5/org.kde.kidletime.platforms %{_kf5_plugindir}/kf5/org.kde.kidletime.platforms/KF5IdleTimeXcbPlugin0.so %{_kf5_plugindir}/kf5/org.kde.kidletime.platforms/KF5IdleTimeXcbPlugin1.so +%{_kf5_debugdir}/kidletime.categories %files devel %defattr(-,root,root) ++++++ kidletime-5.46.0.tar.xz -> kidletime-5.47.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.46.0/CMakeLists.txt new/kidletime-5.47.0/CMakeLists.txt --- old/kidletime-5.46.0/CMakeLists.txt 2018-05-05 14:39:07.000000000 +0200 +++ new/kidletime-5.47.0/CMakeLists.txt 2018-06-02 18:28:18.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.47.0") # handled by release scripts project(KIdleTime VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.47.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) @@ -15,6 +15,7 @@ include(CMakeFindFrameworks) include(GenerateExportHeader) include(CMakePackageConfigHelpers) +include(ECMQtDeclareLoggingCategory) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMAddQch) @@ -108,4 +109,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kidletime_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel) + +install( FILES kidletime.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.46.0/kidletime.categories new/kidletime-5.47.0/kidletime.categories --- old/kidletime-5.46.0/kidletime.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/kidletime-5.47.0/kidletime.categories 2018-06-02 18:28:18.000000000 +0200 @@ -0,0 +1,3 @@ +org.kde.kf5.idletime.xsync xsync plugin +org.kde.kf5.idletime idletime (lib) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.46.0/src/CMakeLists.txt new/kidletime-5.47.0/src/CMakeLists.txt --- old/kidletime-5.46.0/src/CMakeLists.txt 2018-05-05 14:39:07.000000000 +0200 +++ new/kidletime-5.47.0/src/CMakeLists.txt 2018-06-02 18:28:18.000000000 +0200 @@ -3,12 +3,14 @@ configure_file(config-kidletime.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kidletime.h ) set(kidletime_LIB_SRCS - logging.cpp kidletime.cpp abstractsystempoller.cpp widgetbasedpoller.cpp # TODO: make optional, to avoid always depending on QtWidgets? Or port to QtGui? ) +ecm_qt_declare_logging_category(kidletime_LIB_SRCS HEADER logging.h IDENTIFIER KIDLETIME CATEGORY_NAME org.kde.kf5.idletime) + + set(kidletime_LIBS) add_library(KF5IdleTime ${kidletime_LIB_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.46.0/src/logging.cpp new/kidletime-5.47.0/src/logging.cpp --- old/kidletime-5.46.0/src/logging.cpp 2018-05-05 14:39:07.000000000 +0200 +++ new/kidletime-5.47.0/src/logging.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2015 Martin Gräßlin <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#include "logging.h" - -// logging category for this framework, default: log stuff >= warning -Q_LOGGING_CATEGORY(KIDLETIME, "org.kde.kf5.idletime", QtWarningMsg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.46.0/src/logging.h new/kidletime-5.47.0/src/logging.h --- old/kidletime-5.46.0/src/logging.h 2018-05-05 14:39:07.000000000 +0200 +++ new/kidletime-5.47.0/src/logging.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (C) 2015 Martin Gräßlin <[email protected]> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -#ifndef LOGGING_H -#define LOGGING_H -#include <QDebug> -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY(KIDLETIME) - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.46.0/src/plugins/xscreensaver/xscreensaverbasedpoller.h new/kidletime-5.47.0/src/plugins/xscreensaver/xscreensaverbasedpoller.h --- old/kidletime-5.46.0/src/plugins/xscreensaver/xscreensaverbasedpoller.h 2018-05-05 14:39:07.000000000 +0200 +++ new/kidletime-5.47.0/src/plugins/xscreensaver/xscreensaverbasedpoller.h 2018-06-02 18:28:18.000000000 +0200 @@ -30,18 +30,18 @@ Q_INTERFACES(AbstractSystemPoller) public: - XScreensaverBasedPoller(QObject *parent = nullptr); - virtual ~XScreensaverBasedPoller(); + explicit XScreensaverBasedPoller(QObject *parent = nullptr); + ~XScreensaverBasedPoller() override; public Q_SLOTS: - void simulateUserActivity() Q_DECL_OVERRIDE; + void simulateUserActivity() override; private: - bool additionalSetUp() Q_DECL_OVERRIDE; + bool additionalSetUp() override; private Q_SLOTS: void screensaverActivated(bool activated); - int getIdleTime() Q_DECL_OVERRIDE; + int getIdleTime() override; private: OrgFreedesktopScreenSaverInterface *m_screenSaverIface; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.46.0/src/plugins/xsync/CMakeLists.txt new/kidletime-5.47.0/src/plugins/xsync/CMakeLists.txt --- old/kidletime-5.46.0/src/plugins/xsync/CMakeLists.txt 2018-05-05 14:39:07.000000000 +0200 +++ new/kidletime-5.47.0/src/plugins/xsync/CMakeLists.txt 2018-06-02 18:28:18.000000000 +0200 @@ -5,6 +5,8 @@ ../../logging.cpp ) +ecm_qt_declare_logging_category(xsync_plugin_SRCS HEADER xsync_logging.h IDENTIFIER KIDLETIME_XSYNC_PLUGIN CATEGORY_NAME org.kde.kf5.idletime.xsync) + add_library(KF5IdleTimeXcbPlugin0 MODULE ${xsync_plugin_SRCS}) target_link_libraries(KF5IdleTimeXcbPlugin0 KF5IdleTime diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.46.0/src/plugins/xsync/xsyncbasedpoller.cpp new/kidletime-5.47.0/src/plugins/xsync/xsyncbasedpoller.cpp --- old/kidletime-5.46.0/src/plugins/xsync/xsyncbasedpoller.cpp 2018-05-05 14:39:07.000000000 +0200 +++ new/kidletime-5.47.0/src/plugins/xsync/xsyncbasedpoller.cpp 2018-06-02 18:28:18.000000000 +0200 @@ -19,7 +19,7 @@ // Exceptionnally, include QCoreApplication before our own header, because that one includes X11 headers (#define None...) #include <QCoreApplication> -#include "../../logging.h" +#include "xsync_logging.h" #include "xsyncbasedpoller.h" @@ -72,7 +72,7 @@ if (Q_UNLIKELY(!m_display)) { m_available = false; - qCWarning(KIDLETIME) << "xcb sync could not find display"; + qCWarning(KIDLETIME_XSYNC_PLUGIN) << "xcb sync could not find display"; return; } m_xcb_connection = XGetXCBConnection(m_display); @@ -81,7 +81,7 @@ const xcb_query_extension_reply_t *sync_reply = xcb_get_extension_data(m_xcb_connection, &xcb_sync_id); if (!sync_reply || !sync_reply->present) { - qCWarning(KIDLETIME) << "xcb sync extension not found"; + qCWarning(KIDLETIME_XSYNC_PLUGIN) << "xcb sync extension not found"; m_available = false; return; } @@ -108,10 +108,10 @@ int xcbcounters = xcb_sync_list_system_counters_counters_length(reply); xcb_sync_systemcounter_iterator_t it = xcb_sync_list_system_counters_counters_iterator(reply); for (int i = 0; i < xcbcounters; ++i) { - qCDebug(KIDLETIME) << it.data->counter << it.rem << it.index; - qCDebug(KIDLETIME) << "name length" << xcb_sync_systemcounter_name_length(it.data); + qCDebug(KIDLETIME_XSYNC_PLUGIN) << it.data->counter << it.rem << it.index; + qCDebug(KIDLETIME_XSYNC_PLUGIN) << "name length" << xcb_sync_systemcounter_name_length(it.data); QByteArray name(xcb_sync_systemcounter_name(it.data), xcb_sync_systemcounter_name_length(it.data)); - qCDebug(KIDLETIME) << name; + qCDebug(KIDLETIME_XSYNC_PLUGIN) << name; xcb_sync_systemcounter_next(&it); } delete reply; @@ -134,9 +134,9 @@ bool idleFound = false; - qCDebug(KIDLETIME) << ncounters << "counters"; + qCDebug(KIDLETIME_XSYNC_PLUGIN) << ncounters << "counters"; for (int i = 0; i < ncounters; ++i) { - qCDebug(KIDLETIME) << counters[i].name << counters[i].counter; + qCDebug(KIDLETIME_XSYNC_PLUGIN) << counters[i].name << counters[i].counter; if (!strcmp(counters[i].name, "IDLETIME")) { m_idleCounter = counters[i].counter; idleFound = true; @@ -151,9 +151,9 @@ } if (m_available) { - qCDebug(KIDLETIME) << "XSync seems available and ready"; + qCDebug(KIDLETIME_XSYNC_PLUGIN) << "XSync seems available and ready"; } else { - qCDebug(KIDLETIME) << "XSync seems not available"; + qCDebug(KIDLETIME_XSYNC_PLUGIN) << "XSync seems not available"; } } @@ -172,11 +172,11 @@ return false; } - qCDebug(KIDLETIME) << "XSync Inited"; + qCDebug(KIDLETIME_XSYNC_PLUGIN) << "XSync Inited"; s_globalXSyncBasedPoller()->isActive = true; - qCDebug(KIDLETIME) << "Supported, init completed"; + qCDebug(KIDLETIME_XSYNC_PLUGIN) << "Supported, init completed"; return true; } @@ -278,7 +278,7 @@ bool XSyncBasedPoller::xcbEvent(xcb_generic_event_t *event) { - // qCDebug(KIDLETIME) << event->response_type << "waiting for" << m_sync_event+XCB_SYNC_ALARM_NOTIFY; + // qCDebug(KIDLETIME_XSYNC_PLUGIN) << event->response_type << "waiting for" << m_sync_event+XCB_SYNC_ALARM_NOTIFY; if (event->response_type != m_sync_event + XCB_SYNC_ALARM_NOTIFY) { return false; } @@ -332,7 +332,7 @@ XSyncChangeAlarm(dpy, *alarm, flags, &attr); } else { *alarm = XSyncCreateAlarm(dpy, flags, &attr); - qCDebug(KIDLETIME) << "Created alarm" << *alarm; + qCDebug(KIDLETIME_XSYNC_PLUGIN) << "Created alarm" << *alarm; } XFlush(m_display); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.46.0/src/plugins/xsync/xsyncbasedpoller.h new/kidletime-5.47.0/src/plugins/xsync/xsyncbasedpoller.h --- old/kidletime-5.46.0/src/plugins/xsync/xsyncbasedpoller.h 2018-05-05 14:39:07.000000000 +0200 +++ new/kidletime-5.47.0/src/plugins/xsync/xsyncbasedpoller.h 2018-06-02 18:28:18.000000000 +0200 @@ -39,23 +39,23 @@ public: static XSyncBasedPoller *instance(); - XSyncBasedPoller(QObject *parent = nullptr); - virtual ~XSyncBasedPoller(); + explicit XSyncBasedPoller(QObject *parent = nullptr); + ~XSyncBasedPoller() override; - bool isAvailable() Q_DECL_OVERRIDE; - bool setUpPoller() Q_DECL_OVERRIDE; - void unloadPoller() Q_DECL_OVERRIDE; + bool isAvailable() override; + bool setUpPoller() override; + void unloadPoller() override; bool xcbEvent(xcb_generic_event_t *event); public Q_SLOTS: - void addTimeout(int nextTimeout) Q_DECL_OVERRIDE; - void removeTimeout(int nextTimeout) Q_DECL_OVERRIDE; - QList<int> timeouts() const Q_DECL_OVERRIDE; - int forcePollRequest() Q_DECL_OVERRIDE; - void catchIdleEvent() Q_DECL_OVERRIDE; - void stopCatchingIdleEvents() Q_DECL_OVERRIDE; - void simulateUserActivity() Q_DECL_OVERRIDE; + void addTimeout(int nextTimeout) override; + void removeTimeout(int nextTimeout) override; + QList<int> timeouts() const override; + int forcePollRequest() override; + void catchIdleEvent() override; + void stopCatchingIdleEvents() override; + void simulateUserActivity() override; private Q_SLOTS: int poll(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.46.0/src/widgetbasedpoller.h new/kidletime-5.47.0/src/widgetbasedpoller.h --- old/kidletime-5.46.0/src/widgetbasedpoller.h 2018-05-05 14:39:07.000000000 +0200 +++ new/kidletime-5.47.0/src/widgetbasedpoller.h 2018-06-02 18:28:18.000000000 +0200 @@ -31,23 +31,23 @@ Q_OBJECT public: - WidgetBasedPoller(QObject *parent = nullptr); - virtual ~WidgetBasedPoller(); + explicit WidgetBasedPoller(QObject *parent = nullptr); + ~WidgetBasedPoller() override; - bool isAvailable() Q_DECL_OVERRIDE; - bool setUpPoller() Q_DECL_OVERRIDE; - void unloadPoller() Q_DECL_OVERRIDE; + bool isAvailable() override; + bool setUpPoller() override; + void unloadPoller() override; protected: - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; public Q_SLOTS: - void addTimeout(int nextTimeout) Q_DECL_OVERRIDE; - void removeTimeout(int nextTimeout) Q_DECL_OVERRIDE; - QList<int> timeouts() const Q_DECL_OVERRIDE; - int forcePollRequest() Q_DECL_OVERRIDE; - void catchIdleEvent() Q_DECL_OVERRIDE; - void stopCatchingIdleEvents() Q_DECL_OVERRIDE; + void addTimeout(int nextTimeout) override; + void removeTimeout(int nextTimeout) override; + QList<int> timeouts() const override; + int forcePollRequest() override; + void catchIdleEvent() override; + void stopCatchingIdleEvents() override; private Q_SLOTS: int poll();
