From ab3da91fb6c91a9df52fff8f991570f456fd3c7a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Dec 2020 11:06:49 +0000 Subject: gentoo resync : 18.12.2020 --- kde-apps/konsole/Manifest | 2 + .../konsole-20.12.0-revert-bold-breakage.patch | 33 ++++++++++ kde-apps/konsole/konsole-20.12.0-r1.ebuild | 72 ++++++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch create mode 100644 kde-apps/konsole/konsole-20.12.0-r1.ebuild (limited to 'kde-apps/konsole') diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 746694fd6103..673e5803eebc 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,5 +1,7 @@ +AUX konsole-20.12.0-revert-bold-breakage.patch 990 BLAKE2B 9b3d7660e6ee66ed88f5c9e29f92aec0b886e372068fcb6fa05822e1016e4290fa992912d9f70f6dc3b3b20c336a54dc36c13c46f1fdd1309817058fc0405b0d SHA512 9f21b725186654fea9131ffc2cbe3e89f9ff23f0c3cc9c45803bfc8303f7e47ad686268ad9acf3a3558210f3b338d19c08d05c486ae79822d549b8686d8afaf7 DIST konsole-20.08.3.tar.xz 1212868 BLAKE2B cd3382e8df7f71639e11464a0cf28c087f28f8720c8631aac1970b827f6c377b5c86a9c38e93a5566bf9bdf7b4d36efe4691408e18657dc9566d899bdbc62205 SHA512 8025548b02523c58d4f98ea8950b1001a0223bb8c53d506928707f97d96a3ca4621c6fa6fbf14eb9ffdbe1cd171b4aa9ed2f8c8808eafa166d0f6764f590a5cf DIST konsole-20.12.0.tar.xz 1236116 BLAKE2B b03a6a15869fcf720d77ce0c559b9a9942537d6560a0e8d4805ba4138d43ec0908fd23b596159b911d946a9eb4c019c1b523c0ec1a1fceceb8d3cf8032e41e71 SHA512 a77127618167d451ec1ab6d6879a4949d5bd268cfdc827dd31f8bea0b69f71aec1c3e5ccb6d34767b5fd13cb9f9a6157acead23311c796adb9b72f6265e2b95e EBUILD konsole-20.08.3.ebuild 1768 BLAKE2B c7a75d4410444e4d8b6d1f676ee178005a2ba06acdf62d94b8fce4eaedddeab6d86bb91d0f915b10a93a066b4417a982ca1d53319f830122fdee4b368e853be1 SHA512 7fbd1923dfd5ad5422a89a65f4679d4d86b9643853fa2325fbfd4677ae10f3ef24b250387eec47ad68e869ab54e2dcc583d23addf35402b6aecbea161f28139d +EBUILD konsole-20.12.0-r1.ebuild 1830 BLAKE2B 388ddc7ed5d9701cfe52a1f82eb7e2e546c8bf41d48845d67d070df47e0444cce28ef68c1ba89103053afe98d9e0c138b0525593d2080c1cb660a632eccc597f SHA512 3d7decf6788a1128aaea467b49986a881bcf9338aa676e7983f3c2284249063b59c786ca0194aa012ebe02c07f4cd16e108306e1b23738cc8983aee8a7f6ddec EBUILD konsole-20.12.0.ebuild 1771 BLAKE2B 7c13724e7da5694e5b7284a5f68a9b3eb445ef0823b646d046fc2045d0815eb1fb1b81188838877c66dbd5e7fb472d855e7a3cb59a4cc6999a33afbb373e9260 SHA512 b5fd22304f5a97d8737d4800e2fcf68676d6ea85d6df619944ac4544a819b83d06e0498f2088c41505db67cfbd390c1453464550296afcfff96f8656c4bb518b MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch b/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch new file mode 100644 index 000000000000..8e79793601e7 --- /dev/null +++ b/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch @@ -0,0 +1,33 @@ +From 08a51bbdd70c0c850f44a660a7efbe4c394b8ee3 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +Date: Thu, 17 Dec 2020 17:21:44 +0100 +Subject: [PATCH] Revert "Fix bold character color paint" + +This reverts commit 270d6ea3247bb41a51535129e4b1c8eef51cf316. +--- + src/Screen.cpp | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/Screen.cpp b/src/Screen.cpp +index 8e7eee51..c8f477ce 100644 +--- a/src/Screen.cpp ++++ b/src/Screen.cpp +@@ -474,8 +474,14 @@ void Screen::updateEffectiveRendition() + _effectiveBackground = _currentBackground; + } + +- if ((_currentRendition & RE_BOLD) == 0 && (_currentRendition & RE_FAINT) != 0) { ++ if ((_currentRendition & RE_BOLD) != 0) { ++ if ((_currentRendition & RE_FAINT) == 0) { ++ _effectiveForeground.setIntensive(); ++ } ++ } else { ++ if ((_currentRendition & RE_FAINT) != 0) { + _effectiveForeground.setFaint(); ++ } + } + } + +-- +2.29.2 + diff --git a/kde-apps/konsole/konsole-20.12.0-r1.ebuild b/kde-apps/konsole/konsole-20.12.0-r1.ebuild new file mode 100644 index 000000000000..ddcce96264fd --- /dev/null +++ b/kde-apps/konsole/konsole-20.12.0-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=5.75.0 +QTMIN=5.15.1 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE's terminal emulator" +HOMEPAGE="https://apps.kde.org/en/konsole https://konsole.kde.org" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="X" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kpty-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + X? ( x11-libs/libX11 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}"-revert-bold-breakage.patch ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} + +src_test() { + # drkonqi process interferes. bug 702690 + local myctestargs=( + -E "(DBusTest)" + ) + + ecm_src_test +} -- cgit v1.2.3