Hello community, here is the log from the commit of package kdbusaddons for openSUSE:Factory checked in at 2014-07-10 08:18:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-10 14:36:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdbusaddons.new/kdbusaddons.changes 2014-07-10 09:31:29.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jul 1 21:35:58 UTC 2014 - [email protected] + +- Update to 5.0.0 + * Final release of KDE Frameworks 5 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.0.php + +------------------------------------------------------------------- Old: ---- kdbusaddons-4.100.0.tar.xz New: ---- kdbusaddons-5.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdbusaddons.spec ++++++ --- /var/tmp/diff_new_pack.oOtIwL/_old 2014-07-10 09:31:30.000000000 +0200 +++ /var/tmp/diff_new_pack.oOtIwL/_new 2014-07-10 09:31:30.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5DBusAddons5 Name: kdbusaddons -Version: 4.100.0 +Version: 5.0.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.14 +BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.2.0 @@ -32,7 +32,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/unstable/frameworks/%{version}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{version}/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdbusaddons-4.100.0.tar.xz -> kdbusaddons-5.0.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.100.0/CMakeLists.txt new/kdbusaddons-5.0.0/CMakeLists.txt --- old/kdbusaddons-4.100.0/CMakeLists.txt 2014-06-01 14:12:44.000000000 +0200 +++ new/kdbusaddons-5.0.0/CMakeLists.txt 2014-07-01 20:28:37.000000000 +0200 @@ -2,7 +2,7 @@ project(KDBusAddons) -find_package(ECM 0.0.14 REQUIRED NO_MODULE) +find_package(ECM 1.0.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -23,7 +23,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "4.100.0") # handled by release scripts +set(KF5_VERSION "5.0.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-4.100.0/po/de/kdbusaddons5_qt.po new/kdbusaddons-5.0.0/po/de/kdbusaddons5_qt.po --- old/kdbusaddons-4.100.0/po/de/kdbusaddons5_qt.po 2014-06-01 14:12:44.000000000 +0200 +++ new/kdbusaddons-5.0.0/po/de/kdbusaddons5_qt.po 2014-07-01 20:28:37.000000000 +0200 @@ -1,9 +1,10 @@ # Burkhard Lück <[email protected]>, 2014. +# Frederik Schwarzer <[email protected]>, 2014. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2014-03-28 17:42+0100\n" -"Last-Translator: Burkhard Lück <[email protected]>\n" +"PO-Revision-Date: 2014-06-29 10:03+0200\n" +"Last-Translator: Frederik Schwarzer <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -21,7 +22,7 @@ #: tools/kquitapp/kquitapp.cpp:32 msgctxt "main|" msgid "Full service name, overrides application name provided" -msgstr "Vollständiger Dienstname, übergeht den angegebenen Programmnamen" +msgstr "Vollständiger Dienstname, übergeht den angegebenen Anwendungsnamen" #: tools/kquitapp/kquitapp.cpp:33 msgctxt "main|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.100.0/po/en_GB/kdbusaddons5_qt.po new/kdbusaddons-5.0.0/po/en_GB/kdbusaddons5_qt.po --- old/kdbusaddons-4.100.0/po/en_GB/kdbusaddons5_qt.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kdbusaddons-5.0.0/po/en_GB/kdbusaddons5_qt.po 2014-07-01 20:28:37.000000000 +0200 @@ -0,0 +1,52 @@ +# Steve Allewell <[email protected]>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"PO-Revision-Date: 2014-06-28 11:04+0100\n" +"Last-Translator: Steve Allewell <[email protected]>\n" +"Language-Team: British English <[email protected]>\n" +"Language: en_GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: tools/kquitapp/kquitapp.cpp:31 +msgctxt "main|" +msgid "Quit a D-Bus enabled application easily" +msgstr "Quit a D-Bus enabled application easily" + +#: tools/kquitapp/kquitapp.cpp:32 +msgctxt "main|" +msgid "Full service name, overrides application name provided" +msgstr "Full service name, overrides application name provided" + +#: tools/kquitapp/kquitapp.cpp:33 +msgctxt "main|" +msgid "Path in the D-Bus interface to use" +msgstr "Path in the D-Bus interface to use" + +#: tools/kquitapp/kquitapp.cpp:34 +msgctxt "main|" +msgid "The name of the application to quit" +msgstr "The name of the application to quit" + +#: tools/kquitapp/kquitapp.cpp:57 +#, qt-format +msgctxt "main|" +msgid "Application %1 could not be found using service %2 and path %3." +msgstr "Application %1 could not be found using service %2 and path %3." + +#: tools/kquitapp/kquitapp.cpp:63 +#, qt-format +msgctxt "main|" +msgid "" +"Quitting application %1 failed. Error reported was:\n" +"\n" +" %2 : %3" +msgstr "" +"Quitting application %1 failed. Error reported was:\n" +"\n" +" %2 : %3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.100.0/po/sl/kdbusaddons5_qt.po new/kdbusaddons-5.0.0/po/sl/kdbusaddons5_qt.po --- old/kdbusaddons-4.100.0/po/sl/kdbusaddons5_qt.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kdbusaddons-5.0.0/po/sl/kdbusaddons5_qt.po 2014-07-01 20:28:37.000000000 +0200 @@ -0,0 +1,53 @@ +# Andrej Mernik <[email protected]>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"PO-Revision-Date: 2014-06-12 14:27+0200\n" +"Last-Translator: Andrej Mernik <[email protected]>\n" +"Language-Team: Slovenian <[email protected]>\n" +"Language: sl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Qt-Contexts: true\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" +"X-Generator: Lokalize 1.5\n" + +#: tools/kquitapp/kquitapp.cpp:31 +msgctxt "main|" +msgid "Quit a D-Bus enabled application easily" +msgstr "Na preprost način končaj program, ki ima omogočen D-Bus" + +#: tools/kquitapp/kquitapp.cpp:32 +msgctxt "main|" +msgid "Full service name, overrides application name provided" +msgstr "Polno ime storitve, prepiše podano ime programa" + +#: tools/kquitapp/kquitapp.cpp:33 +msgctxt "main|" +msgid "Path in the D-Bus interface to use" +msgstr "Pot v vmesniku D-Bus, ki naj se uporabi" + +#: tools/kquitapp/kquitapp.cpp:34 +msgctxt "main|" +msgid "The name of the application to quit" +msgstr "Ime programa, ki naj bo končan" + +#: tools/kquitapp/kquitapp.cpp:57 +#, qt-format +msgctxt "main|" +msgid "Application %1 could not be found using service %2 and path %3." +msgstr "Z uporabo storitve %2 in poti %3 ni bilo mogoče najti programa %1." + +#: tools/kquitapp/kquitapp.cpp:63 +#, qt-format +msgctxt "main|" +msgid "" +"Quitting application %1 failed. Error reported was:\n" +"\n" +" %2 : %3" +msgstr "" +"Ni bilo mogoče končati programa %1. Sporočena napaka je bila:\n" +"\n" +" %2 : %3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.100.0/po/uk/kdbusaddons5_qt.po new/kdbusaddons-5.0.0/po/uk/kdbusaddons5_qt.po --- old/kdbusaddons-4.100.0/po/uk/kdbusaddons5_qt.po 2014-06-01 14:12:44.000000000 +0200 +++ new/kdbusaddons-5.0.0/po/uk/kdbusaddons5_qt.po 2014-07-01 20:28:37.000000000 +0200 @@ -1,7 +1,12 @@ +# Translation of kdbusaddons5_qt.po to Ukrainian +# Copyright (C) 2014 This_file_is_part_of_KDE +# 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. +# # Yuri Chornoivan <[email protected]>, 2014. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: kdbusaddons5_qt\n" "POT-Creation-Date: 2014-03-27 08:00+0200\n" "PO-Revision-Date: 2014-03-28 19:16+0200\n" "Last-Translator: Yuri Chornoivan <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.100.0/src/kdbusservice.cpp new/kdbusaddons-5.0.0/src/kdbusservice.cpp --- old/kdbusaddons-4.100.0/src/kdbusservice.cpp 2014-06-01 14:12:44.000000000 +0200 +++ new/kdbusaddons-5.0.0/src/kdbusservice.cpp 2014-07-01 20:28:37.000000000 +0200 @@ -111,16 +111,20 @@ 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"))); - QDBusReply<int> reply; if (QCoreApplication::arguments().count() > 1) { - reply = iface.call(QLatin1String("CommandLine"), QCoreApplication::arguments(), QDir::currentPath(), platform_data); + QDBusReply<int> reply = iface.call(QLatin1String("CommandLine"), QCoreApplication::arguments(), QDir::currentPath(), platform_data); + if (reply.isValid()) { + exit(reply.value()); + } else { + d->errorMessage = reply.error().message(); + } } else { - reply = iface.call(QLatin1String("Activate"), platform_data); - } - if (reply.isValid()) { - exit(reply.value()); - } else { - d->errorMessage = reply.error().message(); + QDBusReply<void> reply = iface.call(QLatin1String("Activate"), platform_data); + if (reply.isValid()) { + exit(0); + } else { + d->errorMessage = reply.error().message(); + } } } else { d->errorMessage = QLatin1String("Couldn't register name '") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.100.0/src/kdeinitinterface.cpp new/kdbusaddons-5.0.0/src/kdeinitinterface.cpp --- old/kdbusaddons-4.100.0/src/kdeinitinterface.cpp 2014-06-01 14:12:44.000000000 +0200 +++ new/kdbusaddons-5.0.0/src/kdeinitinterface.cpp 2014-07-01 20:28:37.000000000 +0200 @@ -20,8 +20,8 @@ */ #include "kdeinitinterface.h" +#include "kdbusconnectionpool.h" -#include <QDBusConnection> #include <QDBusConnectionInterface> #include <QDir> #include <QLockFile> @@ -31,7 +31,8 @@ void KDEInitInterface::ensureKdeinitRunning() { - if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QString::fromLatin1("org.kde.klauncher5"))) { + QDBusConnectionInterface *dbusDaemon = KDBusConnectionPool::threadConnection().interface(); + if (dbusDaemon->isServiceRegistered(QString::fromLatin1("org.kde.klauncher5"))) { return; } qDebug() << "klauncher not running... launching kdeinit"; @@ -39,7 +40,7 @@ QLockFile lock(QDir::tempPath() + QLatin1Char('/') + QLatin1String("startkdeinitlock")); if (!lock.tryLock()) { lock.lock(); - if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QString::fromLatin1("org.kde.klauncher5"))) { + if (dbusDaemon->isServiceRegistered(QString::fromLatin1("org.kde.klauncher5"))) { return; // whoever held the lock has already started it } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
