feat:upgrade to 5.103

CMakeLists.txt

@@ -1,10 +1,10 @@
 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(KDBusAddons VERSION ${KF_VERSION})
 
 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)
 
@@ -16,6 +16,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
 include(KDEGitCommitHooks)
 include(ECMQtDeclareLoggingCategory)
+include(ECMDeprecationSettings)
 
 set(REQUIRED_QT_VERSION 5.15.2)
 find_package(Qt${QT_MAJOR_VERSION}DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
@@ -42,7 +43,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KDBUSADDONS
                         SOVERSION 5)
 
 # qtx11extras_p.h is in Qt6Gui
-if(TARGET Qt5::X11Extras OR TARGET Qt6::Gui)
+if(TARGET Qt5::X11Extras OR (TARGET Qt6::Gui AND NOT WIN32))
     set(HAVE_X11 TRUE)
 else()
     set(HAVE_X11 FALSE)
@@ -53,8 +54,12 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprec
 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)")
 
-ecm_install_po_files_as_qm(po)
-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)
+ecm_set_disabled_deprecation_versions(
+    QT 5.15.2
+)
+
+ecm_install_po_files_as_qm(poqm)
+
 add_subdirectory(src)
 if (BUILD_TESTING)
     add_subdirectory(autotests)
@@ -88,7 +93,7 @@ install(FILES  "${CMAKE_CURRENT_BINARY_DIR}/KF5DBusAddonsConfig.cmake"
 
 install(EXPORT KF5DBusAddonsTargets  DESTINATION "${CMAKECONFIG_INSTALL_DIR}"  FILE KF5DBusAddonsTargets.cmake  NAMESPACE KF5:: )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}  COMPONENT Devel )
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KDBusAddons COMPONENT Devel)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 

KF5DBusAddonsConfig.cmake.in

@@ -6,9 +6,9 @@ find_dependency(Qt@QT_MAJOR_VERSION@DBus @REQUIRED_QT_VERSION@)
 if(NOT @BUILD_SHARED_LIBS@)
     # Qt5::DBus target will have been defined by the find_dependency() call above
     # at the time where this file is used
-    if(TARGET Qt5::DBus)
+    if(@Qt5X11Extras_FOUND@)
         find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@)
-    else()
+    elseif(@Qt6Gui_FOUND@)
         find_dependency(Qt6Gui @REQUIRED_QT_VERSION@) # qtx11extras_p.h
     endif()
 endif()

autotests/kdbusservicetest.cpp

@@ -66,6 +66,14 @@ class TestObject : public QObject
         }
     }
 
+public Q_SLOTS:
+    void firstCall()
+    {
+        QStringList args;
+        args << QStringLiteral("bad call");
+        executeNewChild(args);
+    }
+
 private Q_SLOTS:
     void slotProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
     {
@@ -78,13 +86,6 @@ private Q_SLOTS:
         }
     }
 
