Hello community, here is the log from the commit of package kate5 for openSUSE:Factory checked in at 2015-02-27 11:09:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate5 (Old) and /work/SRC/openSUSE:Factory/.kate5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kate5" Changes: -------- --- /work/SRC/openSUSE:Factory/kate5/kate5.changes 2015-02-11 16:43:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kate5.new/kate5.changes 2015-02-27 11:09:48.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 25 18:25:17 UTC 2015 - hrvoje.senjan@gmail.com + +- Added katefix.diff: Register with dbus to wake up KRun, and + unregister then (kde#339094) + +------------------------------------------------------------------- New: ---- katefix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate5.spec ++++++ --- /var/tmp/diff_new_pack.Thz8Oa/_old 2015-02-27 11:09:49.000000000 +0100 +++ /var/tmp/diff_new_pack.Thz8Oa/_new 2015-02-27 11:09:49.000000000 +0100 @@ -24,6 +24,8 @@ Group: Productivity/Editors/Other Url: http://www.kde.org/ Source0: kate-%{version}.tar.xz +# PATCH-FIX-UPSTREAM katefix.diff -- https://git.reviewboard.kde.org/r/122498/ +Patch0: katefix.diff BuildRequires: karchive-devel BuildRequires: kcmutils-devel BuildRequires: kcompletion-devel @@ -91,6 +93,7 @@ %prep %setup -q -n kate-%{version} +%patch0 -p1 %build %cmake_kf5 -d build ++++++ katefix.diff ++++++ diff --git a/kate/src/kateapp.cpp b/kate/src/kateapp.cpp index 4c26f33..b83481e 100644 --- a/kate/src/kateapp.cpp +++ b/kate/src/kateapp.cpp @@ -151,10 +151,8 @@ bool KateApp::startupKate() } else if (!m_args.isSet(QStringLiteral("stdin")) && (m_args.positionalArguments().count() == 0)) { // only start session if no files specified // let the user choose session if possible if (!sessionManager()->chooseSession()) { -#ifdef Q_WS_X11 // we will exit kate now, notify the rest of the world we are done - KStartupInfo::appStarted(startupId()); -#endif + KStartupInfo::appStarted(KStartupInfo::startupId()); return false; } } else { @@ -167,9 +165,7 @@ bool KateApp::startupKate() } // notify about start -#ifdef Q_WS_X11 - KStartupInfo::setNewStartupId(activeKateMainWindow(), startupId()); -#endif + KStartupInfo::setNewStartupId(activeKateMainWindow(), KStartupInfo::startupId()); QTextCodec *codec = m_args.isSet(QStringLiteral("encoding")) ? QTextCodec::codecForName(m_args.value(QStringLiteral("encoding")).toUtf8()) : 0; bool tempfileSet = m_args.isSet(QStringLiteral("tempfile")); diff --git a/kate/src/main.cpp b/kate/src/main.cpp index 8852754..7417b89 100644 --- a/kate/src/main.cpp +++ b/kate/src/main.cpp @@ -25,6 +25,7 @@ #include <KAboutData> #include <KLocalizedString> +#include <KStartupInfo> #include <kdbusservice.h> #include <QByteArray> @@ -390,10 +391,12 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) QDBusConnection::sessionBus().connect(serviceName, QStringLiteral("/MainApplication"), QStringLiteral("org.kde.Kate.Application"), QStringLiteral("documentClosed"), waiter, SLOT(documentClosed(QString))); } - #ifdef Q_WS_X11 + // KToolInvocation (and KRun) will wait until we register on dbus + KDBusService dbusService(KDBusService::Multiple); + dbusService.unregister(); + // make the world happy, we are started, kind of... KStartupInfo::appStarted(); - #endif // this will wait until exiting is emitted by the used instance, if wanted... return needToBlock ? app.exec() : 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org