From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9A5EC15808B for ; Mon, 21 Feb 2022 16:48:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 502B4E09C0; Mon, 21 Feb 2022 16:48:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A590E09BE for ; Mon, 21 Feb 2022 16:48:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E62513436DB for ; Mon, 21 Feb 2022 16:48:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 172BB2EE for ; Mon, 21 Feb 2022 16:48:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1645461910.6adfde4ce0da5899b61d1fe5ff2ecf1e6251f371.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/okteta/files/, app-editors/okteta/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/okteta/files/okteta-0.26.6-crashfix.patch app-editors/okteta/okteta-0.26.6-r1.ebuild X-VCS-Directories: app-editors/okteta/files/ app-editors/okteta/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6adfde4ce0da5899b61d1fe5ff2ecf1e6251f371 X-VCS-Branch: master Date: Mon, 21 Feb 2022 16:48:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 44252cd7-1bfc-45bf-addd-e8097c16f18a X-Archives-Hash: a3b98fbdccfee82e94a180a40e1a8064 commit: 6adfde4ce0da5899b61d1fe5ff2ecf1e6251f371 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 21 14:57:26 2022 +0000 Commit: Andreas Sturmlechner gentoo 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 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" +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() : 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 +}