From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- kde-apps/konsole/Manifest | 7 +- kde-apps/konsole/files/konsole-21.04.0-gcc11.patch | 25 ------- kde-apps/konsole/konsole-20.12.3.ebuild | 2 +- kde-apps/konsole/konsole-21.04.0.ebuild | 76 ---------------------- kde-apps/konsole/konsole-21.04.1.ebuild | 74 +++++++++++++++++++++ 5 files changed, 78 insertions(+), 106 deletions(-) delete mode 100644 kde-apps/konsole/files/konsole-21.04.0-gcc11.patch delete mode 100644 kde-apps/konsole/konsole-21.04.0.ebuild create mode 100644 kde-apps/konsole/konsole-21.04.1.ebuild (limited to 'kde-apps/konsole') diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 8461c3674e27..17d56e7da5a0 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,6 +1,5 @@ -AUX konsole-21.04.0-gcc11.patch 791 BLAKE2B 6d01b7302d6c43ec68c1cda18087de3be403427c6fa7ffc186f5161011013e31c988e1afc83a71de040318295bc1f905783fa5ce79ee9bba3dd53854fa7bbe16 SHA512 f35aead7fefb994df61880dae3de634e94664289a81639c2fc5f2c107b87c20e9ad6d9a027f063bba69f5884bcceec5ccb463d82b3aade7c32eeb20c898b5996 DIST konsole-20.12.3.tar.xz 1250536 BLAKE2B 83d4af770e42feb9fe96dcebc2cddc6889d98a7d6ce637fde6f8665ce845430e2118b3fcb34ca6448025a397826f14804442a590f1ff4ca62383768af7007a30 SHA512 a48eaa0080b26369f5f163f3ae345bca7f35aa06d581ecc0bbeca54fee2e9b900a4b648f940a67f506ecb00dba971220f1c1c7a699efcbb6e27ee0932c27e37a -DIST konsole-21.04.0.tar.xz 1276124 BLAKE2B 40617f81d8204e5c8a89a21bf47338c4cf9c14c6a7bc68b696d8d9ad6613fc54c0f19684aaf2d99ff54774cddd97e9393517877aa565383d1df051e9471e535f SHA512 35cb9822c442bc3dcec0539451f2bd1672c27ea522a2dc412e7cffbd805497c58711a9035e2af3ba5cb804dc42da5563bb3a6017774d22000870bc9e7450402e -EBUILD konsole-20.12.3.ebuild 1768 BLAKE2B 2ce4ebeaf5696ee86053793f877c8a48a912de4adddafbe69dfb61b561b1c253421784a7d70a3129653cf297f09571aa5fb1c85df1accc53690279274eda75d8 SHA512 30af05b642a7f7c4afd2a92d20cec2085f0f4c7a07526e7edb996f850718fa951b9354d5f6467cd4209d3c69468db3a1767827a14a546847d13a61ce75f3f8db -EBUILD konsole-21.04.0.ebuild 1858 BLAKE2B 951628cd843bcc9cba844deac57272f8a48cdcc38bc4c458b13f16ff8cb5f8574b27fe967d1aac70e941e611e2339820c0ae4c3dc710aeb4fc20bbb81bb04638 SHA512 7312c36495a0f41efdeff3f5ca08a3464c75ce57134282f1b44be7f51a39057e6bbea92e0e30079a664ffecdf645adb6c5430f299fa8c243f857940c72877526 +DIST konsole-21.04.1.tar.xz 1277552 BLAKE2B c15d3dbcb470183ae20e66a4c60adb3b684f07422fd9aa63762936e344af21f1f8737b5fad5ff8123ce9ea592936ca8476eff527fb92e7f21cae67fdbfd2230c SHA512 7f0ebfc28ea804d9c4b20e4aebdf11d26156d6638674d1fe5a3e66b79b0479756e51102c65df742bda10746530d6e04e9f708b7a911d26abe887db0b18f515e1 +EBUILD konsole-20.12.3.ebuild 1766 BLAKE2B 88c9959d519e25f987e7caa8dbb9a2369110eb852c59ab418c165bf5c46129c85841d0633331cf99c41dec20fabc0f87673fe9a5639d08c7572a46472b6a4e04 SHA512 7c79943e58bd422df01fbf26b1a2ed5f863a64bd4f038402fdad75a9e815d4ff0841b87be08272fc190ecee0b7d729308ce08fd1516a214c6f8eaa96e7bb06dd +EBUILD konsole-21.04.1.ebuild 1799 BLAKE2B 5aa2860b516faa9e27b1f29173a906eeb5ee86e3be9ba96d10efb32a35ea834fa6fcb5acfbfe5d4715b4d3ee94a11aaa404325d2b451ca8d8821879005568de0 SHA512 e0a682683b6150f351bf4b2841ea110bb83d11e1629b33a07d9fbef88498c81b16df607d77ab2be7468b200cce630abed61691b6b12e3b999657f318442aa0c9 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch b/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch deleted file mode 100644 index 0a9e2a4cbc28..000000000000 --- a/kde-apps/konsole/files/konsole-21.04.0-gcc11.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 242213afd9eb9886e04eb9e6e69a4caa9c606363 Mon Sep 17 00:00:00 2001 -From: Kurt Hindenburg -Date: Fri, 30 Apr 2021 17:07:13 -0400 -Subject: [PATCH] Add missing include to fix build on gcc-11 - ---- - src/terminalDisplay/TerminalPainter.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/terminalDisplay/TerminalPainter.cpp b/src/terminalDisplay/TerminalPainter.cpp -index fce10d09..7623602e 100644 ---- a/src/terminalDisplay/TerminalPainter.cpp -+++ b/src/terminalDisplay/TerminalPainter.cpp -@@ -30,6 +30,8 @@ - #include - #include - -+#include -+ - // we use this to force QPainter to display text in LTR mode - // more information can be found in: https://unicode.org/reports/tr9/ - const QChar LTR_OVERRIDE_CHAR(0x202D); --- -GitLab - diff --git a/kde-apps/konsole/konsole-20.12.3.ebuild b/kde-apps/konsole/konsole-20.12.3.ebuild index b539550807b1..bb7ae228c653 100644 --- a/kde-apps/konsole/konsole-20.12.3.ebuild +++ b/kde-apps/konsole/konsole-20.12.3.ebuild @@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="KDE's terminal emulator" -HOMEPAGE="https://apps.kde.org/en/konsole https://konsole.kde.org" +HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org" LICENSE="GPL-2" # TODO: CHECK SLOT="5" diff --git a/kde-apps/konsole/konsole-21.04.0.ebuild b/kde-apps/konsole/konsole-21.04.0.ebuild deleted file mode 100644 index 387e191ea7f3..000000000000 --- a/kde-apps/konsole/konsole-21.04.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=5.80.0 -QTMIN=5.15.2 -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/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}-gcc11.patch ) # bug 787179 - -src_prepare() { - ecm_src_prepare - ecm_punt_bogus_dep KF5 Completion -} - -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 -} diff --git a/kde-apps/konsole/konsole-21.04.1.ebuild b/kde-apps/konsole/konsole-21.04.1.ebuild new file mode 100644 index 000000000000..11c37b893583 --- /dev/null +++ b/kde-apps/konsole/konsole-21.04.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=5.80.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE's terminal emulator" +HOMEPAGE="https://apps.kde.org/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/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}" + +src_prepare() { + ecm_src_prepare + ecm_punt_bogus_dep KF5 Completion +} + +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