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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2C485138334 for ; Fri, 1 Nov 2019 19:39:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DE21E07B3; Fri, 1 Nov 2019 19:39:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41FBDE07B3 for ; Fri, 1 Nov 2019 19:39:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E767C34C67C for ; Fri, 1 Nov 2019 19:39:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F80A779 for ; Fri, 1 Nov 2019 19:39:33 +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: <1572637145.30c5f7e692e0bd2022e60263cb0b878f375ed5dc.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild X-VCS-Directories: kde-frameworks/ktexteditor/ kde-frameworks/ktexteditor/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 30c5f7e692e0bd2022e60263cb0b878f375ed5dc X-VCS-Branch: master Date: Fri, 1 Nov 2019 19:39:33 +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: 1a2d1f3e-e04c-4109-b48a-9cc02f48c231 X-Archives-Hash: 365b27c35748c0a5d1554d181af9573a commit: 30c5f7e692e0bd2022e60263cb0b878f375ed5dc Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 1 19:37:32 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 1 19:39:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c5f7e6 kde-frameworks/ktexteditor: Fix runtime crash See also: https://mail.kde.org/pipermail/kde-distro-packagers/2019-October/000389.html KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=413474 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/ktexteditor-5.63.0-crashfix.patch | 27 ++++++++++ .../ktexteditor/ktexteditor-5.63.0-r1.ebuild | 58 ++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch new file mode 100644 index 00000000000..f6c867cad65 --- /dev/null +++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch @@ -0,0 +1,27 @@ +From f6e72a23052339253daa79095391625cf01c96f1 Mon Sep 17 00:00:00 2001 +From: Christoph Cullmann +Date: Mon, 28 Oct 2019 20:32:13 +0100 +Subject: fix crash + +BUG: 413474 +--- + src/utils/katevariableexpansionhelpers.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/utils/katevariableexpansionhelpers.cpp b/src/utils/katevariableexpansionhelpers.cpp +index db71d0f..89aab3d 100644 +--- a/src/utils/katevariableexpansionhelpers.cpp ++++ b/src/utils/katevariableexpansionhelpers.cpp +@@ -278,7 +278,9 @@ KateVariableExpansionDialog::KateVariableExpansionDialog(QWidget *parent) + connect(m_listView, &QAbstractItemView::activated, [this, lblDescription, lblCurrentValue](const QModelIndex &index) { + if (index.isValid()) { + const auto &var = m_variables[m_filterModel->mapToSource(index).row()]; +- const auto name = QStringLiteral("%{") + var.name() + QLatin1Char('}'); ++ ++ // not auto, don't fall for string builder, see bug 413474 ++ const QString name = QStringLiteral("%{") + var.name() + QLatin1Char('}'); + + if (parentWidget() && parentWidget()->window()) { + auto currentWidget = parentWidget()->window()->focusWidget(); +-- +cgit v1.1 diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild new file mode 100644 index 00000000000..371a1c9b8ec --- /dev/null +++ b/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing a full text editor component" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="editorconfig git" + +BDEPEND=" + test? ( $(add_frameworks_dep kservice) ) +" +DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kauth) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kparts) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep sonnet) + $(add_frameworks_dep syntax-highlighting) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + editorconfig? ( app-text/editorconfig-core-c ) + git? ( dev-libs/libgit2:= ) +" +RDEPEND="${DEPEND}" + +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-crashfix.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package editorconfig EditorConfig) + $(cmake-utils_use_find_package git LibGit2) + ) + + kde5_src_configure +}