feat:upgrade to 5.103

CMakeLists.txt

@@ -1,36 +1,35 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(KF_VERSION "5.90.0") # handled by release scripts
+set(KF_VERSION "5.103.0") # handled by release scripts
 project(KIdleTime VERSION ${KF_VERSION})
 
 # ECM setup
 include(FeatureSummary)
-find_package(ECM 5.90.0  NO_MODULE)
+find_package(ECM 5.103.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)
 
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 
+include(KDEGitCommitHooks)
 include(CMakeFindFrameworks)
 include(CMakePackageConfigHelpers)
 include(ECMGenerateExportHeader)
 include(ECMQtDeclareLoggingCategory)
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
+include(ECMDeprecationSettings)
 include(ECMAddQch)
 
 ecm_setup_version(PROJECT VARIABLE_PREFIX KIDLETIME
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kidletime_version.h"
                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5IdleTimeConfigVersion.cmake"
                         SOVERSION 5)
 
-# Dependencies
-include(KDEInstallDirs)
-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
-include(KDECMakeSettings)
-include(KDEGitCommitHooks)
-
 set(REQUIRED_QT_VERSION 5.15.2)
 find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui)
 
@@ -41,13 +40,12 @@ endif()
 if(NOT APPLE)
     find_package(X11)
     find_package(XCB COMPONENTS XCB)
+    find_package(Qt${QT_MAJOR_VERSION}WaylandClient ${REQUIRED_QT_VERSION} CONFIG)
 endif()
 
 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)
@@ -79,12 +77,28 @@ else()
     set(HAVE_X11 FALSE)
 endif()
 
+if(Qt5WaylandClient_FOUND)
+    find_package(QtWaylandScanner REQUIRED)
+    find_package(Wayland 1.9 REQUIRED Client)
+    find_package(PlasmaWaylandProtocols 1.6.0 CONFIG REQUIRED)
+    find_package(WaylandProtocols 1.27)
+    set_package_properties(WaylandProtocols PROPERTIES
+        TYPE REQUIRED
+        PURPOSE "Collection of Wayland protocols that add functionality not available in the Wayland core protocol"
+        URL "https://gitlab.freedesktop.org/wayland/wayland-protocols/"
+    )
+endif()
+
 set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].")
 
 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)
+
+ecm_set_disabled_deprecation_versions(
+    QT 5.15.2
+    KF 5.97
+)
+
 # Subdirectories
 add_subdirectory(src)
 add_subdirectory(examples)
@@ -115,7 +129,7 @@ install(FILES  "${CMAKE_CURRENT_BINARY_DIR}/KF5IdleTimeConfig.cmake"
 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_KF} COMPONENT Devel)
+        DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KIdleTime COMPONENT Devel)
 
 feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
 

debian/changelog

@@ -1,10 +1,113 @@
-kidletime (5.90.0-1) UNRELEASED; urgency=medium
+kidletime (5.103.0-2) unstable; urgency=medium
 
