commit konsole for openSUSE:Factory
Hello community, here is the log from the commit of package konsole for openSUSE:Factory checked in at 2017-01-25 23:00:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-17 10:46:42.585178434 +0100 +++ /work/SRC/openSUSE:Factory/.konsole.new/konsole.changes 2017-01-25 23:01:00.484930382 +0100 @@ -1,0 +2,7 @@ +Sat Jan 14 09:00:05 UTC 2017 - lbeltrame@kde.org + +- - Update to KDE Applications 16.12.1 + * KDE Applications 16.12.1 + * https://www.kde.org/announcements/announce-applications-16.12.1.php + +------------------------------------------------------------------- Old: ---- konsole-16.12.0.tar.xz New: ---- konsole-16.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konsole.spec ++++++ --- /var/tmp/diff_new_pack.KWxdEq/_old 2017-01-25 23:01:01.172826398 +0100 +++ /var/tmp/diff_new_pack.KWxdEq/_new 2017-01-25 23:01:01.172826398 +0100 @@ -17,10 +17,10 @@ Name: konsole -Version: 16.12.0 +Version: 16.12.1 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.0 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.12.1 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: KDE Terminal License: GPL-2.0+ ++++++ konsole-16.12.0.tar.xz -> konsole-16.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-16.12.0/CMakeLists.txt new/konsole-16.12.1/CMakeLists.txt --- old/konsole-16.12.0/CMakeLists.txt 2016-12-06 20:51:40.000000000 +0100 +++ new/konsole-16.12.1/CMakeLists.txt 2017-01-07 19:47:24.000000000 +0100 @@ -4,7 +4,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") # minimal requirements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-16.12.0/src/Application.cpp new/konsole-16.12.1/src/Application.cpp --- old/konsole-16.12.0/src/Application.cpp 2016-12-06 20:51:40.000000000 +0100 +++ new/konsole-16.12.1/src/Application.cpp 2017-01-07 19:47:24.000000000 +0100 @@ -74,7 +74,8 @@ parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("background-mode"), i18nc("@info:shell", "Start Konsole in the background and bring to the front" " when Ctrl+Shift+F12 (by default) is pressed"))); - parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("separate"), i18n("Run in a separate process"))); + // --nofork is a compatibility alias for separate + parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("separate") << QStringLiteral("nofork"), i18n("Run in a separate process"))); parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("show-menubar"), i18nc("@info:shell", "Show the menubar, overriding the default setting"))); parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("hide-menubar"), i18nc("@info:shell", "Hide the menubar, overriding the default setting"))); parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("show-tabbar"), i18nc("@info:shell", "Show the tabbar, overriding the default setting"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konsole-16.12.0/src/main.cpp new/konsole-16.12.1/src/main.cpp --- old/konsole-16.12.0/src/main.cpp 2016-12-06 20:51:40.000000000 +0100 +++ new/konsole-16.12.1/src/main.cpp 2017-01-07 19:47:24.000000000 +0100 @@ -228,7 +228,10 @@ } // if users have explictly requested starting a new process - if (arguments.contains(QStringLiteral("--separate"))) { + // Support --nofork to retain argument compatibility with older + // versions. + if (arguments.contains(QStringLiteral("--separate")) || + arguments.contains(QStringLiteral("--nofork"))) { return true; }
participants (1)
-
root@hilbertn.suse.de