Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2016-08-29 15:33:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konsole (Old) and /work/SRC/openSUSE:Factory/.konsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konsole" Changes: -------- --- /work/SRC/openSUSE:Factory/konsole/konsole.changes 2016-07-21 07:47:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konsole.new/konsole.changes 2016-08-29 15:33:53.000000000 +0200 @@ -1,0 +2,24 @@ +Sun Aug 28 21:41:48 UTC 2016 - [email protected] + +- Add fix-extra-window-when-restored-by-session-management.patch to + prevent creating an extra window upon session restoration + (kde#367447) + +------------------------------------------------------------------- +Fri Aug 12 10:22:08 UTC 2016 - [email protected] + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:18:11 UTC 2016 - [email protected] + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + +- Drop upstreamed patch Write-profile-changes-to-Konsoles-location.patch + +------------------------------------------------------------------- Old: ---- Write-profile-changes-to-Konsoles-location.patch konsole-16.04.3.tar.xz New: ---- fix-extra-window-when-restored-by-session-management.patch konsole-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.1MU1Mk/_old 2016-08-29 15:33:55.000000000 +0200 +++ /var/tmp/diff_new_pack.1MU1Mk/_new 2016-08-29 15:33:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: konsole -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: KDE Terminal License: GPL-2.0+ @@ -32,8 +32,8 @@ Source24: utilities-terminal-su-48.png Source25: utilities-terminal-su-64.png Source26: utilities-terminal-su-128.png -# PATCH-FIX-UPSTREAM Write-profile-changes-to-Konsoles-location.patch kde#364336 -- fix modifying profiles when konsole is embedded in other applications -Patch: Write-profile-changes-to-Konsoles-location.patch +# PATCH-FIX-UPSTREAM fix-extra-window-when-restored-by-session-management.patch kde#367447 -- prevents creating an extra window upon session restoration +Patch: fix-extra-window-when-restored-by-session-management.patch BuildRequires: fdupes BuildRequires: kbookmarks-devel BuildRequires: kconfig-devel @@ -121,8 +121,8 @@ %dir %{_kf5_htmldir}/en %dir %{_kf5_htmldir} %doc %{_kf5_htmldir}/en/konsole/ -%dir %_kf5_sharedir/appdata -%_kf5_sharedir/appdata/org.kde.konsole.appdata.xml +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.konsole.appdata.xml %files part %defattr(-,root,root) @@ -133,7 +133,6 @@ %dir %{_kf5_servicetypesdir} %{_kf5_servicetypesdir}/terminalemulator.desktop %{_kf5_sharedir}/konsole/ -%{_kf5_sharedir}/kxmlgui5/ %{_kf5_notifydir}/ %dir %{_kf5_plugindir} %{_kf5_plugindir}/konsolepart.so ++++++ fix-extra-window-when-restored-by-session-management.patch ++++++ From: Kurt Hindenburg <[email protected]> Date: Sun, 28 Aug 2016 13:08:02 +0000 Subject: Prevent 2 windows from opening upon session restore X-Git-Url: http://quickgit.kde.org/?p=konsole.git&a=commitdiff&h=5b11fd593b954504343bdb418c54a8e7913d9c7c --- Prevent 2 windows from opening upon session restore Session management would start 2 konsole windows upon login. Thanks John Stanley (jpsinthemix gmail com) for patch BUG: 367447 --- --- a/src/main.cpp +++ b/src/main.cpp @@ -158,14 +158,13 @@ // of Konsole is started. QObject::connect(&dbusService, &KDBusService::activateRequested, &konsoleApp, &Application::slotActivateRequested); - if (!konsoleApp.newInstance()) { + if (app->isSessionRestored()) { + restoreSession(konsoleApp); + } else if (!konsoleApp.newInstance()) { // An argument that printed something and mean we should just quit was passed. delete app; return 0; } - - if (app->isSessionRestored()) - restoreSession(konsoleApp); // Since we've allocated the QApplication on the heap for the KDBusService workaround, // we need to delete it manually before returning from main(). ++++++ konsole-16.04.3.tar.xz -> konsole-16.08.0.tar.xz ++++++ ++++ 7297 lines of diff (skipped)
