Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2014-10-16 18:11:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-09-18 07:57:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.konsole.new/konsole.changes 2014-10-16 18:11:38.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Oct 12 12:00:02 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.14.2 + * KDE 4.14.2 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.2.php + +------------------------------------------------------------------- Old: ---- konsole-4.14.1.tar.xz New: ---- konsole-4.14.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.RVVBnP/_old 2014-10-16 18:11:39.000000000 +0200 +++ /var/tmp/diff_new_pack.RVVBnP/_new 2014-10-16 18:11:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: konsole -Version: 4.14.1 +Version: 4.14.2 Release: 0 Summary: KDE Terminal License: GPL-2.0+ ++++++ konsole-4.14.1.tar.xz -> konsole-4.14.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.14.1/desktop/konsolerun.desktop new/konsole-4.14.2/desktop/konsolerun.desktop --- old/konsole-4.14.1/desktop/konsolerun.desktop 2014-09-09 14:47:03.000000000 +0200 +++ new/konsole-4.14.2/desktop/konsolerun.desktop 2014-10-09 15:39:08.000000000 +0200 @@ -30,6 +30,7 @@ Name[id]=Jalankan Di Konsole Name[is]=Keyra í Konsole skjáhermi Name[it]=Esegui in Konsole +Name[ja]=Konsole で実行 Name[ko]=Konsole에서 실행 Name[nb]=Kjør i Konsole Name[nds]=Binnen Konsole lopen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.14.1/src/Application.cpp new/konsole-4.14.2/src/Application.cpp --- old/konsole-4.14.1/src/Application.cpp 2014-09-09 14:47:03.000000000 +0200 +++ new/konsole-4.14.2/src/Application.cpp 2014-10-09 15:39:08.000000000 +0200 @@ -30,12 +30,14 @@ #include <KActionCollection> #include <KCmdLineArgs> #include <KDebug> +#include <KStandardDirs> // Konsole #include "SessionManager.h" #include "ProfileManager.h" #include "MainWindow.h" #include "Session.h" +#include "ShellCommand.h" using namespace Konsole; @@ -411,14 +413,19 @@ QString commandExec = args->getOption("e"); QStringList commandArguments; - //commandArguments << args->getOption("e"); - commandArguments << commandExec; - // Note: KCmdLineArgs::count() return the number of arguments // that aren't options. - for ( int i = 0 ; i < args->count() ; i++ ) - commandArguments << args->arg(i); - + if (args->count() == 0 && KStandardDirs::findExe(commandExec).isEmpty()) { + // Example: konsole -e "man ls" + ShellCommand shellCommand(args->getOption("e")); + commandExec = shellCommand.command(); + commandArguments = shellCommand.arguments(); + } else { + // Example: konsole -e man ls + commandArguments << commandExec; + for ( int i = 0 ; i < args->count() ; i++ ) + commandArguments << args->arg(i); + } if (commandExec.startsWith(QLatin1String("./"))) commandExec = QDir::currentPath() + commandExec.mid(1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.14.1/src/Session.h new/konsole-4.14.2/src/Session.h --- old/konsole-4.14.1/src/Session.h 2014-09-09 14:47:03.000000000 +0200 +++ new/konsole-4.14.2/src/Session.h 2014-10-09 15:39:08.000000000 +0200 @@ -54,6 +54,17 @@ class HistoryType; /** + * Platform-specific main shortcut "opcode": + */ +enum Modifier { +#ifdef Q_OS_MAC + ACCEL = Qt::META +#else + ACCEL = Qt::CTRL +#endif +}; + +/** * Represents a terminal session consisting of a pseudo-teletype and a terminal emulation. * The pseudo-teletype (or PTY) handles I/O between the terminal process and Konsole. * The terminal emulation ( Emulation and subclasses ) processes the output stream from the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-4.14.1/src/main.cpp new/konsole-4.14.2/src/main.cpp --- old/konsole-4.14.1/src/main.cpp 2014-09-09 14:47:03.000000000 +0200 +++ new/konsole-4.14.2/src/main.cpp 2014-10-09 15:39:08.000000000 +0200 @@ -29,7 +29,7 @@ #include <KCmdLineArgs> #include <KLocale> -#define KONSOLE_VERSION "2.14.1" +#define KONSOLE_VERSION "2.14.2" using Konsole::Application; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
