diff options
Diffstat (limited to 'x11-terms/cool-retro-term')
| -rw-r--r-- | x11-terms/cool-retro-term/Manifest | 4 | ||||
| -rw-r--r-- | x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild (renamed from x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild) | 21 | ||||
| -rw-r--r-- | x11-terms/cool-retro-term/files/qmltermwidget-0.2.0-gcc-10.patch | 46 |
3 files changed, 63 insertions, 8 deletions
diff --git a/x11-terms/cool-retro-term/Manifest b/x11-terms/cool-retro-term/Manifest index 6e5b51317357..d296d72fc443 100644 --- a/x11-terms/cool-retro-term/Manifest +++ b/x11-terms/cool-retro-term/Manifest @@ -1,6 +1,6 @@ -DIST cool-retro-term-1.1.0.tar.gz 1973348 BLAKE2B 9490b05db849bdc08e83215651081e175a59888b2dc1a516fa380fcf10d5b9443e9d214009d06e6b0741cad6c16857357753c846be18b7fd9455c7a3e28ec728 SHA512 70a0fdd3653fa91b92f796d865bd1256fa39228ff536dad95d0eadee502e6babbc56ae6e0275913ec38573669e4f03938dd559128cbf46209149bd60171391e6 +AUX qmltermwidget-0.2.0-gcc-10.patch 1398 BLAKE2B a06fd644c64fd0b5cf549b410c28473d3ae31ec1477ee1dd60fb0108ee2af2221597d8fbeac6f3a8c33f605f3003b9a4dc2cffeb568788f606440aed9b19dc37 SHA512 fc50c4e64a8126b8586efc74939c71d43601e9a0dd4863a618fb51be46d05ac325ea3dfb96cab4a4a5b2accf0e2e8893174c1980b5b96ade8490d3a485c58ccb DIST cool-retro-term-1.1.1.tar.gz 1975853 BLAKE2B 54c9e5adb0879380215c390659da59266c323f12a046dafa2981d9c5e5ccbc6369e553427014e0347afcb6a1a64e188fb51f202d7c870a544fd2ecd5980f4c0c SHA512 59da4b5d18ad64b917caebbc63ea9e3d562ed2a2dc9eae00f36cf434df44d17adca084b448f860f24a74ee6b59cd083d6a81e2217df1fb5e9f2731eaf1752148 DIST qmltermwidget-0.2.0.tar.gz 219516 BLAKE2B 452fe72f01773d3307d5f4dca4ef38ea8e35b6ee4e3255d660e94baafc83949fca943807fd4ea76e0b985032952c387b5911a65891488b399d0cb41e6be06d87 SHA512 544d57296de6999b86bf2b921d1d93ac5d7eddd02eea436df4ecea0966c82389e716310fd7e4d13dd918bc1b3fd2d02f953c713dc5b4abcfc56d3f3f617adf43 -EBUILD cool-retro-term-1.1.0.ebuild 1209 BLAKE2B 14ba5cc79d82b32eabd4f6aea766258e72393e339545c37e6f98b743563cb2beccb3497cc8a1a2a3d4256a0ea2d8c76223da029407a8ca38fee8fc85ad3b2144 SHA512 4152bf28c77b4896dbeb8c90dc10122c87a1412eb0a6d14b97a547b2eb59796df379bc472418ea70a22592ff8e09b05887e4dc8faecd7a5bd5f0ad2a6b5d3d7b +EBUILD cool-retro-term-1.1.1-r2.ebuild 1315 BLAKE2B 9050009b9ad8c43ba1fc278f4dffbcb1a36f43d3c6151f40a120a631571c8b8e0932c9838029bec19391afc5a7e30434c79df5f70fd939e7b8593ccb09e46636 SHA512 c5c4d122caf5d4f5ef98f33748d238f5abc435bbb195d41fe0b6ef7f00b2dee9d2820713b4f5cd271ab0b1d21a903447aca28c620030bdab9982e3fc56bffeaf EBUILD cool-retro-term-1.1.1.ebuild 1209 BLAKE2B 997d91692ba3d191c82eae17df1c54e0d65595d438cf4968ed1f106319a2941ac37be59686e74228cd1699da9000ce7a83927ef9f204cebf2fa56b682e869111 SHA512 ada8aa91ea4a817e432f9370a28c2a557d72fd02721bb07a4e8780eb41b971f3b28936b6d4e5fc23b602ed1f90f8154cc4f882fcbac3187ec5774425045e37a2 MISC metadata.xml 343 BLAKE2B 4c576b8928fb82994206d310506a0b790c14108c235e9815750cddd3f9becc747fdec7f2bab7aae92c2d52b648f25b9b82dfdccea77953b6f694514977efd7a5 SHA512 5e102d64e39f274ce62e25739adc52ae998b830a38e7f292b33ccceccd5b262aa62fcf04a4372561aed54760ef9624e1f7335e4198cadb582b152f128be60466 diff --git a/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild index 23c927425471..1f9256427d7d 100644 --- a/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild +++ b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit gnome2-utils qmake-utils +inherit qmake-utils xdg-utils QTW_PN=qmltermwidget QTW_PV=0.2.0 @@ -34,6 +34,9 @@ src_prepare() { 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() { @@ -46,6 +49,12 @@ src_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; } +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_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 000000000000..f14a269712e6 --- /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 <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 + |