mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-07 20:27:02 +01:00
libraries/qmltermwidget: Patch for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
ff78fdf2f6
commit
9789160d3a
2 changed files with 49 additions and 1 deletions
46
libraries/qmltermwidget/gcc-10.patch
Normal file
46
libraries/qmltermwidget/gcc-10.patch
Normal file
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue