From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A8C0138350 for ; Sat, 25 Jan 2020 12:31:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C1EFE0831; Sat, 25 Jan 2020 12:31:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B9F3E0831 for ; Sat, 25 Jan 2020 12:31:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F53C34E22B for ; Sat, 25 Jan 2020 12:31:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D09C7AC for ; Sat, 25 Jan 2020 12:31:38 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1579955358.51fb2f93d266a5c8a0c53d23bad4f10cfeb52a83.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/cool-retro-term/, x11-terms/cool-retro-term/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/cool-retro-term/cool-retro-term-1.1.1-r1.ebuild x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch X-VCS-Directories: x11-terms/cool-retro-term/ x11-terms/cool-retro-term/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 51fb2f93d266a5c8a0c53d23bad4f10cfeb52a83 X-VCS-Branch: master Date: Sat, 25 Jan 2020 12:31:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 42929a19-8634-4469-a4ce-cb4d7fc85dd2 X-Archives-Hash: 3173ca26352df6d1bb778fa72ec59888 commit: 51fb2f93d266a5c8a0c53d23bad4f10cfeb52a83 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jan 25 12:29:18 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jan 25 12:29:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51fb2f93 x11-terms/cool-retro-term: tweak for gcc-10 Package-Manager: Portage-2.3.85, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich gentoo.org> .../cool-retro-term-1.1.1-r1.ebuild | 62 ++++++++++++++++++++++ .../files/qmltermwidget-0.2.0-gcc-10.patch | 46 ++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r1.ebuild b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r1.ebuild new file mode 100644 index 00000000000..ae6bd03245b --- /dev/null +++ b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome2-utils qmake-utils + +QTW_PN=qmltermwidget +QTW_PV=0.2.0 +QTW_P=${QTW_PN}-${QTW_PV} + +DESCRIPTION="terminal emulator which mimics the look and feel of the old cathode tube screens" +HOMEPAGE="https://github.com/Swordfish90/cool-retro-term" +SRC_URI="https://github.com/Swordfish90/cool-retro-term/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/Swordfish90/qmltermwidget/archive/${QTW_PV}.tar.gz -> ${QTW_P}.tar.gz" + +LICENSE="GPL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-qt/qtdeclarative:5[localstorage] + dev-qt/qtgraphicaleffects:5 + dev-qt/qtquickcontrols:5[widgets] + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 +" + +RDEPEND="${DEPEND}" + +src_prepare() { + default + + rmdir qmltermwidget || die + mv "${WORKDIR}/${QTW_P}" qmltermwidget || die + pushd qmltermwidget || die + eapply "${FILESDIR}"/qmltermwidget-0.2.0-gcc-10.patch + popd || die +} + +src_configure() { + eqmake5 PREFIX="${EPREFIX}/usr" +} + +src_install() { + # default attempts to install directly to /usr + emake INSTALL_ROOT="${D}" install + doman packaging/debian/cool-retro-term.1 +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch b/x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch new file mode 100644 index 00000000000..f14a269712e --- /dev/null +++ b/x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch @@ -0,0 +1,46 @@ +From 5cb4f9e6c86354674bd7715d947f95ac9f16a6c1 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +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 that is supposed to define 'std::iswspace'. + +Signed-off-by: Sergei Trofimovich +--- + 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 /* std::iswspace */ ++ + // Own + #include "TerminalCharacterDecoder.h" + +-- +2.25.0 +