From 355d515c5c03f55f38464eac2565c9a08a7a8551 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 4 Apr 2018 23:02:09 +0200 Subject: Recompilation required after icu4c and poppler ABI breakage --- kde/patch/konsole.patch | 4 ++++ kde/patch/konsole/konsole.term.is.konsole.patch | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 kde/patch/konsole.patch create mode 100644 kde/patch/konsole/konsole.term.is.konsole.patch (limited to 'kde/patch') diff --git a/kde/patch/konsole.patch b/kde/patch/konsole.patch new file mode 100644 index 0000000..7a39bb3 --- /dev/null +++ b/kde/patch/konsole.patch @@ -0,0 +1,4 @@ +# Set TERM to 'konsole' instead of the default 'xterm-256color' +# to prevent garbled text under certain conditions: +cat $CWD/patch/konsole/konsole.term.is.konsole.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/konsole/konsole.term.is.konsole.patch b/kde/patch/konsole/konsole.term.is.konsole.patch new file mode 100644 index 0000000..443b9f1 --- /dev/null +++ b/kde/patch/konsole/konsole.term.is.konsole.patch @@ -0,0 +1,24 @@ +diff -uar konsole-17.12.3.orig/src/Profile.cpp konsole-17.12.3/src/Profile.cpp +--- konsole-17.12.3.orig/src/Profile.cpp 2018-03-01 23:54:01.000000000 +0100 ++++ konsole-17.12.3/src/Profile.cpp 2018-04-03 21:17:11.897873304 +0200 +@@ -157,7 +157,7 @@ + // See Pty.cpp on why Arguments is populated + setProperty(Arguments, QStringList() << QString::fromUtf8(qgetenv("SHELL"))); + setProperty(Icon, QStringLiteral("utilities-terminal")); +- setProperty(Environment, QStringList() << QStringLiteral("TERM=xterm-256color") << QStringLiteral("COLORTERM=truecolor")); ++ setProperty(Environment, QStringList() << QStringLiteral("TERM=konsole") << QStringLiteral("COLORTERM=truecolor")); + setProperty(LocalTabTitleFormat, QStringLiteral("%d : %n")); + setProperty(RemoteTabTitleFormat, QStringLiteral("(%u) %H")); + setProperty(ShowTerminalSizeHint, true); +diff -uar konsole-17.12.3.orig/src/Pty.cpp konsole-17.12.3/src/Pty.cpp +--- konsole-17.12.3.orig/src/Pty.cpp 2018-03-01 23:54:01.000000000 +0100 ++++ konsole-17.12.3/src/Pty.cpp 2018-04-03 21:18:18.898007801 +0200 +@@ -229,7 +229,7 @@ + + // extra safeguard to make sure $TERM is always set + if (!isTermEnvAdded) { +- setEnv(QStringLiteral("TERM"), QStringLiteral("xterm-256color")); ++ setEnv(QStringLiteral("TERM"), QStringLiteral("konsole")); + } + } + -- cgit v1.2.3