-    void firstCall()
-    {
-        QStringList args;
-        args << QStringLiteral("bad call");
-        executeNewChild(args);
-    }
-
     void secondCall()
     {
         QStringList args;
@@ -139,9 +140,11 @@ int main(int argc, char *argv[])
     QStringList args;
     args << QStringLiteral("dummy call");
 
-    QMetaObject::invokeMethod(&service, "activateRequested", Qt::QueuedConnection, Q_ARG(QStringList, args), Q_ARG(QString, QDir::currentPath()));
-    QTimer::singleShot(400, &testObject, SLOT(firstCall()));
-
+    auto activateSignal = [&service, &args]() {
+        service.activateRequested(args, QDir::currentPath());
+    };
+    QMetaObject::invokeMethod(&service, activateSignal, Qt::QueuedConnection);
+    QTimer::singleShot(400, &testObject, &TestObject::firstCall);
     qDebug() << "Running.";
     a.exec();
     qDebug() << "Terminating.";

debian/changelog

@@ -1,10 +1,79 @@
-kdbusaddons (5.90.0-1) UNRELEASED; urgency=medium
+kdbusaddons (5.103.0-1) unstable; urgency=medium
 
-  * update
+  [ Aurélien COUDERC ]
+  * New upstream release (5.103.0).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 12 Feb 2023 21:44:22 +0100
+
+kdbusaddons (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 <coucouf@debian.org>  Sun, 22 Jan 2023 21:35:00 +0100
+
+kdbusaddons (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 <coucouf@debian.org>  Tue, 13 Dec 2022 07:40:20 +0100
+
+kdbusaddons (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 <coucouf@debian.org>  Sat, 19 Nov 2022 23:18:55 +0100
+
+kdbusaddons (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 <coucouf@debian.org>  Sun, 18 Sep 2022 23:11:34 +0200
+
+kdbusaddons (5.97.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.97.0).
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 14 Aug 2022 18:55:27 +0200
+
+kdbusaddons (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.
+  * Refresh lintian overrides.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 31 Jul 2022 13:32:55 +0200
+
+kdbusaddons (5.94.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.94.0).
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Thu, 19 May 2022 23:59:02 +0200
+
+kdbusaddons (5.93.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (5.92.0).
+  * Update the list of installed files.
+  * New upstream release (5.93.0).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 24 Apr 2022 16:25:35 +0800
+ -- Aurélien COUDERC <coucouf@debian.org>  Wed, 11 May 2022 23:22:43 +0200
 
-kdbusaddons (5.90.0-1) experimental; urgency=medium
+kdbusaddons (5.90.0-1) unstable; urgency=medium
 
   [ Norbert Preining ]
   * New upstream release (5.89.0).

debian/control

@@ -8,24 +8,24 @@ Build-Depends: cmake (>= 3.16~),
                dbus-x11 <!nocheck>,
                debhelper-compat (= 13),
                doxygen,
-               extra-cmake-modules (>= 5.90.0~),
+               extra-cmake-modules (>= 5.103.0~),
                libqt5sql5-sqlite:native,
                libqt5x11extras5-dev (>= 5.15.2~),
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.15.2~),
                qttools5-dev (>= 5.4),
                qttools5-dev-tools (>= 5.4),
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Homepage: https://invent.kde.org/frameworks/kdbusaddons
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdbusaddons
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdbusaddons.git
 Rules-Requires-Root: no
 
 Package: libkf5dbusaddons-bin
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkf5dbusaddons5-bin
-Replaces: libkf5dbusaddons5-bin
+Depends: ${misc:Depends}, ${shlibs:Depends},
+Breaks: libkf5dbusaddons5-bin,
+Replaces: libkf5dbusaddons5-bin,
 Description: class library for qtdbus
  KDBusAddons provides convenience classes on top of QtDBus,
  as well as an API to create KDED modules.
@@ -35,9 +35,9 @@ Description: class library for qtdbus
 Package: libkf5dbusaddons-data
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkf5dbusaddons5-data
-Replaces: libkf5dbusaddons5-data
+Depends: ${misc:Depends}, ${shlibs:Depends},
+Breaks: libkf5dbusaddons5-data,
+Replaces: libkf5dbusaddons5-data,
 Description: class library for qtdbus
  KDBusAddons provides convenience classes on top of QtDBus,
  as well as an API to create KDED modules.
@@ -50,16 +50,16 @@ Architecture: any
 Depends: libkf5dbusaddons5 (= ${binary:Version}),
          qtbase5-dev (>= 5.15.2~),
          ${misc:Depends},
-Breaks: kded5-dev (<< 5.54), libkf5service-dev (<< 5.54)
-Recommends: libkf5dbusaddons-doc (= ${source:Version})
+Breaks: kded5-dev (<< 5.54), libkf5service-dev (<< 5.54),
+Recommends: libkf5dbusaddons-doc (= ${source:Version}),
 Description: development files for dbusaddons
  KDBusAddons provides convenience classes on top of QtDBus,
  as well as an API to create KDED modules.
 
 Package: libkf5dbusaddons-doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
 Description: class library for qtdbus (documentation)
  KDBusAddons provides convenience classes on top of QtDBus,
  as well as an API to create KDED modules.
@@ -82,7 +82,7 @@ Breaks: baloo-kf5 (<< 5.54),
         libkf5service5 (<< 5.54),
         libkf5wallet-bin (<< 5.54),
         plasma-framework (<< 5.25),
-Recommends: libkf5dbusaddons-bin (= ${binary:Version})
+Recommends: libkf5dbusaddons-bin (= ${binary:Version}),
 Description: class library for qtdbus
  KDBusAddons provides convenience classes on top of QtDBus,
  as well as an API to create KDED modules.

debian/libkf5dbusaddons-bin.lintian-overrides

@@ -1 +1 @@
-libkf5dbusaddons-bin: binary-without-manpage usr/bin/kquitapp5
+libkf5dbusaddons-bin: no-manual-page [usr/bin/kquitapp5]

debian/libkf5dbusaddons-dev.install

@@ -1,4 +1,3 @@
-/usr/include/KF5/kdbusaddons_version.h
 usr/include/KF5/KDBusAddons/
 usr/lib/*/cmake/KF5DBusAddons/
 usr/lib/*/libKF5DBusAddons.so

poqm/bg/kdbusaddons5_qt.po

@@ -0,0 +1,54 @@
+# Mincho Kondarev <mkondarev@yahoo.de>, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2022-05-20 18:59+0200\n"
+"Last-Translator: Mincho Kondarev <mkondarev@yahoo.de>\n"
+"Language-Team: Bulgarian <kde-i18n-doc@kde.org>\n"
+"Language: bg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Qt-Contexts: true\n"
+"X-Generator: Lokalize 22.04.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: tools/kquitapp/kquitapp.cpp:19
+msgctxt "main|"
+msgid "Quit a D-Bus enabled application easily"
+msgstr "Излезте лесно от приложение с активиран D-Bus"
+
+#: tools/kquitapp/kquitapp.cpp:21
+msgctxt "main|"
+msgid "Full service name, overrides application name provided"
+msgstr "Пълно име на услугата, замества предоставеното име на приложението"
+
+#: tools/kquitapp/kquitapp.cpp:24
+msgctxt "main|"
+msgid "Path in the D-Bus interface to use"
+msgstr "Път в интерфейса на D-Bus, който да се използва"
+
+#: tools/kquitapp/kquitapp.cpp:27
+msgctxt "main|"
+msgid "The name of the application to quit"
+msgstr "Името на приложението за излизане"
+
+#: tools/kquitapp/kquitapp.cpp:45
+#, qt-format
+msgctxt "main|"
+msgid "Application %1 could not be found using service %2 and path %3."
+msgstr ""
+"Приложение %1 не можа да бъде намерено с помощта на услуга %2 и път %3."
+
+#: tools/kquitapp/kquitapp.cpp:52
+#, qt-format
+msgctxt "main|"
+msgid ""
+"Quitting application %1 failed. Error reported was:\n"
+"\n"
+"     %2 : %3"
+msgstr ""
+"Излизането от приложението %1 е неуспешно. Съобщената грешка беше:\n"
+"\n"
+" %2 : %3"

po/ca/kdbusaddons5_qt.po → poqm/ca/kdbusaddons5_qt.po

@@ -5,6 +5,7 @@
 #
 # Josep M. Ferrer <txemaq@gmail.com>, 2014.
 # Antoni Bella Pérez <antonibella5@yahoo.com>, 2015, 2020.
+# Empar Montoro Martín <montoro_mde@gva.es>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: kdbusaddons\n"