Hello community, here is the log from the commit of package kdbusaddons for openSUSE:Factory checked in at 2016-04-12 19:13:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdbusaddons (Old) and /work/SRC/openSUSE:Factory/.kdbusaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdbusaddons" Changes: -------- --- /work/SRC/openSUSE:Factory/kdbusaddons/kdbusaddons.changes 2016-03-16 10:28:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdbusaddons.new/kdbusaddons.changes 2016-04-12 19:13:20.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Apr 4 14:19:36 UTC 2016 - [email protected] + +- Update to 5.21.0 (boo#974793) + * Avoid introspecting a DBus interface when we don't use it + * Upgrade Qt version requirement to 5.4.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.21.0.php + +------------------------------------------------------------------- Old: ---- kdbusaddons-5.20.0.tar.xz New: ---- kdbusaddons-5.21.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdbusaddons.spec ++++++ --- /var/tmp/diff_new_pack.zsBSLj/_old 2016-04-12 19:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.zsBSLj/_new 2016-04-12 19:13:21.000000000 +0200 @@ -18,20 +18,20 @@ %bcond_without lang %define lname libKF5DBusAddons5 -%define _tar_path 5.20 +%define _tar_path 5.21 Name: kdbusaddons -Version: 5.20.0 +Version: 5.21.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kf5-filesystem %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.3.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.4.0 %endif -BuildRequires: cmake(Qt5DBus) >= 5.3.0 -BuildRequires: cmake(Qt5Test) >= 5.3.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.3.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 Summary: Convenience classes for QtDBus License: LGPL-2.1+ Group: System/GUI/KDE @@ -70,7 +70,7 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5DBus) >= 5.3.0 +Requires: cmake(Qt5DBus) >= 5.4.0 %description devel KDBusAddons provides convenience classes on top of QtDBus, as well as an API to ++++++ kdbusaddons-5.20.0.tar.xz -> kdbusaddons-5.21.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.20.0/CMakeLists.txt new/kdbusaddons-5.21.0/CMakeLists.txt --- old/kdbusaddons-5.20.0/CMakeLists.txt 2016-03-05 19:51:00.000000000 +0100 +++ new/kdbusaddons-5.21.0/CMakeLists.txt 2016-04-03 22:48:02.000000000 +0200 @@ -3,7 +3,7 @@ project(KDBusAddons) include(FeatureSummary) -find_package(ECM 5.20.0 NO_MODULE) +find_package(ECM 5.21.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -14,7 +14,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -set(REQUIRED_QT_VERSION 5.3.0) +set(REQUIRED_QT_VERSION 5.4.0) find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) @@ -27,7 +27,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.20.0") # handled by release scripts +set(KF5_VERSION "5.21.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDBUSADDONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.20.0/src/CMakeLists.txt new/kdbusaddons-5.21.0/src/CMakeLists.txt --- old/kdbusaddons-5.20.0/src/CMakeLists.txt 2016-03-05 19:51:00.000000000 +0100 +++ new/kdbusaddons-5.21.0/src/CMakeLists.txt 2016-04-03 22:48:02.000000000 +0200 @@ -11,6 +11,11 @@ ${libkdbusaddons_QM_LOADER} ) + +qt5_add_dbus_interface(libkdbusaddons_SRCS org.freedesktop.Application.xml FreeDesktopApplpicationIface) +qt5_add_dbus_interface(libkdbusaddons_SRCS org.kde.KDBusService.xml KDBusServiceIface) + + qt5_add_dbus_adaptor(libkdbusaddons_SRCS org.freedesktop.Application.xml kdbusservice.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-5.20.0/src/kdbusservice.cpp new/kdbusaddons-5.21.0/src/kdbusservice.cpp --- old/kdbusaddons-5.20.0/src/kdbusservice.cpp 2016-03-05 19:51:00.000000000 +0100 +++ new/kdbusaddons-5.21.0/src/kdbusservice.cpp 2016-04-03 22:48:02.000000000 +0200 @@ -27,9 +27,11 @@ #include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnectionInterface> -#include <QtDBus/QDBusInterface> #include <QtDBus/QDBusReply> +#include "KDBusServiceIface.h" +#include "FreeDesktopApplpicationIface.h" + #include "config-kdbusaddons.h" #if HAVE_X11 @@ -112,19 +114,21 @@ if (!d->registered) { if (options & Unique) { // Already running so it's ok! - QDBusInterface iface(d->serviceName, objectPath); - iface.setTimeout(5 * 60 * 1000); // Application can take time to answer QVariantMap platform_data; platform_data.insert(QStringLiteral("desktop-startup-id"), QString::fromUtf8(qgetenv("DESKTOP_STARTUP_ID"))); if (QCoreApplication::arguments().count() > 1) { - QDBusReply<int> reply = iface.call(QStringLiteral("CommandLine"), QCoreApplication::arguments(), QDir::currentPath(), platform_data); + OrgKdeKDBusServiceInterface iface(d->serviceName, objectPath, QDBusConnection::sessionBus()); + iface.setTimeout(5 * 60 * 1000); // Application can take time to answer + QDBusReply<int> reply = iface.CommandLine(QCoreApplication::arguments(), QDir::currentPath(), platform_data); if (reply.isValid()) { exit(reply.value()); } else { d->errorMessage = reply.error().message(); } } else { - QDBusReply<void> reply = iface.call(QStringLiteral("Activate"), platform_data); + OrgFreedesktopApplicationInterface iface(d->serviceName, objectPath, QDBusConnection::sessionBus()); + iface.setTimeout(5 * 60 * 1000); // Application can take time to answer + QDBusReply<void> reply = iface.Activate(platform_data); if (reply.isValid()) { exit(0); } else {
