diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2020-05-09 20:16:58 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:56:16 -0500 |
| commit | 9789160d3a8322907de885cd957d94cf3fe6f691 (patch) | |
| tree | a5333d688bc90f6ee5703ced2618a112cd6e7b77 | |
| parent | ff78fdf2f6e43d81f9d9ece3f4735f55a04767a1 (diff) | |
| download | slackbuilds-9789160d3a8322907de885cd957d94cf3fe6f691.tar.gz | |
libraries/qmltermwidget: Patch for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | libraries/qmltermwidget/gcc-10.patch | 46 | ||||
| -rw-r--r-- | libraries/qmltermwidget/qmltermwidget.SlackBuild | 4 |
2 files changed, 49 insertions, 1 deletions
diff --git a/libraries/qmltermwidget/gcc-10.patch b/libraries/qmltermwidget/gcc-10.patch new file mode 100644 index 0000000000..f14a269712 --- /dev/null +++ b/libraries/qmltermwidget/gcc-10.patch @@ -0,0 +1,46 @@ +From 5cb4f9e6c86354674bd7715d947f95ac9f16a6c1 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Sat, 25 Jan 2020 12:20:37 +0000 +Subject: [PATCH] TerminalCharacterDecoder.cpp: fix build failure against + gcc-10 + +gcc-10 fixed a few transitive includes and std::cwctype does not +get included implicitly via other headers. This leads to the +following build error: + +``` +lib/TerminalCharacterDecoder.cpp: In member function + 'virtual void Konsole::HTMLDecoder::decodeLine(const Konsole::Character*, + int, Konsole::LineProperty)': +lib/TerminalCharacterDecoder.cpp:205:18: + error: 'iswspace' is not a member of 'std'; did you mean 'isspace'? + 205 | if (std::iswspace(ch)) + | ^~~~~~~~ + | isspace +make: *** [Makefile:924: TerminalCharacterDecoder.o] Error 1 +``` + +The fix is to include <cwctype> that is supposed to define 'std::iswspace'. + +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + lib/TerminalCharacterDecoder.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/TerminalCharacterDecoder.cpp b/lib/TerminalCharacterDecoder.cpp +index 579dedf..5d5bfc0 100644 +--- a/lib/TerminalCharacterDecoder.cpp ++++ b/lib/TerminalCharacterDecoder.cpp +@@ -19,6 +19,9 @@ + 02110-1301 USA. + */ + ++// System ++#include <cwctype> /* std::iswspace */ ++ + // Own + #include "TerminalCharacterDecoder.h" + +-- +2.25.0 + diff --git a/libraries/qmltermwidget/qmltermwidget.SlackBuild b/libraries/qmltermwidget/qmltermwidget.SlackBuild index 53b47fc296..fb4ed472bc 100644 --- a/libraries/qmltermwidget/qmltermwidget.SlackBuild +++ b/libraries/qmltermwidget/qmltermwidget.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for qmltermwidget -# Copyright 2015-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2015-2020 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -71,6 +71,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/gcc-10.patch + qmake-qt5 make make INSTALL_ROOT=$PKG install |