gentoo resync : 05.12.2021

3 files changed, 46 insertions, 5 deletions

diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index ea563d9a05d7..791eea104207 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,6 @@
+AUX ktexteditor-5.88.0-revert-invoke-always.patch 1534 BLAKE2B 836612b2e41a73a7099e4bb775427854901b999f471d02eb2f19ca1e516eaa6f5f35799cd9d038a1a2ac8f7b9e7d6160cd4d42776d471fe49291d2c761ca320f SHA512 41d99f771817daceff02a9589c78d4af6987e819437bbd923ccc8108baf89f40e5fdfc0512bba0a816a778710e41626391ea53087a162f591baef8715e689a84
 DIST ktexteditor-5.85.0.tar.xz 2327328 BLAKE2B 528f0888a09453613f76ab3209090d8a8a3647e71617fca280adb5e828b4ba138a4f30361e60fa8bb96316edf543f49a62a31e14328410bf4d8771012f9b3b8b SHA512 90219189043fc04920a4462f67d5cd9ebab8ab720801e29c5d4ae4d7746413d7776f37204486245e21e1da47605d6ecef269acb48dfc1431255335fec6e0e8ea
-DIST ktexteditor-5.87.0.tar.xz 2336240 BLAKE2B 6f1ad10c33001c045335634b0ddc752e4156e6a0c2a82d05c1c0851cfa09142aae76aedf868d5806e7a3cb6fd283cd29673a4b19509e1c5092395cfd116412bf SHA512 43f697f3997258aad5dd541f21c05be77b5bfd290fa8b032d6007ffab38a05bb771fd989e0496dd8e528d8e1d074a5820c1f082deef414df7900c993633b4e7b
+DIST ktexteditor-5.88.0.tar.xz 2335128 BLAKE2B 8d173dadd77ca4ba3980bc4c80908d194617afd59c00aefd2492dbf7411e7ad1cafeffcb00193cdb8fc3588084db6b71a57fd84c1b14129c1b3897f090c93dbb SHA512 e5e42b6bb46de07caa0594e2356273e590240a7a48913bd21ba162a3d993fa15208a34e6aae844ca6b1a6d15e3df7fa861ac4c0f6a1414a62332fff17304312b
 EBUILD ktexteditor-5.85.0.ebuild 1594 BLAKE2B a958c28cbeb2c263e1eafc81800a0ae6b99435e5c0a9c10671290b752edcc90041a9cd68d9c132308ab8cababad7555772c9f4de874ad8c650faa955a0042ef3 SHA512 22aff673367f956c2ad0b00750e1afdca7296b429b4bde65551bfa5529ae4252e4bd731ab2b91d051777adfd974828e90685377ed3e04fd2f0df840ffd6119f9
-EBUILD ktexteditor-5.87.0.ebuild 1597 BLAKE2B 6fe3fa031d19a5ad5c53cfbf86bf2ef5f18a4e0e76862a49bbb131a7eeaa88ff7f91ceab839e25dcde654c8fdc04884f03cf6cbc655375853a8a482def04de02 SHA512 25963a6a16bc09b031be6b94ac1d51e66b4bf732477466baad7d03b1dab27629a826521fbbe69498fa002adef97ef96ccc0254a349262562b8ebc2512ff0a9eb
+EBUILD ktexteditor-5.88.0-r1.ebuild 1674 BLAKE2B 449ca5da320e351215720f96ac224c4c26b2e1ea559e07242c28180407b973826e02e4d68b5ed536a1520262d623959cbb5ff203a136dcd22451bf8adf6c83b1 SHA512 a702ee556428c9a4ae388badfcfb50efbb4a93b8fa6d4a9551b35668a81d29746b7e243f6f4caf5ae7f52d418160490b1a340c3113296b5709fc8a2b83afc968
 MISC metadata.xml 558 BLAKE2B 4f17698120e7bb1f131519e4a43f33e99916d3690a548412572a43cc060a115eeed44d0ca0cab43f7c3fea8c098f4c495ce571ea1cb6ce78a25e7ef0fb49f1e5 SHA512 441d42f0f301c60e77f90d40cf57f76addaf455225a99e63ea95ed3b7a08d944fe80260c7188a989d830277006da96f271fb6a02bad41ead3bea7358621ae04a
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 <waqar.17a@gmail.com>
+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 <QToolButton>
+ 
+ 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.87.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild
index 8dd4b006a85a..65508f4a0393 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.87.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild
@@ -16,9 +16,6 @@ IUSE="+editorconfig git"
 
 RESTRICT="test"
 
-BDEPEND="
-	test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
-"
 DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -48,6 +45,13 @@ DEPEND="
 	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=(