-  * update
+  * Team upload.
+  * Remove inactive Uploaders.
+  * Modernize building:
+    - add the dh-sequence-kf5 build dependency to use the kf5 addon
+      automatically
+    - add the dh-sequence-pkgkde-symbolshelper build dependency to use the
+      pkgkde_symbolshelper automatically
+    - drop the pkg-kde-tools build dependency, no more explicitly needed
+    - drop all the manually specified addons and buildsystem for dh
+  * Drop the unused leftovers of the 'testsuite' autpkgtest.
+  * Remove the unused debian/meta/ stuff.
+  * CI: enable again the blhc job.
+  * Fix building on non-Linux architectures, by limiting the Wayland support
+    to Linux architectures:
+    - restrict some build dependencies as linux-any: libqt5waylandclient5-dev,
+      libwayland-dev, plasma-wayland-protocols, qtwayland5-dev-tools, and
+      wayland-protocols
+    - add the dh-exec build dependency, needed for architecture-based filtering
+      in install files
+    - ship the Wayland plugins in libkf5idletime5 only in Linux architectures
+  * Enable the libxss-dev build dependency again on Hurd architectures, as it is
+    available now.
+
+ -- Pino Toscano <[email protected]>  Sun, 26 Feb 2023 16:46:01 +0100
+
+kidletime (5.103.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.103.0).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <[email protected]>  Sun, 12 Feb 2023 21:44:23 +0100
+
+kidletime (5.102.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.102.0).
+  * Update build-deps and deps with the info from cmake.
+  * Bump Standards-Version to 4.6.2, no change required.
+
+ -- Aurélien COUDERC <[email protected]>  Sun, 22 Jan 2023 21:35:01 +0100
+
+kidletime (5.101.0-2) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * Add missing build dependencies for the Wayland plugin.
+
+ -- Aurélien COUDERC <[email protected]>  Thu, 15 Dec 2022 23:02:11 +0100
+
+kidletime (5.101.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.101.0).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <[email protected]>  Tue, 13 Dec 2022 07:40:22 +0100
+
+kidletime (5.100.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.99.0).
+  * Update build-deps and deps with the info from cmake.
+  * New upstream release (5.100.0).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <[email protected]>  Sat, 19 Nov 2022 23:18:56 +0100
+
+kidletime (5.98.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.98.0).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <[email protected]>  Sun, 18 Sep 2022 23:11:36 +0200
+
+kidletime (5.97.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.97.0).
+
+ -- Aurélien COUDERC <[email protected]>  Sun, 14 Aug 2022 18:55:28 +0200
+
+kidletime (5.96.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.96.0).
+  * Bump Standards-Version to 4.6.1, no change required.
+
+ -- Aurélien COUDERC <[email protected]>  Sun, 31 Jul 2022 13:32:57 +0200
+
+kidletime (5.94.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.94.0).
+
+ -- Aurélien COUDERC <[email protected]>  Thu, 19 May 2022 23:59:02 +0200
+
+kidletime (5.93.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.92.0).
+  * Update the list of installed files.
+  * Update symbols from build for 5.92.0.
+  * New upstream release (5.93.0).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 24 Apr 2022 17:20:54 +0800
+ -- Aurélien COUDERC <coucouf@debian.org>  Wed, 11 May 2022 23:22:43 +0200
 
-kidletime (5.90.0-1) experimental; urgency=medium
+kidletime (5.90.0-1) unstable; urgency=medium
 
   [ Norbert Preining ]
   * New upstream release (5.89.0).

debian/control

@@ -3,24 +3,31 @@ Priority: optional
 Section: libs
 Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Aurélien COUDERC <[email protected]>,
-           Norbert Preining <[email protected]>,
 Build-Depends: cmake (>= 3.16~),
                debhelper-compat (= 13),
+               dh-exec,
+               dh-sequence-kf5,
+               dh-sequence-pkgkde-symbolshelper,
                doxygen,
-               extra-cmake-modules (>= 5.90.0~),
+               extra-cmake-modules (>= 5.103.0~),
                libqt5sql5-sqlite,
+               libqt5waylandclient5-dev (>= 5.15.2~) [linux-any],
                libqt5x11extras5-dev (>= 5.15.2~),
+               libwayland-dev (>= 1.9~) [linux-any],
                libx11-dev,
                libx11-xcb-dev,
                libxcb-sync-dev,
                libxcb1-dev,
-               libxss-dev [!hurd-any],
+               libxss-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.15.15ubuntu1~),
+               plasma-wayland-protocols (>= 1.6.0~) [linux-any],
                qtbase5-dev (>= 5.15.2~),
+               qtbase5-private-dev,
                qttools5-dev,
                qttools5-dev-tools (>= 5.4),
-Standards-Version: 4.6.0
+               qtwayland5-dev-tools [linux-any],
+               wayland-protocols (>= 1.27~) [linux-any],
+Standards-Version: 4.6.2
 Homepage: https://invent.kde.org/frameworks/kidletime
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kidletime
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kidletime.git
@@ -32,16 +39,16 @@ Architecture: any
 Depends: libkf5idletime5 (= ${binary:Version}),
          qtbase5-dev (>= 5.15.2~),
          ${misc:Depends},
