[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-15-gc4bb01c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=67f0cf9

The following commit has been merged in the master branch:
commit 67f0cf9f25f3f22d04c9434d4aec85503e0fda72
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 27 13:41:55 2017 +0200

    Add upstream patch: Add-nofork-as-compatibility-alias-for-separate.patch
---
 ...ofork-as-compatibility-alias-for-separate.patch | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 56 insertions(+)

diff --git a/debian/patches/Add-nofork-as-compatibility-alias-for-separate.patch b/debian/patches/Add-nofork-as-compatibility-alias-for-separate.patch
new file mode 100644
index 0000000..30d1f15
--- /dev/null
+++ b/debian/patches/Add-nofork-as-compatibility-alias-for-separate.patch
@@ -0,0 +1,55 @@
+From: Harald Sitter <sitter at kde.org>
+Date: Mon, 19 Dec 2016 09:09:03 +0100
+Subject: Add --nofork as compatibility alias for --separate
+
+In previous incarnations of kuniqueapplication it used to inject a common
+command option --nofork which is meant to bypass single-instance behavior.
+Given that konsole can and is being invoked from scripts they may well want
+to ensure that the fork they created is the actual instance of konsole.
+i.e. to monitor return values and life time
+
+Presently, since the options are divergent between konsole4 and konsole5,
+scripts are either incompatible with older konsoles or with newer konsoles.
+To make life easier for everyone add a compat alias --nofork, which
+behaves exactly like separate.
+
+(this unbreaks steam, which is a notable recent offender of falling into
+ this particular trap)
+
+REVIEW: 129647
+CHANGELOG: Added compatibility command option `--nofork` for single-instance behavior
+---
+ src/Application.cpp | 3 ++-
+ src/main.cpp        | 5 ++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/Application.cpp b/src/Application.cpp
+index 12ffe230..f165f1b5 100644
+--- a/src/Application.cpp
++++ b/src/Application.cpp
+@@ -74,7 +74,8 @@ void Application::populateCommandLineParser(QCommandLineParser *parser)
+     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 --git a/src/main.cpp b/src/main.cpp
+index e77597ad..fb53560e 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -232,7 +232,10 @@ bool shouldUseNewProcess(int argc, char *argv[])
+     }
+ 
+     // 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;
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1069adc..22ec607 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Pre-process-the-e-custom-command-argument.patch
 upstream_render_text_at_primary_fonts_baseline.patch
+Add-nofork-as-compatibility-alias-for-separate.patch

-- 
konsole packaging