commit: 6adfde4ce0da5899b61d1fe5ff2ecf1e6251f371 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Feb 21 14:57:26 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Feb 21 16:45:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6adfde4c
app-editors/okteta: EAPI-8 bump, upstream crash fix Upstream commit 607390315750815b0009b95ecd65699e2a1d110a KDE-bug: https://bugs.kde.org/show_bug.cgi?id=444405 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../okteta/files/okteta-0.26.6-crashfix.patch | 34 +++++++++++ app-editors/okteta/okteta-0.26.6-r1.ebuild | 71 ++++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/app-editors/okteta/files/okteta-0.26.6-crashfix.patch b/app-editors/okteta/files/okteta-0.26.6-crashfix.patch new file mode 100644 index 000000000000..8967fc788f5c --- /dev/null +++ b/app-editors/okteta/files/okteta-0.26.6-crashfix.patch @@ -0,0 +1,34 @@ +From 607390315750815b0009b95ecd65699e2a1d110a Mon Sep 17 00:00:00 2001 +From: "Friedrich W. H. Kossebau" <[email protected]> +Date: Thu, 11 Nov 2021 15:57:54 +0100 +Subject: [PATCH] String extraction tool: fix crash with marked strings in + closed view + +BUG: 444405 + +FIXED-IN: 0.26.7 +--- + .../controllers/view/stringsextract/stringsextracttool.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/kasten/controllers/view/stringsextract/stringsextracttool.cpp b/kasten/controllers/view/stringsextract/stringsextracttool.cpp +index 0d629999a..bcb6b6734 100644 +--- a/kasten/controllers/view/stringsextract/stringsextracttool.cpp ++++ b/kasten/controllers/view/stringsextract/stringsextracttool.cpp +@@ -58,7 +58,12 @@ QString StringsExtractTool::title() const { return i18nc("@title:window of the t + void StringsExtractTool::setTargetModel(AbstractModel* model) + { + if (mByteArrayView) { +- mByteArrayView->disconnect(this); ++ // disconnect explicitly from all connects but QObject::detroyed, ++ // for the case mSourceByteArrayView is mByteArrayView ++ disconnect(mByteArrayView, &ByteArrayView::selectedDataChanged, ++ this, &StringsExtractTool::onSelectionChanged); ++ disconnect(mByteArrayView, &ByteArrayView::offsetCodingChanged, ++ this, &StringsExtractTool::offsetCodingChanged); + } + + mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr; +-- +GitLab + diff --git a/app-editors/okteta/okteta-0.26.6-r1.ebuild b/app-editors/okteta/okteta-0.26.6-r1.ebuild new file mode 100644 index 000000000000..069fb020a206 --- /dev/null +++ b/app-editors/okteta/okteta-0.26.6-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=5.82.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Hex editor by KDE" +HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"; + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2 handbook? ( FDL-1.2 )" +SLOT="5" +IUSE="crypt" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtscript-${QTMIN}:5[scripttools] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}: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/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + crypt? ( >=app-crypt/qca-2.3.0:2 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-crashfix.patch" ) + +src_configure() { + local mycmakeargs=( + -DOMIT_EXAMPLES=ON + $(cmake_use_find_package crypt Qca-qt5) + ) + + ecm_src_configure +} + +src_test() { + local myctestargs=( -j1 ) + + ecm_src_test +}