-Recommends: libkf5idletime-doc (= ${source:Version})
+Recommends: libkf5idletime-doc (= ${source:Version}),
 Description: development headers for the kidletime library
  This package contains development files for building software that uses
  libraries from the kidletime KDE framework.
-Breaks: libkf5kdelibs4support-dev (<< 5.54)
+Breaks: libkf5kdelibs4support-dev (<< 5.54),
 
 Package: libkf5idletime-doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
 Description: library to provide information about idle time (documentation)
  This library contains a class that allows applications to watch for
  user activity or inactivity. It is useful not only for finding out about
@@ -53,12 +60,12 @@ Section: doc
 
 Package: libkf5idletime5
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
 Multi-Arch: same
-Recommends: kwayland-integration
+Recommends: kwayland-integration,
 Description: library to provide information about idle time
  This library contains a class that allows applications to watch for
  user activity or inactivity. It is useful not only for finding out about
  the current idle time of the PC, but also for getting notified upon idle
  time events, such as custom timeouts, or user activity.
-Breaks: baloo-kf5 (<< 5.54)
+Breaks: baloo-kf5 (<< 5.54),

debian/libkf5idletime-dev.install

@@ -1,4 +1,3 @@
-/usr/include/KF5/kidletime_version.h
 usr/include/KF5/KIdleTime
 usr/lib/*/cmake/KF5IdleTime/
 usr/lib/*/libKF5IdleTime.so

debian/libkf5idletime5.install

@@ -1,5 +1,7 @@
+#!/usr/bin/dh-exec
 usr/lib/*/libKF5IdleTime.so.5
 usr/lib/*/libKF5IdleTime.so.5.*
 usr/lib/*/qt5/plugins/kf5/org.kde.kidletime.platforms/KF5IdleTimeXcbPlugin*.so
+[linux-any] usr/lib/*/qt5/plugins/kf5/org.kde.kidletime.platforms/KF5IdleTimeWaylandPlugin*.so
 usr/share/qlogging-categories5/kidletime.categories
 usr/share/qlogging-categories5/kidletime.renamecategories

debian/libkf5idletime5.symbols

@@ -56,6 +56,7 @@ libKF5IdleTime.so.5 libkf5idletime5 #MINVER#
  _ZNK9KIdleTime10metaObjectEv@Base 4.96.0
  _ZNK9KIdleTime12idleTimeoutsEv@Base 4.96.0
  _ZNK9KIdleTime8idleTimeEv@Base 4.96.0
+ _ZNSt6vectorIiSaIiEE17_M_realloc_insertIJRKiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base 5.92.0
  _ZTI17WidgetBasedPoller@Base 5.13.0
  _ZTI20AbstractSystemPoller@Base 5.13.0
  _ZTI9KIdleTime@Base 4.96.0

debian/rules

@@ -3,7 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DBUILD_QCH=ON

debian/salsa-ci.yml

@@ -2,7 +2,6 @@ include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
 variables:
-  SALSA_CI_DISABLE_BLHC: 'yes'
   SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
   SALSA_CI_DISABLE_RC_BUGS: 'no'
   SALSA_CI_REPROTEST_ARGS: '--variations=-build-path'

src/CMakeLists.txt

@@ -61,7 +61,7 @@ install(
         Devel
 )
 
-install(TARGETS KF5IdleTime EXPORT KF5IdleTimeTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS KF5IdleTime EXPORT KF5IdleTimeTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 ecm_qt_install_logging_categories(

src/abstractsystempoller.h

@@ -28,7 +28,10 @@ class KIDLETIME_EXPORT AbstractSystemPoller : public QObject
 public Q_SLOTS:
     virtual void addTimeout(int nextTimeout) = 0;
     virtual void removeTimeout(int nextTimeout) = 0;
-    virtual QList<int> timeouts() const = 0;
+
+    // TODO KF6: Make it a public method
+    virtual QList<int> timeouts() const = 0; // clazy:exclude=const-signal-or-slot
+
     virtual int forcePollRequest() = 0;
     virtual void catchIdleEvent() = 0;
     virtual void stopCatchingIdleEvents() = 0;