Hello community, here is the log from the commit of package kdbusaddons for openSUSE:Factory checked in at 2014-03-10 12:17:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-02-24 06:53:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdbusaddons.new/kdbusaddons.changes 2014-03-10 12:17:26.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 4 16:39:43 UTC 2014 - [email protected] + +- Update to 4.97.0: + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-alpha2.php + +------------------------------------------------------------------- Old: ---- kdbusaddons-4.96.0.tar.xz New: ---- kdbusaddons-4.97.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdbusaddons.spec ++++++ --- /var/tmp/diff_new_pack.sSPSkr/_old 2014-03-10 12:17:27.000000000 +0100 +++ /var/tmp/diff_new_pack.sSPSkr/_new 2014-03-10 12:17:27.000000000 +0100 @@ -16,12 +16,12 @@ # -%define lname libKF5DBusAddons4 +%define lname libKF5DBusAddons5 Name: kdbusaddons -Version: 4.96.0 +Version: 4.97.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.10 +BuildRequires: extra-cmake-modules >= 0.0.11 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 @@ -78,6 +78,7 @@ %files devel %defattr(-,root,root) +%{_kf5_bindir}/kquitapp5 %{_kf5_libdir}/libKF5DBusAddons.so %{_kf5_libdir}/cmake/KF5DBusAddons/ %dir %{_kf5_includedir}/*/ ++++++ kdbusaddons-4.96.0.tar.xz -> kdbusaddons-4.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.96.0/CMakeLists.txt new/kdbusaddons-4.97.0/CMakeLists.txt --- old/kdbusaddons-4.96.0/CMakeLists.txt 2014-02-05 02:41:41.000000000 +0100 +++ new/kdbusaddons-4.97.0/CMakeLists.txt 2014-03-01 12:50:25.000000000 +0100 @@ -2,7 +2,7 @@ project(KDBusAddons) -find_package(ECM 0.0.10 REQUIRED NO_MODULE) +find_package(ECM 0.0.11 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -15,15 +15,17 @@ include(FeatureSummary) include(GenerateExportHeader) -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) +include(ECMMarkNonGuiExecutable) -set(KF5_VERSION "4.96.0") +set(KF5_VERSION "4.97.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDBUSADDONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5DBusAddonsConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5DBusAddonsConfigVersion.cmake" + SOVERSION 5) @@ -34,7 +36,7 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5DBusAddons") -configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5DBusAddonsConfig.cmake.in" +ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5DBusAddonsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5DBusAddonsConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.96.0/src/CMakeLists.txt new/kdbusaddons-4.97.0/src/CMakeLists.txt --- old/kdbusaddons-4.96.0/src/CMakeLists.txt 2014-02-05 02:41:41.000000000 +0100 +++ new/kdbusaddons-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:25.000000000 +0100 @@ -1,3 +1,4 @@ +add_subdirectory(tools/kquitapp) set(libkdbusaddons_SRCS kdbusconnectionpool.cpp @@ -35,7 +36,8 @@ EXPORT_NAME DBusAddons ) -ecm_generate_headers( +ecm_generate_headers(KDBusAddons_HEADERS + HEADER_NAMES KDBusConnectionPool KDBusInterProcessLock KDBusService @@ -43,7 +45,6 @@ KDEInitInterface REQUIRED_HEADERS KDBusAddons_HEADERS ) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KDBusAddons DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) install(TARGETS KF5DBusAddons EXPORT KF5DBusAddonsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.96.0/src/kdbusconnectionpool.h new/kdbusaddons-4.97.0/src/kdbusconnectionpool.h --- old/kdbusaddons-4.96.0/src/kdbusconnectionpool.h 2014-02-05 02:41:41.000000000 +0100 +++ new/kdbusaddons-4.97.0/src/kdbusconnectionpool.h 2014-03-01 12:50:25.000000000 +0100 @@ -33,6 +33,22 @@ * has been fixed (either directly in libdbus or with a work- * around in Qt) this method can be dropped in favor of * QDBusConnection::sessionBus(). + * + * Note that this will create a thread-local QDBusConnection + * object, which means whichever thread this is called + * from must have both an event loop and be as long-lived as + * the object using it. If either condition is not met, the + * returned QDBusConnection will not send or receive DBus + * events (calls, return values, etc). + * + * Using this within libraries can create complexities for + * application developers working with threads as its use + * in the library may not be apparent to the application + * developer, and so functionality may appear to be broken + * simply due to the nature of the thread from which this + * ends up being called from. Library developers using + * this facility are strongly encouraged to note this + * caveat in the library's documentation. */ KDBUSADDONS_EXPORT QDBusConnection threadConnection(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.96.0/src/tools/kquitapp/CMakeLists.txt new/kdbusaddons-4.97.0/src/tools/kquitapp/CMakeLists.txt --- old/kdbusaddons-4.96.0/src/tools/kquitapp/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kdbusaddons-4.97.0/src/tools/kquitapp/CMakeLists.txt 2014-03-01 12:50:25.000000000 +0100 @@ -0,0 +1,4 @@ +add_executable(kquitapp5 kquitapp.cpp) +ecm_mark_nongui_executable(kquitapp5) +target_link_libraries(kquitapp5 Qt5::DBus) +install(TARGETS kquitapp5 ${INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.96.0/src/tools/kquitapp/kquitapp.cpp new/kdbusaddons-4.97.0/src/tools/kquitapp/kquitapp.cpp --- old/kdbusaddons-4.96.0/src/tools/kquitapp/kquitapp.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdbusaddons-4.97.0/src/tools/kquitapp/kquitapp.cpp 2014-03-01 12:50:25.000000000 +0100 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2006 Aaron Seigo <[email protected]> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License version 2 as + * published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include <QCoreApplication> +#include <QCommandLineParser> +#include <QDBusInterface> +#include <QDebug> + +int main(int argc, char* argv[]) +{ + QCoreApplication app(argc, argv); + app.setApplicationName(QStringLiteral("kquitapp")); + app.setApplicationVersion(QStringLiteral("2.0")); + + QCommandLineParser parser; + parser.setApplicationDescription(QCoreApplication::translate("main", "Quit a D-Bus enabled application easily")); + parser.addOption(QCommandLineOption(QStringLiteral("service"), QCoreApplication::translate("main", "Full service name, overrides application name provided"), QStringLiteral("service"))); + parser.addOption(QCommandLineOption(QStringLiteral("path"), QCoreApplication::translate("main", "Path in the D-Bus interface to use"), QStringLiteral("path"), QStringLiteral("/MainApplication"))); + parser.addPositionalArgument(QStringLiteral("application"), QCoreApplication::translate("main", "The name of the application to quit")); + parser.addHelpOption(); + parser.addVersionOption(); + parser.process(app); + + QString service; + if (parser.isSet(QStringLiteral("service"))) + { + service = parser.value(QStringLiteral("service")); + } + else if(parser.positionalArguments().isEmpty()) + { + service = QStringLiteral("org.kde.%1").arg(parser.positionalArguments()[0]); + } + else + { + parser.showHelp(1); + } + + QString path(parser.value(QStringLiteral("path"))); + + QDBusInterface interface(service, path); + if (!interface.isValid()) { + qWarning() << QCoreApplication::translate("main", "Application %1 could not be found using service %2 and path %3.").arg(parser.positionalArguments().first()).arg(service).arg(path); + return 1; + } + interface.call(QStringLiteral("quit")); + QDBusError error = interface.lastError(); + if (error.type() != QDBusError::NoError) { + qWarning() << QCoreApplication::translate("main", "Quitting application %1 failed. Error reported was:\n\n %2 : %3").arg(parser.positionalArguments().first()).arg(error.name()).arg(error.message()); + return 1; + } + return 0; +} + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
