[SCM] konsole packaging branch, master, updated. debian/16.12.0-1-74-g5fbd59b
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Nov 21 15:06:34 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=3011d10
The following commit has been merged in the master branch:
commit 3011d108adab84f459ee344b005b65993d83c33b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Aug 8 16:35:00 2017 +0200
Drop upstream patches
---
...ck-for-valid-container-possible-crash-fix.patch | 26 ----
...ofork-as-compatibility-alias-for-separate.patch | 55 --------
.../Allow-ANSI-string-terminator-to-work.patch | 34 -----
.../patches/Correct-ANSI-string-terminator.patch | 28 -----
...e-newlines-in-selection-if-trimming-is-on.patch | 33 -----
debian/patches/Fix-build.patch | 23 ----
...ening-of-new-tabs-with-multiple-processes.patch | 27 ----
...word-boundaries-with-combining-characters.patch | 32 -----
.../Handle-surrogate-utf16-characters.patch | 48 -------
...Limit-ourselves-to-3-combining-characters.patch | 49 --------
...Pre-process-the-e-custom-command-argument.patch | 138 ---------------------
...tial-crash-when-ExtendedCharTable-tries-t.patch | 21 ----
...rminalDisplay-Abort-painting-invalid-rect.patch | 25 ----
...ease-date-scripting-and-command-line-help.patch | 112 -----------------
debian/patches/series | 15 ---
...eam_render_text_at_primary_fonts_baseline.patch | 50 --------
16 files changed, 716 deletions(-)
diff --git a/debian/patches/Add-check-for-valid-container-possible-crash-fix.patch b/debian/patches/Add-check-for-valid-container-possible-crash-fix.patch
deleted file mode 100644
index 9f59b97..0000000
--- a/debian/patches/Add-check-for-valid-container-possible-crash-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Kurt Hindenburg <kurt.hindenburg at gmail.com>
-Date: Fri, 21 Apr 2017 21:40:32 -0400
-Subject: Add check for valid container (possible crash fix)
-
-Possible fix for crashes from ambiguous shortcuts. I have been unable
-to duplicate the crashes.
-
-CCBUG: 375540
----
- src/ViewManager.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp
-index c187e646..50d650d1 100644
---- a/src/ViewManager.cpp
-+++ b/src/ViewManager.cpp
-@@ -905,6 +905,9 @@ void ViewManager::saveSessions(KConfigGroup& group)
- // first: sessions in the active container, preserving the order
- ViewContainer* container = _viewSplitter->activeContainer();
- Q_ASSERT(container);
-+ if (container == nullptr) {
-+ return;
-+ }
- TerminalDisplay* activeview = qobject_cast<TerminalDisplay*>(container->activeView());
-
- QListIterator<QWidget*> viewIter(container->views());
diff --git a/debian/patches/Add-nofork-as-compatibility-alias-for-separate.patch b/debian/patches/Add-nofork-as-compatibility-alias-for-separate.patch
deleted file mode 100644
index 30d1f15..0000000
--- a/debian/patches/Add-nofork-as-compatibility-alias-for-separate.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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/Allow-ANSI-string-terminator-to-work.patch b/debian/patches/Allow-ANSI-string-terminator-to-work.patch
deleted file mode 100644
index 2c75d56..0000000
--- a/debian/patches/Allow-ANSI-string-terminator-to-work.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Kurt Hindenburg <kurt.hindenburg at gmail.com>
-Date: Sat, 28 Jan 2017 10:22:52 -0500
-Subject: Allow ANSI string terminator to work
-
-Treat "\e]0;<title>\e\" (set window title) the same way
-it interprets "\e]0;<title>".
-
-It seems that Konsole does not recognize the standard string terminator
-sequence "\e\" (ESC \). Everything works fine if I use "" (BEL).
-
-<http://invisible-island.net/xterm/xterm.faq.html#how2_title>
-
-Thanks to Aniketh Girish anikethgireesh gmail com and Martin Sandsmark
-martin sandsmark kde org for patch/review
-
-BUG:231405
-REVIEW:129895
----
- src/Vt102Emulation.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
-index a0c73cef..1bde8469 100644
---- a/src/Vt102Emulation.cpp
-+++ b/src/Vt102Emulation.cpp
-@@ -280,7 +280,7 @@ void Vt102Emulation::initTokenizer()
- #define epe( ) (p >= 3 && s[2] == '!')
- #define egt( ) (p >= 3 && s[2] == '>')
- #define Xpe (tokenBufferPos >= 2 && tokenBuffer[1] == ']')
--#define Xte (Xpe && cc == 7 )
-+#define Xte (Xpe && (cc == 7 || cc == 33))
- #define ces(C) (cc < 256 && (charClass[cc] & (C)) == (C) && !Xte)
-
- #define CNTL(c) ((c)-'@')
diff --git a/debian/patches/Correct-ANSI-string-terminator.patch b/debian/patches/Correct-ANSI-string-terminator.patch
deleted file mode 100644
index 0c987da..0000000
--- a/debian/patches/Correct-ANSI-string-terminator.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Kurt Hindenburg <kurt.hindenburg at gmail.com>
-Date: Mon, 24 Apr 2017 23:28:01 -0400
-Subject: Correct ANSI string terminator
-
-Use the correct decimal value 27
-
-In bash, PS1="\e]0;<title>\e\" or PS1="\e]0;<title>"
-
-BUG: 231405
-
-Differential Revision: https://phabricator.kde.org/D5576
----
- src/Vt102Emulation.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp
-index 1bde8469..cac34ec3 100644
---- a/src/Vt102Emulation.cpp
-+++ b/src/Vt102Emulation.cpp
-@@ -280,7 +280,7 @@ void Vt102Emulation::initTokenizer()
- #define epe( ) (p >= 3 && s[2] == '!')
- #define egt( ) (p >= 3 && s[2] == '>')
- #define Xpe (tokenBufferPos >= 2 && tokenBuffer[1] == ']')
--#define Xte (Xpe && (cc == 7 || cc == 33))
-+#define Xte (Xpe && (cc == 7 || cc == 27))
- #define ces(C) (cc < 256 && (charClass[cc] & (C)) == (C) && !Xte)
-
- #define CNTL(c) ((c)-'@')
diff --git a/debian/patches/Don-t-include-newlines-in-selection-if-trimming-is-on.patch b/debian/patches/Don-t-include-newlines-in-selection-if-trimming-is-on.patch
deleted file mode 100644
index 1dd4d96..0000000
--- a/debian/patches/Don-t-include-newlines-in-selection-if-trimming-is-on.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
-Date: Sun, 15 Jan 2017 14:14:10 +0100
-Subject: Don't include newlines in selection if trimming is on
-
-BUG: 199381
-REVIEW: 129837
----
- src/Screen.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/Screen.cpp b/src/Screen.cpp
-index 5438e83b..0b3124a5 100644
---- a/src/Screen.cpp
-+++ b/src/Screen.cpp
-@@ -1185,7 +1185,8 @@ void Screen::writeToStream(TerminalCharacterDecoder* decoder,
- // this makes it possible to 'select' a trailing new line character after
- // the text on a line.
- if (y == bottom &&
-- copied < count) {
-+ copied < count &&
-+ !trimTrailingSpaces) {
- Character newLineChar('
');
- decoder->decodeLine(&newLineChar, 1, 0);
- }
-@@ -1257,7 +1258,7 @@ int Screen::copyLineToStream(int line ,
- // ignore trailing white space at the end of the line
- for (int i = length-1; i >= 0; i--)
- {
-- if (data[i].character == ' ')
-+ if (QChar(data[i].character).isSpace())
- length--;
- else
- break;
diff --git a/debian/patches/Fix-build.patch b/debian/patches/Fix-build.patch
deleted file mode 100644
index 1a854c6..0000000
--- a/debian/patches/Fix-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Aleix Pol <aleixpol at kde.org>
-Date: Wed, 18 Jan 2017 12:15:00 +0100
-Subject: Fix build
-
-frameworks/konsole/src/Session.cpp:839:5: warning: 'not' is not defined,
-evaluates to 0 [-Wundef]
----
- src/Session.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Session.cpp b/src/Session.cpp
-index d63c8a0c..482ee0b6 100644
---- a/src/Session.cpp
-+++ b/src/Session.cpp
-@@ -836,7 +836,7 @@ void Session::sendTextToTerminal(const QString& text, const QChar& eol) const
- // Only D-Bus calls this function (via SendText or runCommand)
- void Session::sendText(const QString& text) const
- {
--#if not defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS)
-+#if !defined(REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS)
- if (show_disallow_certain_dbus_methods_message) {
-
- KNotification::event(KNotification::Warning, "Konsole D-Bus Warning",
diff --git a/debian/patches/Fix-opening-of-new-tabs-with-multiple-processes.patch b/debian/patches/Fix-opening-of-new-tabs-with-multiple-processes.patch
deleted file mode 100644
index e88ad25..0000000
--- a/debian/patches/Fix-opening-of-new-tabs-with-multiple-processes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
-Date: Wed, 25 Jan 2017 22:25:48 +0100
-Subject: Fix opening of new tabs with multiple processes
-
-Make sure we re-use the process if the user wants a new tab.
-
-BUG: 373440
-REVIEW: 129886
----
- src/main.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index fb53560e..db3b83bf 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -121,8 +121,8 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[])
- parser->process(args);
- about.processCommandLine(parser.data());
-
-- // Enable user to force multiple instances
-- if (!Konsole::KonsoleSettings::useSingleInstance()) {
-+ // Enable user to force multiple instances, unless a new tab is requested
-+ if (!Konsole::KonsoleSettings::useSingleInstance() && !parser->isSet(QStringLiteral("new-tab"))) {
- startupOption = KDBusService::Multiple;
- }
-
diff --git a/debian/patches/Fix-word-boundaries-with-combining-characters.patch b/debian/patches/Fix-word-boundaries-with-combining-characters.patch
deleted file mode 100644
index 4440471..0000000
--- a/debian/patches/Fix-word-boundaries-with-combining-characters.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
-Date: Sun, 15 Jan 2017 16:38:55 +0100
-Subject: Fix word boundaries with combining characters
-
-Without this it doesn't correctly detect word boundaries e. g. in
-arabic.
-
-REVIEW: 129840
----
- src/TerminalDisplay.cpp | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
-index f8263499..74be5858 100644
---- a/src/TerminalDisplay.cpp
-+++ b/src/TerminalDisplay.cpp
-@@ -2794,10 +2794,11 @@ QChar TerminalDisplay::charClass(const Character& ch) const
- const QString s = QString::fromUtf16(chars, extendedCharLength);
- if (_wordCharacters.contains(s, Qt::CaseInsensitive))
- return 'a';
-- bool allLetterOrNumber = true;
-- for (int i = 0; allLetterOrNumber && i < s.size(); ++i)
-- allLetterOrNumber = s.at(i).isLetterOrNumber();
-- return allLetterOrNumber ? 'a' : s.at(0);
-+ bool letterOrNumber = false;
-+ for (int i = 0; !letterOrNumber && i < s.size(); ++i) {
-+ letterOrNumber = s.at(i).isLetterOrNumber();
-+ }
-+ return letterOrNumber ? 'a' : s.at(0);
- }
- return 0;
- } else {
diff --git a/debian/patches/Handle-surrogate-utf16-characters.patch b/debian/patches/Handle-surrogate-utf16-characters.patch
deleted file mode 100644
index 962ed8d..0000000
--- a/debian/patches/Handle-surrogate-utf16-characters.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
-Date: Sun, 15 Jan 2017 16:48:24 +0100
-Subject: Handle surrogate utf16 characters
-
-For our own sanity we (falsely) assume that all surrogate characters are
-double width, otherwise we have to go back and reflow the line.
-
-This makes it work better with emojis in vim at least.
-
-REVIEW: 129841
----
- src/Screen.cpp | 2 +-
- src/konsole_wcwidth.cpp | 8 +++++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/Screen.cpp b/src/Screen.cpp
-index d674017b..5438e83b 100644
---- a/src/Screen.cpp
-+++ b/src/Screen.cpp
-@@ -636,7 +636,7 @@ void Screen::displayCharacter(unsigned short c)
- return;
- } else if (w == 0) {
- const QChar::Category category = QChar(c).category();
-- if (category != QChar::Mark_NonSpacing && category != QChar::Letter_Other) {
-+ if (category != QChar::Mark_NonSpacing && category != QChar::Letter_Other && !QChar::isLowSurrogate(c)) {
- return;
- }
- // Find previous "real character" to try to combine with
-diff --git a/src/konsole_wcwidth.cpp b/src/konsole_wcwidth.cpp
-index 39c23076..212bc1b5 100644
---- a/src/konsole_wcwidth.cpp
-+++ b/src/konsole_wcwidth.cpp
-@@ -186,8 +186,14 @@ int KONSOLEPRIVATE_EXPORT konsole_wcwidth(quint16 oucs)
- };
-
- /* test for 8-bit control characters */
-- if (ucs == 0)
-+ if (ucs == 0 || QChar::isLowSurrogate(ucs))
- return 0;
-+
-+ /* Always assume double width, otherwise we have to go back and move characters */
-+ if (QChar::isHighSurrogate(ucs)) {
-+ return 2;
-+ }
-+
- if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
- return -1;
-
diff --git a/debian/patches/Limit-ourselves-to-3-combining-characters.patch b/debian/patches/Limit-ourselves-to-3-combining-characters.patch
deleted file mode 100644
index 11928e3..0000000
--- a/debian/patches/Limit-ourselves-to-3-combining-characters.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
-Date: Sun, 22 Jan 2017 21:00:24 +0100
-Subject: Limit ourselves to 3 combining characters
-
-This seems to be the limit in all the test files I've been trying.
-Without this we get an issue with too many combining characters where
-Konsole will eventually just hang.
-
-REVIEW: 129874
----
- src/Screen.cpp | 2 +-
- tests/combining.py | 15 +++++++++++++++
- 2 files changed, 16 insertions(+), 1 deletion(-)
- create mode 100644 tests/combining.py
-
-diff --git a/src/Screen.cpp b/src/Screen.cpp
-index 0b3124a5..b3d513fe 100644
---- a/src/Screen.cpp
-+++ b/src/Screen.cpp
-@@ -668,7 +668,7 @@ void Screen::displayCharacter(unsigned short c)
- ushort extendedCharLength;
- const ushort* oldChars = ExtendedCharTable::instance.lookupExtendedChar(currentChar.character, extendedCharLength);
- Q_ASSERT(oldChars);
-- if (oldChars) {
-+ if (oldChars && extendedCharLength < 3) {
- Q_ASSERT(extendedCharLength > 1);
- Q_ASSERT(extendedCharLength < 65535);
- ushort* chars = new ushort[extendedCharLength + 1];
-diff --git a/tests/combining.py b/tests/combining.py
-new file mode 100644
-index 00000000..fb2afc68
---- /dev/null
-+++ b/tests/combining.py
-@@ -0,0 +1,15 @@
-+#!/usr/bin/env python3
-+
-+'''
-+Generates an endless amount of combining characters
-+'''
-+
-+import random
-+import string
-+
-+combs = list("\u0300\u0301\u0302\u0303\u0304\u0305\u0306\u0307\u0308\u0309\u030A\u030B\u030C\u030D\u030E\u030F")
-+
-+while True:
-+ random.shuffle(combs)
-+ print(random.choice(string.ascii_letters)+"".join(combs), end="", flush=True)
-+
diff --git a/debian/patches/Pre-process-the-e-custom-command-argument.patch b/debian/patches/Pre-process-the-e-custom-command-argument.patch
deleted file mode 100644
index a6f033c..0000000
--- a/debian/patches/Pre-process-the-e-custom-command-argument.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From: Maximiliano Curia <maxy at gnuservers.com.ar>
-Date: Mon, 19 Dec 2016 22:26:46 +0100
-Subject: Pre process the -e custom command argument
-
-Special case parsing of -e, to avoid parsing parameters intended for the
-command to be executed.
----
- src/Application.cpp | 39 ++++++++++++++++++++++++++-------------
- src/Application.h | 4 +++-
- src/main.cpp | 8 ++++++--
- 3 files changed, 35 insertions(+), 16 deletions(-)
-
-diff --git a/src/Application.cpp b/src/Application.cpp
-index 5b352ec9..12ffe230 100644
---- a/src/Application.cpp
-+++ b/src/Application.cpp
-@@ -45,7 +45,7 @@
-
- using namespace Konsole;
-
--Application::Application(QSharedPointer<QCommandLineParser> parser) : m_parser(parser)
-+Application::Application(QSharedPointer<QCommandLineParser> parser, const QStringList &customCommand) : m_parser(parser), m_customCommand(customCommand)
- {
- _backgroundInstance = 0;
- }
-@@ -114,6 +114,22 @@ void Application::populateCommandLineParser(QCommandLineParser *parser)
- parser->addOption(titleOption);
- }
-
-+QStringList Application::getCustomCommand(QStringList &args)
-+{
-+ int i = args.indexOf("-e");
-+ QStringList customCommand;
-+ if ((0 < i) && (i < (args.size() - 1))) {
-+ // -e was specified with at least one extra argument
-+ // if -e was specified without arguments, QCommandLineParser will deal
-+ // with that
-+ args.removeAt(i);
-+ while (args.size() > i) {
-+ customCommand << args.takeAt(i);
-+ }
-+ }
-+ return customCommand;
-+}
-+
- Application::~Application()
- {
- SessionManager::instance()->closeAllSessions();
-@@ -478,21 +494,16 @@ Profile::Ptr Application::processProfileChangeArgs(Profile::Ptr baseProfile)
- }
-
- // run a custom command
-- if (m_parser->isSet(QStringLiteral("e"))) {
-- QString commandExec = m_parser->value(QStringLiteral("e"));
-- QStringList commandArguments;
--
-- if (m_parser->positionalArguments().count() == 0 &&
-- QStandardPaths::findExecutable(commandExec).isEmpty()) {
-+ if (!m_customCommand.isEmpty()) {
-+ // Example: konsole -e man ls
-+ QString commandExec = m_customCommand[0];
-+ QStringList commandArguments(m_customCommand);
-+ if ((m_customCommand.size() == 1) &&
-+ (QStandardPaths::findExecutable(commandExec).isEmpty())) {
- // Example: konsole -e "man ls"
-- ShellCommand shellCommand(m_parser->value(QStringLiteral("e")));
-+ ShellCommand shellCommand(commandExec);
- commandExec = shellCommand.command();
- commandArguments = shellCommand.arguments();
-- } else {
-- // Example: konsole -e man ls
-- commandArguments << commandExec;
-- for ( int i = 0 ; i < m_parser->positionalArguments().count() ; i++ )
-- commandArguments << m_parser->positionalArguments().at(i);
- }
-
- if (commandExec.startsWith(QLatin1String("./")))
-@@ -550,6 +561,8 @@ void Application::slotActivateRequested (QStringList args, const QString & /*wor
- // In the current version it just strips it away
- args.prepend(qApp->applicationFilePath());
-
-+ m_customCommand = getCustomCommand(args);
-+
- // We can't re-use QCommandLineParser instances, it preserves earlier parsed values
- QCommandLineParser *parser = new QCommandLineParser;
- populateCommandLineParser(parser);
-diff --git a/src/Application.h b/src/Application.h
-index 8987d789..8ec7ab6a 100644
---- a/src/Application.h
-+++ b/src/Application.h
-@@ -50,9 +50,10 @@ class Application : public QObject
-
- public:
- /** Constructs a new Konsole application. */
-- explicit Application(QSharedPointer<QCommandLineParser> parser);
-+ explicit Application(QSharedPointer<QCommandLineParser> parser, const QStringList &customCommand);
-
- static void populateCommandLineParser(QCommandLineParser *parser);
-+ static QStringList getCustomCommand(QStringList &args);
-
- ~Application();
-
-@@ -89,6 +90,7 @@ private:
-
- MainWindow* _backgroundInstance;
- QSharedPointer<QCommandLineParser> m_parser;
-+ QStringList m_customCommand;
- };
- }
- #endif // APPLICATION_H
-diff --git a/src/main.cpp b/src/main.cpp
-index 26d3da99..e77597ad 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -112,9 +112,13 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[])
- parser->addHelpOption();
- parser->addVersionOption();
- about.setupCommandLine(parser.data());
-+
-+ QStringList args = QStringList(app->arguments());
-+ QStringList customCommand = Application::getCustomCommand(args);
-+
- Application::populateCommandLineParser(parser.data());
-
-- parser->process(*app);
-+ parser->process(args);
- about.processCommandLine(parser.data());
-
- // Enable user to force multiple instances
-@@ -158,7 +162,7 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[])
-
- // If we reach this location, there was no existing copy of Konsole
- // running, so create a new instance.
-- Application konsoleApp(parser);
-+ Application konsoleApp(parser, customCommand);
-
- // The activateRequested() signal is emitted when a second instance
- // of Konsole is started.
diff --git a/debian/patches/Screen-Fix-potential-crash-when-ExtendedCharTable-tries-t.patch b/debian/patches/Screen-Fix-potential-crash-when-ExtendedCharTable-tries-t.patch
deleted file mode 100644
index 7f86c94..0000000
--- a/debian/patches/Screen-Fix-potential-crash-when-ExtendedCharTable-tries-t.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
-Date: Sun, 22 Jan 2017 18:20:54 +0100
-Subject: Screen: Fix potential crash when ExtendedCharTable tries to clean
-
----
- src/Screen.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Screen.h b/src/Screen.h
-index aaa282eb..443d0ecf 100644
---- a/src/Screen.h
-+++ b/src/Screen.h
-@@ -580,7 +580,7 @@ public:
- QSet<ushort> result;
- for (int i = 0; i < _lines; ++i) {
- const ImageLine& il = _screenLines[i];
-- for (int j = 0; j < _columns; ++j) {
-+ for (int j = 0; j < il.length(); ++j) {
- if (il[j].rendition & RE_EXTENDED_CHAR) {
- result << il[j].character;
- }
diff --git a/debian/patches/TerminalDisplay-Abort-painting-invalid-rect.patch b/debian/patches/TerminalDisplay-Abort-painting-invalid-rect.patch
deleted file mode 100644
index 67fcbbe..0000000
--- a/debian/patches/TerminalDisplay-Abort-painting-invalid-rect.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Anthony Fieroni <bvbfan at abv.bg>
-Date: Mon, 6 Feb 2017 21:20:00 +0200
-Subject: [TerminalDisplay] Abort painting invalid rect
-
-REVIEW: 129914
-
-Signed-off-by: Anthony Fieroni <bvbfan at abv.bg>
----
- src/TerminalDisplay.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
-index 1d70d7c2..f8263499 100644
---- a/src/TerminalDisplay.cpp
-+++ b/src/TerminalDisplay.cpp
-@@ -1749,7 +1749,8 @@ void TerminalDisplay::updateCursor()
-
- void TerminalDisplay::resizeEvent(QResizeEvent*)
- {
-- updateImageSize();
-+ if (contentsRect().isValid())
-+ updateImageSize();
- }
-
- void TerminalDisplay::propagateSize()
diff --git a/debian/patches/Update-release-date-scripting-and-command-line-help.patch b/debian/patches/Update-release-date-scripting-and-command-line-help.patch
deleted file mode 100644
index 35d33d4..0000000
--- a/debian/patches/Update-release-date-scripting-and-command-line-help.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From: Kurt Hindenburg <kurt.hindenburg at gmail.com>
-Date: Sat, 28 Jan 2017 12:43:26 -0500
-Subject: Update release/date, scripting and command line help
-
-Add more info about using dbus with Konsole's envirnomental variables
-and re-add --nofork help
-
-BUG: 373905
----
- doc/manual/index.docbook | 55 ++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 44 insertions(+), 11 deletions(-)
-
-diff --git a/doc/manual/index.docbook b/doc/manual/index.docbook
-index 964a6bb7..d9fc5d1e 100644
---- a/doc/manual/index.docbook
-+++ b/doc/manual/index.docbook
-@@ -38,14 +38,14 @@
- <holder>&Jonathan.Singer;</holder>
- </copyright>
- <copyright>
-- <year>2005</year><year>2008</year><year>2009</year><year>2010</year><year>2011</year><year>2014</year><year>2016</year>
-+ <year>2005</year><year>2008</year><year>2009</year><year>2010</year><year>2011</year><year>2014</year><year>2016</year><year>2017</year>
- <holder>&Kurt.Hindenburg;</holder>
- </copyright>
-
- <legalnotice>&FDLNotice;</legalnotice>
-
--<date>2016-07-09</date>
--<releaseinfo>Applications 16.08</releaseinfo>
-+<date>2017-01-28</date>
-+<releaseinfo>Applications 17.04</releaseinfo>
-
- <abstract><para>&konsole; is &kde;'s terminal emulator.</para></abstract>
-
-@@ -1137,6 +1137,7 @@ Empty lines or lines with <userinput>#</userinput> at the beginning are ignored,
-
- <varlistentry>
- <term><option>--separate</option></term>
-+<term><option>--nofork</option></term>
- <listitem><para><action>Run</action> the new instance of &konsole; in a separate process.
- </para></listitem>
- </varlistentry>
-@@ -1254,17 +1255,54 @@ will display methods for controlling window 1.
- <listitem><para>
- <prompt>%</prompt>
- <command>qdbus</command>
-+<option>org.kde.konsole $KONSOLE_DBUS_WINDOW</option>
-+will display methods for controlling the current window.
-+</para></listitem>
-+
-+<listitem><para>
-+<prompt>%</prompt>
-+<command>qdbus</command>
- <option>org.kde.konsole /Sessions/1</option>
- will display methods for controlling session 1.
- </para></listitem>
-
-+<listitem><para>
-+<prompt>%</prompt>
-+<command>qdbus</command>
-+<option>org.kde.konsole $KONSOLE_DBUS_SESSION</option>
-+will display methods for controlling the current session.
-+</para></listitem>
-+
-+<listitem><para>
-+<prompt>%</prompt>
-+<command>qdbus</command>
-+<option>$KONSOLE_DBUS_SERVICE $KONSOLE_DBUS_SESSION</option>
-+will display methods for controlling the current &konsole;'s session.
-+</para></listitem>
-+
- </itemizedlist>
- </para>
-
- <para>
--If you start &konsole; from a terminal you may need to change
--<option>org.kde.konsole</option> to
--<option>org.kde.konsole-`pidof -s konsole`</option>.
-+If any of the above commands outputs:
-+Service 'org.kde.konsole' does not exist, change
-+<option>org.kde.konsole</option> to one of the following:
-+
-+<itemizedlist>
-+
-+<listitem><para>
-+<option>org.kde.konsole-`pidof -s konsole`</option>
-+(will select first pid)
-+</para></listitem>
-+<listitem><para>
-+<option>$KONSOLE_DBUS_SERVICE</option>
-+(this can be used from the current &konsole;)
-+</para></listitem>
-+<listitem><para>
-+<option>select one from the output of 'qdbus | grep konsole'</option>
-+</para></listitem>
-+
-+</itemizedlist>
- </para>
-
- <para>
-@@ -1413,11 +1451,6 @@ CommonDirNames=name1,name2,name3...
- <title>Common Issues</title>
- <itemizedlist>
-
--<listitem><para>
--Starting with version 16.08 (August 2016), &konsole; no longer uses KDE4's KUniqueApplication and thus <option>--nofork</option> no longer exists.
--</para>
--</listitem>
--
- <listitem>
- <para>Some fonts might be unavailable for usage in &konsole;, although they are available in other applications. That doesn't mean there is a bug in &konsole;. &konsole; requires monospaced fonts to provide the best visual result, so it asks &Qt; to only list monospaced fonts.</para>
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 28e055a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,15 +0,0 @@
-Pre-process-the-e-custom-command-argument.patch
-upstream_render_text_at_primary_fonts_baseline.patch
-Add-nofork-as-compatibility-alias-for-separate.patch
-Fix-build.patch
-TerminalDisplay-Abort-painting-invalid-rect.patch
-Screen-Fix-potential-crash-when-ExtendedCharTable-tries-t.patch
-Handle-surrogate-utf16-characters.patch
-Fix-word-boundaries-with-combining-characters.patch
-Don-t-include-newlines-in-selection-if-trimming-is-on.patch
-Limit-ourselves-to-3-combining-characters.patch
-Fix-opening-of-new-tabs-with-multiple-processes.patch
-Allow-ANSI-string-terminator-to-work.patch
-Update-release-date-scripting-and-command-line-help.patch
-Add-check-for-valid-container-possible-crash-fix.patch
-Correct-ANSI-string-terminator.patch
diff --git a/debian/patches/upstream_render_text_at_primary_fonts_baseline.patch b/debian/patches/upstream_render_text_at_primary_fonts_baseline.patch
deleted file mode 100644
index 5e4c626..0000000
--- a/debian/patches/upstream_render_text_at_primary_fonts_baseline.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Christoph Feck <cfeck at kde.org>
-Date: Mon, 27 Mar 2017 11:05:41 +0200
-Subject: upstream_render_text_at_primary_fonts_baseline
-
-commit 7e2f9d839f5af447a0fc7fd178dd5d8f58e489bb
-Author: Christoph Feck <cfeck at kde.org>
-Date: Wed Dec 7 20:12:59 2016 +0100
-
- Render text at primary font's baseline
-
- This only addresses the vertical shift and cutoff of lower
- parts of characters, but not horizontal shift (characters
- moving to the left or right).
-
- See the linked review request for details.
-
- This commit is for the 17.04 version. If you can test master
- builds, please add feedback.
-
- REVIEW: 129281
- CCBUG: 371687
----
- src/TerminalDisplay.cpp | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
-index dd911779..1d70d7c2 100644
---- a/src/TerminalDisplay.cpp
-+++ b/src/TerminalDisplay.cpp
-@@ -855,18 +855,10 @@ void TerminalDisplay::drawCharacters(QPainter& painter,
- // This still allows RTL characters to be rendered in the RTL way.
- painter.setLayoutDirection(Qt::LeftToRight);
-
-- // the drawText(rect,flags,string) overload is used here with null flags
-- // instead of drawText(rect,string) because the (rect,string) overload causes
-- // the application's default layout direction to be used instead of
-- // the widget-specific layout direction, which should always be
-- // Qt::LeftToRight for this widget
-- //
-- // This was discussed in: http://lists.kde.org/?t=120552223600002&r=1&w=2
- if (_bidiEnabled) {
-- painter.drawText(rect, 0, text);
-+ painter.drawText(rect.x(), rect.y() + _fontAscent + _lineSpacing, text);
- } else {
-- // See bug 280896 for more info
-- painter.drawText(rect, Qt::AlignBottom, LTR_OVERRIDE_CHAR + text);
-+ painter.drawText(rect.x(), rect.y() + _fontAscent + _lineSpacing, LTR_OVERRIDE_CHAR + text);
- }
- }
- }
--
konsole packaging
More information about the pkg-kde-commits
mailing list