Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdbusaddons for openSUSE:Factory checked in at 2022-01-11 21:16:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdbusaddons (Old) and /work/SRC/openSUSE:Factory/.kdbusaddons.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdbusaddons" Tue Jan 11 21:16:10 2022 rev:98 rq:945045 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdbusaddons/kdbusaddons.changes 2021-12-13 20:43:54.860481536 +0100 +++ /work/SRC/openSUSE:Factory/.kdbusaddons.new.1892/kdbusaddons.changes 2022-01-11 21:18:36.000930569 +0100 @@ -1,0 +2,12 @@ +Mon Jan 3 12:47:24 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- 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 conditions used in cmake.in config file + * API docs: improve docs for D-Bus activation and startup id handling + * Change the build system to enable building with Qt 6 + +------------------------------------------------------------------- Old: ---- kdbusaddons-5.89.0.tar.xz kdbusaddons-5.89.0.tar.xz.sig New: ---- kdbusaddons-5.90.0.tar.xz kdbusaddons-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdbusaddons.spec ++++++ --- /var/tmp/diff_new_pack.tAKnNl/_old 2022-01-11 21:18:36.684931050 +0100 +++ /var/tmp/diff_new_pack.tAKnNl/_new 2022-01-11 21:18:36.688931053 +0100 @@ -17,21 +17,21 @@ %define lname libKF5DBusAddons5 -%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}')} -%bcond_without lang +%bcond_without released Name: kdbusaddons -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Convenience classes for QtDBus 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 @@ -41,7 +41,7 @@ BuildRequires: cmake(Qt5DBus) >= 5.15.0 BuildRequires: cmake(Qt5Test) >= 5.15.0 BuildRequires: cmake(Qt5X11Extras) >= 5.15.0 -%if %{with lang} +%if %{with released} BuildRequires: cmake(Qt5LinguistTools) >= 5.15.0 %endif @@ -53,7 +53,6 @@ Summary: Convenience classes for QtDBus Group: System/GUI/KDE %requires_ge libQt5DBus5 -Recommends: %{lname}-lang = %{version} Recommends: %{name}-tools = %{version} %description -n %{lname} @@ -92,14 +91,14 @@ %kf5_makeinstall -C build %fdupes %{buildroot} -%if %{with lang} +%if %{with released} %find_lang %{name}5 --with-qt --without-mo %endif %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig -%if %{with lang} +%if %{with released} %files -n %{lname}-lang -f %{name}5.lang %endif ++++++ kdbusaddons-5.89.0.tar.xz -> kdbusaddons-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.89.0/CMakeLists.txt new/kdbusaddons-5.90.0/CMakeLists.txt --- old/kdbusaddons-5.89.0/CMakeLists.txt 2021-12-04 19:33:55.000000000 +0100 +++ new/kdbusaddons-5.90.0/CMakeLists.txt 2022-01-01 13:28:07.000000000 +0100 @@ -1,10 +1,10 @@ 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(KDBusAddons VERSION ${KF_VERSION}) 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) @@ -18,9 +18,13 @@ include(ECMQtDeclareLoggingCategory) set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +if (QT_MAJOR_VERSION STREQUAL "5") + find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} CONFIG) +elseif (QT_MAJOR_VERSION STREQUAL "6") + find_package(Qt6Gui ${REQUIRED_QT_VERSION} CONFIG) # qtx11extras_p.h +endif() include(GenerateExportHeader) include(CMakePackageConfigHelpers) @@ -37,8 +41,8 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5DBusAddonsConfigVersion.cmake" SOVERSION 5) -if(Qt5X11Extras_FOUND) - set(qtx11extras Qt5::X11Extras) +# qtx11extras_p.h is in Qt6Gui +if(TARGET Qt5::X11Extras OR TARGET Qt6::Gui) set(HAVE_X11 TRUE) else() set(HAVE_X11 FALSE) @@ -84,7 +88,7 @@ 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_KF5} COMPONENT Devel ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h 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/kdbusaddons-5.89.0/KF5DBusAddonsConfig.cmake.in new/kdbusaddons-5.90.0/KF5DBusAddonsConfig.cmake.in --- old/kdbusaddons-5.89.0/KF5DBusAddonsConfig.cmake.in 2021-12-04 19:33:55.000000000 +0100 +++ new/kdbusaddons-5.90.0/KF5DBusAddonsConfig.cmake.in 2022-01-01 13:28:07.000000000 +0100 @@ -1,11 +1,15 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@DBus @REQUIRED_QT_VERSION@) if(NOT @BUILD_SHARED_LIBS@) - if(@Qt5X11Extras_FOUND@) + # 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) find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) + else() + find_dependency(Qt6Gui @REQUIRED_QT_VERSION@) # qtx11extras_p.h endif() endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.89.0/autotests/CMakeLists.txt new/kdbusaddons-5.90.0/autotests/CMakeLists.txt --- old/kdbusaddons-5.89.0/autotests/CMakeLists.txt 2021-12-04 19:33:55.000000000 +0100 +++ new/kdbusaddons-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:28:07.000000000 +0100 @@ -1,17 +1,17 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) -find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} REQUIRED CONFIG) include(ECMAddTests) if(UNIX) add_executable(kdbussimpleservice kdbussimpleservice.cpp) - target_link_libraries(kdbussimpleservice Qt5::Core KF5::DBusAddons) + target_link_libraries(kdbussimpleservice Qt${QT_MAJOR_VERSION}::Core KF5::DBusAddons) ecm_add_tests( deadservicetest.cpp - LINK_LIBRARIES Qt5::Test KF5::DBusAddons + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::DBusAddons ) add_dependencies(deadservicetest kdbussimpleservice) @@ -20,5 +20,5 @@ ecm_add_tests( kdbusinterprocesslocktest.cpp kdbusservicetest.cpp - LINK_LIBRARIES Qt5::Test KF5::DBusAddons + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::DBusAddons ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.89.0/po/ca@valencia/kdbusaddons5_qt.po new/kdbusaddons-5.90.0/po/ca@valencia/kdbusaddons5_qt.po --- old/kdbusaddons-5.89.0/po/ca@valencia/kdbusaddons5_qt.po 2021-12-04 19:33:55.000000000 +0100 +++ new/kdbusaddons-5.90.0/po/ca@valencia/kdbusaddons5_qt.po 2022-01-01 13:28:07.000000000 +0100 @@ -3,16 +3,16 @@ # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Josep Ma. Ferrer <[email protected]>, 2014. +# Josep M. Ferrer <[email protected]>, 2014. # Antoni Bella P??rez <[email protected]>, 2015. -# Empar <[email protected]>, 2019. +# Empar Montoro Mart??n <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: kdbusaddons\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" "PO-Revision-Date: 2019-06-17 13:12+0200\n" -"Last-Translator: Empar <[email protected]>\n" +"Last-Translator: Empar Montoro Mart??n <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.89.0/po/zh_CN/kdbusaddons5_qt.po new/kdbusaddons-5.90.0/po/zh_CN/kdbusaddons5_qt.po --- old/kdbusaddons-5.89.0/po/zh_CN/kdbusaddons5_qt.po 2021-12-04 19:33:55.000000000 +0100 +++ new/kdbusaddons-5.90.0/po/zh_CN/kdbusaddons5_qt.po 2022-01-01 13:28:07.000000000 +0100 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-11-30 15:20\n" +"PO-Revision-Date: 2021-12-22 14:05\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.89.0/src/CMakeLists.txt new/kdbusaddons-5.90.0/src/CMakeLists.txt --- old/kdbusaddons-5.89.0/src/CMakeLists.txt 2021-12-04 19:33:55.000000000 +0100 +++ new/kdbusaddons-5.90.0/src/CMakeLists.txt 2022-01-01 13:28:07.000000000 +0100 @@ -58,9 +58,15 @@ EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_link_libraries(KF5DBusAddons PUBLIC Qt5::DBus PRIVATE ${qtx11extras}) +if(TARGET Qt5::X11Extras) + set(_qt_x11_extras_libs Qt5::X11Extras) +elseif(TARGET Qt6::Gui) + set(_qt_x11_extras_libs Qt6::GuiPrivate) # qtx11extras_p.h +endif() + +target_link_libraries(KF5DBusAddons PUBLIC Qt${QT_MAJOR_VERSION}::DBus PRIVATE ${_qt_x11_extras_libs}) -target_include_directories(KF5DBusAddons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KDBusAddons>") +target_include_directories(KF5DBusAddons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KDBusAddons>") set_target_properties(KF5DBusAddons PROPERTIES VERSION ${KDBUSADDONS_VERSION} SOVERSION ${KDBUSADDONS_SOVERSION} @@ -103,7 +109,7 @@ install(FILES ${KDBusAddons_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_export.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDBusAddons COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KDBusAddons COMPONENT Devel ) ecm_qt_install_logging_categories( @@ -137,5 +143,5 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KDBusAddons LIB_NAME KF5DBusAddons DEPS "dbus" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KDBusAddons) +ecm_generate_pri_file(BASE_NAME KDBusAddons LIB_NAME KF5DBusAddons DEPS "dbus" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KDBusAddons) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.89.0/src/kdbusservice.cpp new/kdbusaddons-5.90.0/src/kdbusservice.cpp --- old/kdbusaddons-5.89.0/src/kdbusservice.cpp 2021-12-04 19:33:55.000000000 +0100 +++ new/kdbusaddons-5.90.0/src/kdbusservice.cpp 2022-01-01 13:28:07.000000000 +0100 @@ -23,8 +23,12 @@ #include "config-kdbusaddons.h" #if HAVE_X11 +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +#include <private/qtx11extras_p.h> +#else #include <QX11Info> #endif +#endif #include "kdbusaddons_debug.h" #include "kdbusservice_adaptor.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.89.0/src/kdbusservice.h new/kdbusaddons-5.90.0/src/kdbusservice.h --- old/kdbusaddons-5.89.0/src/kdbusservice.h 2021-12-04 19:33:55.000000000 +0100 +++ new/kdbusaddons-5.90.0/src/kdbusservice.h 2022-01-01 13:28:07.000000000 +0100 @@ -47,8 +47,9 @@ * until after creating a KDBusService object; that way they know they are the * original instance of the application. * - * Applications that set the D-Bus activation entries in their desktop files - * should use Unique mode and connect to the signals emitted by this class. + * Applications that set the D-Bus activation entry (DBusActivatable=true) in + * their desktop files will use Unique mode and connect to the signals emitted + * by this class. * Note that the D-Bus interface is exported for Multiple-mode applications as * well, so it also makes sense for such applications to connect to the signals * emitted by this class. @@ -214,21 +215,30 @@ * See QCoreApplication::arguments(). * This can also be empty. * - * A typical implementation of the slot would be + * A typical implementation of the signal handler would be: * @code * if (!arguments.isEmpty()) { * commandLineParser->parse(arguments); // same QCommandLineParser instance as the one used in main() * handleCmdLine(workingDirectory); // shared method with main(), which uses commandLineParser to handle options and positional arguments * } + * @endcode * - * - * For GUI applications on X11 , also terminate startup notification and activate the mainwindow: - * The startup ID will exposed be via QX11Extras::nextStartupId - * - * If an existing window is to be raised, call: - * KStartupInfo::setNewStartupId(mainWindow, QX11Extras::nextStartupId); + * For GUI applications, the handler also needs to deal with any platform-specific startup ids + * and make sure the mainwindow is shown as well as request its activation from the window manager. + * For X11, KDBusService makes the id for the Startup Notification protocol available + * from QX11Info::nextStartupId(), if there is one. + * For Wayland, KDBusService provides the token for the XDG Activation protocol in the + * "XDG_ACTIVATION_TOKEN" environment variable and unsets it again after the signal, if there is one. + * A typical implementation in the signal handler would be: + * @code + * mainWindow->show(); + * if (KWindowSystem::isPlatformX11()) { + * KStartupInfo::setNewStartupId(mainWindow->windowHandle(), QX11Info::nextStartupId()); + * } else if (KWindowSystem::isPlatformWayland()) { + * KWindowSystem::setCurrentXdgActivationToken(qEnvironmentVariable("XDG_ACTIVATION_TOKEN")); + * } * mainWindow->raise(); - * + * KWindowSystem::activateWindow(mainWindow->windowHandle()); * @endcode * * If you're using the builtin handling of @c --help and @c --version in QCommandLineParser, @@ -242,6 +252,12 @@ /** * Signals that one or more files should be opened in the application. * + * This signal is emitted to request handling of the respective method of the D-Bus activation. + * For GUI applications, the signal handler also needs to deal with any platform-specific startup ids + * and make sure the mainwindow is shown as well as request its activation from the window manager. + * See documentation of activateRequested(const QStringList &arguments, const QString &) + * for details. + * * @param uris The URLs of the files to open. */ void openRequested(const QList<QUrl> &uris); @@ -249,7 +265,13 @@ /** * Signals that an application action should be triggered. * - * See the desktop entry specification for more information. + * This signal is emitted to request handling of the respective method of the D-Bus activation. + * For GUI applications, the signal handler also needs to deal with any platform-specific startup ids + * and make sure the mainwindow is shown as well as request its activation from the window manager. + * See documentation of activateRequested(const QStringList &arguments, const QString &) + * for details. + * + * See the desktop entry specification for more information about action activation. */ void activateActionRequested(const QString &actionName, const QVariant ¶meter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.89.0/src/tools/kquitapp/CMakeLists.txt new/kdbusaddons-5.90.0/src/tools/kquitapp/CMakeLists.txt --- old/kdbusaddons-5.89.0/src/tools/kquitapp/CMakeLists.txt 2021-12-04 19:33:55.000000000 +0100 +++ new/kdbusaddons-5.90.0/src/tools/kquitapp/CMakeLists.txt 2022-01-01 13:28:07.000000000 +0100 @@ -1,4 +1,4 @@ add_executable(kquitapp5 kquitapp.cpp) ecm_mark_nongui_executable(kquitapp5) -target_link_libraries(kquitapp5 Qt5::DBus) +target_link_libraries(kquitapp5 Qt${QT_MAJOR_VERSION}::DBus) install(TARGETS kquitapp5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
