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 8DFED158086 for ; Sat, 27 Nov 2021 11:08:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 455E8E083E; Sat, 27 Nov 2021 11:08:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B9E82E0536 for ; Sat, 27 Nov 2021 11:08:06 +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 066C0342FE9 for ; Sat, 27 Nov 2021 11:08:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CCFC1EA for ; Sat, 27 Nov 2021 11:08:03 +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: <1638011271.259a5f4e6ef30f04c535eadefbc5422fd22a4a24.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild X-VCS-Directories: kde-frameworks/ktexteditor/files/ kde-frameworks/ktexteditor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 259a5f4e6ef30f04c535eadefbc5422fd22a4a24 X-VCS-Branch: master Date: Sat, 27 Nov 2021 11:08:03 +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: 30a44c13-1ce5-47a0-a8ed-5dc8f8cc6655 X-Archives-Hash: b16b99b16d6f575f1d9f5ec35bbf03f6 commit: 259a5f4e6ef30f04c535eadefbc5422fd22a4a24 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 27 10:13:40 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 27 11:07:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259a5f4e kde-frameworks/ktexteditor: Revert "completion: invoke always" Regression from KF 5.87, see also: https://invent.kde.org/frameworks/ktexteditor/-/merge_requests/224 Upstream commit 3be743ebd34cfb1992d52ffe38ac5512e36aae12 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=444883 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../ktexteditor-5.88.0-revert-invoke-always.patch | 36 +++++++++++++ .../ktexteditor/ktexteditor-5.88.0-r1.ebuild | 63 ++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch new file mode 100644 index 000000000000..543a2f8e0a65 --- /dev/null +++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch @@ -0,0 +1,36 @@ +From 3be743ebd34cfb1992d52ffe38ac5512e36aae12 Mon Sep 17 00:00:00 2001 +From: Waqar Ahmed +Date: Thu, 11 Nov 2021 11:14:47 +0500 +Subject: [PATCH] Revert "completion: invoke always" + +This reverts commit d116503df2ca1b159c13ae77aac88cdb08408659. +--- + src/completion/katecompletionwidget.cpp | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/completion/katecompletionwidget.cpp b/src/completion/katecompletionwidget.cpp +index 3af1f2b5..73a36423 100644 +--- a/src/completion/katecompletionwidget.cpp ++++ b/src/completion/katecompletionwidget.cpp +@@ -35,7 +35,6 @@ + #include + + const bool hideAutomaticCompletionOnExactMatch = true; +-const bool invokeCompletionAlways = true; + + // If this is true, the completion-list is navigated up/down when 'tab' is pressed, instead of doing partial completion + const bool shellLikeTabCompletion = false; +@@ -418,9 +417,7 @@ void KateCompletionWidget::startCompletion(const KTextEditor::Range &word, + } + if (m_completionRanges.contains(model)) { + if (*m_completionRanges[model].range == range) { +- if (!invokeCompletionAlways) { +- continue; // Leave it running as it is +- } ++ continue; // Leave it running as it is + } else { // delete the range that was used previously + KTextEditor::MovingRange *oldRange = m_completionRanges[model].range; + // qCDebug(LOG_KTE)<<"removing completion range 2"; +-- +GitLab + diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild new file mode 100644 index 000000000000..65508f4a0393 --- /dev/null +++ b/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Framework providing a full text editor component" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="+editorconfig git" + +RESTRICT="test" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/kauth-${PVCUT}*:5 + =kde-frameworks/kcodecs-${PVCUT}*:5 + =kde-frameworks/kcompletion-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kguiaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kio-${PVCUT}*:5 + =kde-frameworks/kitemviews-${PVCUT}*:5 + =kde-frameworks/kjobwidgets-${PVCUT}*:5 + =kde-frameworks/kparts-${PVCUT}*:5 + =kde-frameworks/ktextwidgets-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kxmlgui-${PVCUT}*:5 + =kde-frameworks/sonnet-${PVCUT}*:5 + =kde-frameworks/syntax-highlighting-${PVCUT}*:5 + editorconfig? ( app-text/editorconfig-core-c ) + git? ( dev-libs/libgit2:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + test? ( >=kde-frameworks/kservice-${PVCUT}:5 ) +" + +PATCHES=( + "${FILESDIR}/${P}-revert-invoke-always.patch" # KDE-bug 444883 +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package editorconfig EditorConfig) + $(cmake_use_find_package git LibGit2) + ) + + ecm_src_configure +}