From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- kde-apps/kate/Manifest | 7 +- .../kate-20.08.3-fix-filetree_model_test.patch | 27 +++++ kde-apps/kate/kate-20.08.3.ebuild | 6 +- kde-apps/kate/kate-20.12.1.ebuild | 106 -------------------- kde-apps/kate/kate-20.12.2.ebuild | 110 +++++++++++++++++++++ 5 files changed, 146 insertions(+), 110 deletions(-) create mode 100644 kde-apps/kate/files/kate-20.08.3-fix-filetree_model_test.patch delete mode 100644 kde-apps/kate/kate-20.12.1.ebuild create mode 100644 kde-apps/kate/kate-20.12.2.ebuild (limited to 'kde-apps/kate') diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest index f69153c2aa41..3b9645569436 100644 --- a/kde-apps/kate/Manifest +++ b/kde-apps/kate/Manifest @@ -1,5 +1,6 @@ +AUX kate-20.08.3-fix-filetree_model_test.patch 909 BLAKE2B ffa7ea62388751d4d173aaab2b27372fd0e7ded38a7612ff8644906e12c4ae52bf27df22188bf0229b06ee7de08e3ead278e17631a79623350621ca61b4e2a06 SHA512 4d4388bf0cab7db1979f174ba79d5736843a5584e6e6d85cc0751fa8a6e43d8a1baeebe3c3ed463c3ec376a7df7fef79d4e28a1835604cd4120ae576d8f8fd39 DIST kate-20.08.3.tar.xz 5853216 BLAKE2B 8ad6f14e98e44355731497dd3363dab51e3f1658feadc398ba03629c13acb648f1a84e573bb200040008c0f3226f0ec1b6414a0975cf1ccc2cd1bfcebce1e125 SHA512 bb514f92a65ce7ff4e3552f16a400d10b30703340f779a1318403035900f32b2fd5c1da2ca0714632d49ad35da15e0f7e05a17bc008cd039388e89ab4fac3bd2 -DIST kate-20.12.1.tar.xz 5861052 BLAKE2B 204077aa95f5013acf477d5a6f3ac84d8349921a6d37970a5b2bcc5ff703d8cb66d4d27a0e61d82b76efcb741c249c07efc538ab833718ede253e91d7d70ed41 SHA512 23a3172c933a886186ac4a55d765cdbe26fe5871eddd645cd983584742e637b7e136d6ecb8e58e0a31e9e5956f92e23a56b839b9b74fb0635ea6a22ffc76c5f1 -EBUILD kate-20.08.3.ebuild 3077 BLAKE2B 02140c18c2741b458dd55fdbe313ea2e7ef237b80802f6b692fc2338ffaf1f990e405bbe2e7f1215b3a7bf79a2e71edfbdcec948cd921aaf5f412c6cc1a5b389 SHA512 b4d624769c39808a115dcc21b236ea4f6ed7744b2c6ba2eaeb1177986885dfac5a5779544dc1a3e7b005ed6a8e1ec3789874ef8079579a7af13753192c6aa6d6 -EBUILD kate-20.12.1.ebuild 3080 BLAKE2B 43f6e39d4cd5fdff4892c043bad23b13b2473393e90b0336323631df6a6bd0a2d02311e740e0d9c15c0203e237b0245a3d21d79db7b3f15906e00db1f188e7b1 SHA512 bc9502deb59a99e28c91b6b9ff088ef78311adc51be870d1f2177e49cf047d8043db898b5d45670fc21859785f0e14fb8b6efb6f988026c60c4ff1bbc4f1546b +DIST kate-20.12.2.tar.xz 5862296 BLAKE2B 39058208a1c73dedff1c9959b1bfe5503b5c65de99d79fb29e8431ac35f071d74393c195c75f3a53638be75d26cb08c205d73546d0b71b674481b3443d8b2581 SHA512 e84f1da491de88b50e7eb0e806e9869c26f134f10d3b3647e1209ff8f4869b3e538a07fc46bcda8546646a5de04e3b44abca18b316c7f542484442e4ddac14e4 +EBUILD kate-20.08.3.ebuild 3153 BLAKE2B 0924bace56f9005e4410e3f480c9e03bc86361c5f749b57c4033e5ab60e0468486b5182f9825ad74317e0dff8d08689966e238876917c1c404b94ecd11dafa06 SHA512 649e1e5f2fed4601abedf7f69849854ab5962ff4b7660ffd71210e68a4736ffe1052f8433e5ac95d8a25781ef33ef21e087d2db68eb0be5a338e62ee5ebbbeb8 +EBUILD kate-20.12.2.ebuild 3165 BLAKE2B 88fc4e8a6800420ba386f64f123e4476f40973ea8c8d234df2c9ee4030143dab553fa0611c4c091ee8bed30368a152121baf88f3c0467f044948a4b76b5bdce8 SHA512 80e43883386acf2726d74ce2277bbd56ccc93e418fec3034918df3314c70a61612051da19e180079d69d2e104a4e5e7c8dd8e724fac8796b6e0f34f293562c01 MISC metadata.xml 862 BLAKE2B 9b27a2dc759d83a85b1be9a5afc2dedc77caab98255575d493f4af6961d9b5bb19699eb69858082e1bc05dd8ff14f5c0c9212e5e146ff13ec1a3685008fd837d SHA512 d1a90d55277f25dbbad445d8d591da5fa5ddf3bb65aa0ae2d70ba6626abe7deebb56cbcb8a3718c43ad136da2de1b06a017c9740493504b446f33fbeac2734a7 diff --git a/kde-apps/kate/files/kate-20.08.3-fix-filetree_model_test.patch b/kde-apps/kate/files/kate-20.08.3-fix-filetree_model_test.patch new file mode 100644 index 000000000000..36eedd9c0a12 --- /dev/null +++ b/kde-apps/kate/files/kate-20.08.3-fix-filetree_model_test.patch @@ -0,0 +1,27 @@ +From 761b74416a513331359b327e033349a8da77daa8 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir +Date: Thu, 26 Nov 2020 14:12:30 +0200 +Subject: [PATCH] filetree addon: fix crash in filetree_model_test + +We can't use QTEST_GUILESS_MAIN since KateRendererConfig::setSchemaInternal() +uses QGuiApplication to get the current palette name. +--- + addons/filetree/autotests/filetree_model_test.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/addons/filetree/autotests/filetree_model_test.cpp b/addons/filetree/autotests/filetree_model_test.cpp +index 2ea8a0780..5c503328c 100644 +--- a/addons/filetree/autotests/filetree_model_test.cpp ++++ b/addons/filetree/autotests/filetree_model_test.cpp +@@ -9,7 +9,7 @@ + #include "document_dummy.h" + + #include +-QTEST_GUILESS_MAIN(FileTreeModelTest) ++QTEST_MAIN(FileTreeModelTest) + + // BEGIN ResultNode + class ResultNode +-- +GitLab + diff --git a/kde-apps/kate/kate-20.08.3.ebuild b/kde-apps/kate/kate-20.08.3.ebuild index 5c8f7359242c..d6299f186d5f 100644 --- a/kde-apps/kate/kate-20.08.3.ebuild +++ b/kde-apps/kate/kate-20.08.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -61,6 +61,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-fix-filetree_model_test.patch" # bug 769548 +) + src_prepare() { ecm_src_prepare diff --git a/kde-apps/kate/kate-20.12.1.ebuild b/kde-apps/kate/kate-20.12.1.ebuild deleted file mode 100644 index 67d3d32b7050..000000000000 --- a/kde-apps/kate/kate-20.12.1.ebuild +++ /dev/null @@ -1,106 +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.75.0 -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more" -HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/en/kate" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry" - -# only addons/externaltools depends on kiconthemes, too small for USE -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcodecs-${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/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) - filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:5 ) - lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:5 ) - plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 ) - projects? ( - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/threadweaver-${KFMIN}:5 - ) - snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:5 ) - sql? ( - >=dev-qt/qtsql-${QTMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - ecm_src_prepare - - # delete colliding kwrite translations - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find po -type f -name "*po" -and -name "kwrite*" -delete || die - rm -rf po/*/docs/kwrite || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package activities KF5Activities) - -DBUILD_filebrowser=$(usex filebrowser) - -DBUILD_lspclient=$(usex lspclient) - -DBUILD_sessionapplet=$(usex plasma) - -DBUILD_project=$(usex projects) - -DBUILD_snippets=$(usex snippets) - -DBUILD_katesql=$(usex sql) - -DBUILD_kwrite=FALSE - $(cmake_use_find_package telemetry KUserFeedback) - ) - - ecm_src_configure -} - -src_test() { - # tests hang - local myctestargs=( - -E "(session_manager_test|sessions_action_test)" - ) - - ecm_src_test -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "Optional dependencies:" - optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT} - optfeature "DOT graph file previews" media-gfx/kgraphviewer - fi - ecm_pkg_postinst -} diff --git a/kde-apps/kate/kate-20.12.2.ebuild b/kde-apps/kate/kate-20.12.2.ebuild new file mode 100644 index 000000000000..47bc8aebbfa4 --- /dev/null +++ b/kde-apps/kate/kate-20.12.2.ebuild @@ -0,0 +1,110 @@ +# 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.75.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org optfeature + +DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more" +HOMEPAGE="https://kate-editor.org/ https://apps.kde.org/en/kate" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="activities +filebrowser lspclient +projects plasma +snippets sql telemetry" + +# only addons/externaltools depends on kiconthemes, too small for USE +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcodecs-${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/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktexteditor-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) + filebrowser? ( >=kde-frameworks/kbookmarks-${KFMIN}:5 ) + lspclient? ( >=kde-frameworks/kitemmodels-${KFMIN}:5 ) + plasma? ( >=kde-frameworks/plasma-${KFMIN}:5 ) + projects? ( + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/threadweaver-${KFMIN}:5 + ) + snippets? ( >=kde-frameworks/knewstuff-${KFMIN}:5 ) + sql? ( + >=dev-qt/qtsql-${QTMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + ) + telemetry? ( dev-libs/kuserfeedback:5 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-20.08.3-fix-filetree_model_test.patch" # bug 769548 +) + +src_prepare() { + ecm_src_prepare + + # delete colliding kwrite translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find po -type f -name "*po" -and -name "kwrite*" -delete || die + rm -rf po/*/docs/kwrite || die + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package activities KF5Activities) + -DBUILD_filebrowser=$(usex filebrowser) + -DBUILD_lspclient=$(usex lspclient) + -DBUILD_sessionapplet=$(usex plasma) + -DBUILD_project=$(usex projects) + -DBUILD_snippets=$(usex snippets) + -DBUILD_katesql=$(usex sql) + -DBUILD_kwrite=FALSE + $(cmake_use_find_package telemetry KUserFeedback) + ) + + ecm_src_configure +} + +src_test() { + # tests hang + local myctestargs=( + -E "(session_manager_test|sessions_action_test)" + ) + + ecm_src_test +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "Optional dependencies:" + optfeature "Markdown text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT} + optfeature "DOT graph file previews" media-gfx/kgraphviewer + fi + ecm_pkg_postinst +} -- cgit v1.2.3