Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kidletime for openSUSE:Factory checked in at 2022-04-11 23:47:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kidletime (Old) and /work/SRC/openSUSE:Factory/.kidletime.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kidletime" Mon Apr 11 23:47:14 2022 rev:102 rq:968169 version:5.93.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kidletime/kidletime.changes 2022-04-02 18:20:14.370477855 +0200 +++ /work/SRC/openSUSE:Factory/.kidletime.new.1900/kidletime.changes 2022-04-11 23:48:34.803525371 +0200 @@ -1,0 +2,13 @@ +Sun Apr 3 10:47:15 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.93.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.93.0 +- Changes since 5.92.0: + * Fixed crash during KIdleTime::timeoutReached() (kde#451946) + * Use nativeInterface to access the x11 display +- Drop patch, fixed upstream: + * 0001-Fixed-crash-during-KIdleTime-timeoutReached.patch + +------------------------------------------------------------------- Old: ---- 0001-Fixed-crash-during-KIdleTime-timeoutReached.patch kidletime-5.92.0.tar.xz kidletime-5.92.0.tar.xz.sig New: ---- kidletime-5.93.0.tar.xz kidletime-5.93.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kidletime.spec ++++++ --- /var/tmp/diff_new_pack.Zyp7m4/_old 2022-04-11 23:48:35.455517918 +0200 +++ /var/tmp/diff_new_pack.Zyp7m4/_new 2022-04-11 23:48:35.459517872 +0200 @@ -17,7 +17,7 @@ %define lname libKF5IdleTime5 -%define _tar_path 5.92 +%define _tar_path 5.93 # 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 released Name: kidletime -Version: 5.92.0 +Version: 5.93.0 Release: 0 Summary: User and system idle time reporting singleton License: LGPL-2.1-or-later @@ -36,8 +36,6 @@ Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -# PATCH-FIX-UPSTREAM -Patch0: 0001-Fixed-crash-during-KIdleTime-timeoutReached.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem ++++++ kidletime-5.92.0.tar.xz -> kidletime-5.93.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.92.0/CMakeLists.txt new/kidletime-5.93.0/CMakeLists.txt --- old/kidletime-5.92.0/CMakeLists.txt 2022-03-05 12:14:51.000000000 +0100 +++ new/kidletime-5.93.0/CMakeLists.txt 2022-04-02 12:00:01.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.92.0") # handled by release scripts +set(KF_VERSION "5.93.0") # handled by release scripts project(KIdleTime VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.92.0 NO_MODULE) +find_package(ECM 5.93.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) @@ -46,8 +46,6 @@ if(X11_FOUND) if (QT_MAJOR_VERSION STREQUAL "5") find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) - else() - # qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above endif() find_package(XCB COMPONENTS XCB SYNC) find_package(X11_XCB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.92.0/src/kidletime.cpp new/kidletime-5.93.0/src/kidletime.cpp --- old/kidletime-5.92.0/src/kidletime.cpp 2022-03-05 12:14:51.000000000 +0100 +++ new/kidletime-5.93.0/src/kidletime.cpp 2022-04-02 12:00:01.000000000 +0200 @@ -288,13 +288,13 @@ { Q_Q(KIdleTime); - for (auto it = associations.cbegin(); it != associations.cend(); ++it) { - if (it.value() == msec) { + const auto listKeys = associations.keys(msec); + + for (const auto key : listKeys) { #if KIDLETIME_BUILD_DEPRECATED_SINCE(5, 76) - Q_EMIT q->timeoutReached(it.key()); + Q_EMIT q->timeoutReached(key); #endif - Q_EMIT q->timeoutReached(it.key(), msec); - } + Q_EMIT q->timeoutReached(key, msec); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.92.0/src/plugins/xscreensaver/CMakeLists.txt new/kidletime-5.93.0/src/plugins/xscreensaver/CMakeLists.txt --- old/kidletime-5.92.0/src/plugins/xscreensaver/CMakeLists.txt 2022-03-05 12:14:51.000000000 +0100 +++ new/kidletime-5.93.0/src/plugins/xscreensaver/CMakeLists.txt 2022-04-02 12:00:01.000000000 +0200 @@ -18,7 +18,7 @@ if (TARGET Qt5::X11Extras) target_link_libraries(KF5IdleTimeXcbPlugin1 Qt5::X11Extras) elseif (TARGET Qt6::Gui) - target_link_libraries(KF5IdleTimeXcbPlugin1 Qt6::GuiPrivate) # qtx11extras_p.h + target_link_libraries(KF5IdleTimeXcbPlugin1 Qt6::Gui) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.92.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp new/kidletime-5.93.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp --- old/kidletime-5.92.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp 2022-03-05 12:14:51.000000000 +0100 +++ new/kidletime-5.93.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp 2022-04-02 12:00:01.000000000 +0200 @@ -9,7 +9,7 @@ #include <config-kidletime.h> #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -#include <private/qtx11extras_p.h> +#include <QGuiApplication> #else #include <QX11Info> #endif @@ -17,6 +17,15 @@ #include <X11/Xlib.h> #include <X11/extensions/scrnsaver.h> +static Display *display() +{ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + return QX11Info::display(); +#else + return qGuiApp->nativeInterface<QNativeInterface::QX11Application>()->display(); +#endif +} + XScreensaverBasedPoller::XScreensaverBasedPoller(QObject *parent) : WidgetBasedPoller(parent) , m_screenSaverIface(nullptr) @@ -53,7 +62,7 @@ { XScreenSaverInfo *mitInfo = nullptr; mitInfo = XScreenSaverAllocInfo(); - XScreenSaverQueryInfo(QX11Info::display(), DefaultRootWindow(QX11Info::display()), mitInfo); + XScreenSaverQueryInfo(display(), DefaultRootWindow(display()), mitInfo); int ret = mitInfo->idle; XFree(mitInfo); return ret; @@ -62,6 +71,6 @@ void XScreensaverBasedPoller::simulateUserActivity() { stopCatchingIdleEvents(); - XResetScreenSaver(QX11Info::display()); - XFlush(QX11Info::display()); + XResetScreenSaver(display()); + XFlush(display()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.92.0/src/plugins/xsync/CMakeLists.txt new/kidletime-5.93.0/src/plugins/xsync/CMakeLists.txt --- old/kidletime-5.92.0/src/plugins/xsync/CMakeLists.txt 2022-03-05 12:14:51.000000000 +0100 +++ new/kidletime-5.93.0/src/plugins/xsync/CMakeLists.txt 2022-04-02 12:00:01.000000000 +0200 @@ -32,7 +32,7 @@ if (TARGET Qt5::X11Extras) target_link_libraries(KF5IdleTimeXcbPlugin0 Qt5::X11Extras) elseif (TARGET Qt6::Gui) - target_link_libraries(KF5IdleTimeXcbPlugin0 Qt6::GuiPrivate) # qtx11extras_p.h + target_link_libraries(KF5IdleTimeXcbPlugin0 Qt6::Gui) endif() install( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.92.0/src/plugins/xsync/xsyncbasedpoller.cpp new/kidletime-5.93.0/src/plugins/xsync/xsyncbasedpoller.cpp --- old/kidletime-5.92.0/src/plugins/xsync/xsyncbasedpoller.cpp 2022-03-05 12:14:51.000000000 +0100 +++ new/kidletime-5.93.0/src/plugins/xsync/xsyncbasedpoller.cpp 2022-04-02 12:00:01.000000000 +0200 @@ -13,7 +13,7 @@ #include <QAbstractNativeEventFilter> #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -#include <private/qtx11extras_p.h> +#include <QGuiApplication> #else #include <QX11Info> #endif @@ -62,7 +62,11 @@ XSyncBasedPoller::XSyncBasedPoller(QObject *parent) : AbstractSystemPoller(parent) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + , m_display(qGuiApp->nativeInterface<QNativeInterface::QX11Application>()->display()) +#else , m_display(QX11Info::display()) +#endif , m_xcb_connection(nullptr) , m_idleCounter(None) , m_resetAlarm(None)
