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-01-11 21:16:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kidletime (Old) and /work/SRC/openSUSE:Factory/.kidletime.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kidletime" Tue Jan 11 21:16:24 2022 rev:98 rq:945061 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kidletime/kidletime.changes 2021-12-13 20:44:19.152484511 +0100 +++ /work/SRC/openSUSE:Factory/.kidletime.new.1892/kidletime.changes 2022-01-11 21:19:02.144948958 +0100 @@ -1,0 +2,11 @@ +Mon Jan 3 12:47:37 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Fix comment + * Make it compile against qt6 + +------------------------------------------------------------------- Old: ---- kidletime-5.89.0.tar.xz kidletime-5.89.0.tar.xz.sig New: ---- kidletime-5.90.0.tar.xz kidletime-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kidletime.spec ++++++ --- /var/tmp/diff_new_pack.ZNVLkE/_old 2022-01-11 21:19:03.096949627 +0100 +++ /var/tmp/diff_new_pack.ZNVLkE/_new 2022-01-11 21:19:03.104949633 +0100 @@ -17,22 +17,22 @@ %define lname libKF5IdleTime5 -%define _tar_path 5.89 +%define _tar_path 5.90 # 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}')} # Only needed for the package signature condition -%bcond_without lang +%bcond_without released Name: kidletime -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: User and system idle time reporting singleton License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif ++++++ kidletime-5.89.0.tar.xz -> kidletime-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.89.0/CMakeLists.txt new/kidletime-5.90.0/CMakeLists.txt --- old/kidletime-5.89.0/CMakeLists.txt 2021-12-04 18:00:50.000000000 +0100 +++ new/kidletime-5.90.0/CMakeLists.txt 2022-01-01 13:15:52.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts project(KIdleTime VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.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) @@ -32,7 +32,7 @@ include(KDEGitCommitHooks) set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) if(APPLE) cmake_find_frameworks(CoreFoundation Carbon) @@ -44,7 +44,11 @@ endif() if(X11_FOUND) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) + 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) set(HAVE_X11 TRUE) @@ -65,7 +69,7 @@ add_feature_info("X-Screensaver based poller" HAVE_XSCREENSAVER "KIdleTime fallback mode (libXss)") if(HAVE_XSCREENSAVER AND NOT WIN32) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) endif() if(NOT HAVE_XSCREENSAVER AND NOT HAVE_XSYNC) @@ -80,6 +84,7 @@ 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_DISABLE_DEPRECATED_BEFORE=0x050f02) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) # Subdirectories add_subdirectory(src) add_subdirectory(examples) @@ -110,7 +115,7 @@ install(EXPORT KF5IdleTimeTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5IdleTimeTargets.cmake NAMESPACE KF5:: ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kidletime_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel) + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.89.0/KF5IdleTimeConfig.cmake.in new/kidletime-5.90.0/KF5IdleTimeConfig.cmake.in --- old/kidletime-5.89.0/KF5IdleTimeConfig.cmake.in 2021-12-04 18:00:50.000000000 +0100 +++ new/kidletime-5.90.0/KF5IdleTimeConfig.cmake.in 2022-01-01 13:15:52.000000000 +0100 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5IdleTimeTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.89.0/examples/CMakeLists.txt new/kidletime-5.90.0/examples/CMakeLists.txt --- old/kidletime-5.89.0/examples/CMakeLists.txt 2021-12-04 18:00:50.000000000 +0100 +++ new/kidletime-5.90.0/examples/CMakeLists.txt 2022-01-01 13:15:52.000000000 +0100 @@ -1,2 +1,2 @@ add_executable(kidletime_example main.cpp KIdleTest.cpp) -target_link_libraries(kidletime_example KF5::IdleTime Qt5::Gui) +target_link_libraries(kidletime_example KF5::IdleTime Qt${QT_MAJOR_VERSION}::Gui) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.89.0/src/CMakeLists.txt new/kidletime-5.90.0/src/CMakeLists.txt --- old/kidletime-5.89.0/src/CMakeLists.txt 2021-12-04 18:00:50.000000000 +0100 +++ new/kidletime-5.90.0/src/CMakeLists.txt 2022-01-01 13:15:52.000000000 +0100 @@ -26,10 +26,10 @@ DEPRECATION_VERSIONS 5.76 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_include_directories(KF5IdleTime INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIdleTime>") +target_include_directories(KF5IdleTime INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KIdleTime>") -target_link_libraries(KF5IdleTime PUBLIC Qt5::Core) -target_link_libraries(KF5IdleTime PRIVATE Qt5::Gui) +target_link_libraries(KF5IdleTime PUBLIC Qt${QT_MAJOR_VERSION}::Core) +target_link_libraries(KF5IdleTime PRIVATE Qt${QT_MAJOR_VERSION}::Gui) set_target_properties(KF5IdleTime PROPERTIES VERSION ${KIDLETIME_VERSION} SOVERSION ${KIDLETIME_SOVERSION} @@ -49,14 +49,14 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kidletime_export.h ${KIdleTime_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KIdleTime COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KIdleTime COMPONENT Devel ) install( FILES abstractsystempoller.h DESTINATION - ${KDE_INSTALL_INCLUDEDIR_KF5}/KIdleTime/private + ${KDE_INSTALL_INCLUDEDIR_KF}/KIdleTime/private COMPONENT Devel ) @@ -94,5 +94,5 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KIdleTime LIB_NAME KF5IdleTime DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KIdleTime) +ecm_generate_pri_file(BASE_NAME KIdleTime LIB_NAME KF5IdleTime DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KIdleTime) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.89.0/src/plugins/xscreensaver/CMakeLists.txt new/kidletime-5.90.0/src/plugins/xscreensaver/CMakeLists.txt --- old/kidletime-5.89.0/src/plugins/xscreensaver/CMakeLists.txt 2021-12-04 18:00:50.000000000 +0100 +++ new/kidletime-5.90.0/src/plugins/xscreensaver/CMakeLists.txt 2022-01-01 13:15:52.000000000 +0100 @@ -10,12 +10,18 @@ target_link_libraries(KF5IdleTimeXcbPlugin1 KF5IdleTime - Qt5::DBus - Qt5::X11Extras + Qt${QT_MAJOR_VERSION}::DBus ${X11_LIBRARIES} ${X11_Xscreensaver_LIB} ) +if (TARGET Qt5::X11Extras) + target_link_libraries(KF5IdleTimeXcbPlugin1 Qt5::X11Extras) +elseif (TARGET Qt6::Gui) + target_link_libraries(KF5IdleTimeXcbPlugin1 Qt6::GuiPrivate) # qtx11extras_p.h +endif() + + install( TARGETS KF5IdleTimeXcbPlugin1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.89.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp new/kidletime-5.90.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp --- old/kidletime-5.89.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp 2021-12-04 18:00:50.000000000 +0100 +++ new/kidletime-5.90.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp 2022-01-01 13:15:52.000000000 +0100 @@ -8,7 +8,11 @@ #include <config-kidletime.h> +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include <private/qtx11extras_p.h> +#else #include <QX11Info> +#endif #include <X11/Xlib.h> #include <X11/extensions/scrnsaver.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.89.0/src/plugins/xsync/CMakeLists.txt new/kidletime-5.90.0/src/plugins/xsync/CMakeLists.txt --- old/kidletime-5.89.0/src/plugins/xsync/CMakeLists.txt 2021-12-04 18:00:50.000000000 +0100 +++ new/kidletime-5.90.0/src/plugins/xsync/CMakeLists.txt 2022-01-01 13:15:52.000000000 +0100 @@ -22,7 +22,6 @@ target_link_libraries(KF5IdleTimeXcbPlugin0 KF5IdleTime - Qt5::X11Extras XCB::XCB XCB::SYNC X11::XCB @@ -30,6 +29,12 @@ ${X11_Xext_LIB} ) +if (TARGET Qt5::X11Extras) + target_link_libraries(KF5IdleTimeXcbPlugin0 Qt5::X11Extras) +elseif (TARGET Qt6::Gui) + target_link_libraries(KF5IdleTimeXcbPlugin0 Qt6::GuiPrivate) # qtx11extras_p.h +endif() + install( TARGETS KF5IdleTimeXcbPlugin0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.89.0/src/plugins/xsync/xsyncbasedpoller.cpp new/kidletime-5.90.0/src/plugins/xsync/xsyncbasedpoller.cpp --- old/kidletime-5.89.0/src/plugins/xsync/xsyncbasedpoller.cpp 2021-12-04 18:00:50.000000000 +0100 +++ new/kidletime-5.90.0/src/plugins/xsync/xsyncbasedpoller.cpp 2022-01-01 13:15:52.000000000 +0100 @@ -12,7 +12,12 @@ #include "xsyncbasedpoller.h" #include <QAbstractNativeEventFilter> +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include <private/qtx11extras_p.h> +#else #include <QX11Info> +#endif + #include <X11/Xlib-xcb.h> // XGetXCBConnection #include <xcb/sync.h>
