gentoo auto-resync : 07:11:2024 - 03:03:27

4 files changed, 74 insertions, 1 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 6c1875b6a8f0..1fa1d4cb9e6a 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index ca5d5c10a47e..1dad7388f7cf 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,7 +1,8 @@
+AUX ktexteditor-6.7.0-fix-segfault.patch 3524 BLAKE2B c53f52e197794d95045c5797d6a629eb1eab3fb1227bebce81088f25161d1426e12f015b813a2626ad41654dac28e4db92dafb12a0ee09e130726f37d3056bca SHA512 58fe993741d0853c9d0c14ab2dc08dcfa0aa229bc1cbaa9725836ba0e41c2ba735ec64a2cfcb9a8012b5b656194ddf66264ce34ad90ef469c1ea7c367b6a53a2
 DIST ktexteditor-5.116.0.tar.xz 2791176 BLAKE2B 7fb32bb7d18ccf43e33f66b0401fc086597145e3838e84a4333f99b3725e64c82ea5f78daf5fc58dfb13ea0452e85a64d1d03a503b363bba8247e26c922fd396 SHA512 9d17558e4f7adc5de1dec0af9ba32b2eb086def576dd32d3458b91d9f0424aa86505a57ab092a71f5274197bfd18927b7ccddf221551cd42d2a96f22394495e0
 DIST ktexteditor-6.6.0.tar.xz 2877692 BLAKE2B 4a9e96756fc202034e11ba17bb9457e407bc0ce92706e4c04907b5d43dc70a8d686dc72f37223f57ca9e249993ffc44bf5d75ef8b6a0d8dc35de9378457c5215 SHA512 bd27ab4f2776a48c2352c46a79e70df3bebc9e796a8b2ff0012ac1f049bce532dd8df6f808878a2f960fc85ff907b4088e20859bb143ffae86b18f284939ac1a
 DIST ktexteditor-6.7.0.tar.xz 2880020 BLAKE2B 96f73b03b7510530a7a1caa4c276ffc9e99ea544d4754a4adb2e09f372d8835a0fafe31c550d902484c4710e2bd87b6c2ba4a7b72634d1984386e51af951c742 SHA512 cfa51dc60d20cdbdf1b88c92c14a12bbb71aa7302376f4670fc940c4c6927dd74836bb66b47c0ac23018af9e5f445f551bf7b9f1623b785b46b7bfe2c496fec1
 EBUILD ktexteditor-5.116.0.ebuild 1512 BLAKE2B cbbe2fed19a40fd9e9f2b3aa6da76d50890b7fa327e7bbb1215e856993e7d6fc5c8732bcc181960bd69383526fee91baa2c7defef54529a5328688812f11581a SHA512 45b35549b4218541a993192a1487560df2e036ea79ea659bcf8ee7d8a22ffe7188989eb73d338ef908883ce2bc812fe1f425e7745b5d274f417f6265ea144ecf
 EBUILD ktexteditor-6.6.0.ebuild 1492 BLAKE2B 8413d465d7234734a7910af6c2146fc64431f340ce99bc7c2fff23287893fbdc53df48da6008012716cb6f67313f32b04515b7b01302bd58a5f880951b44c910 SHA512 1dbfa700f63f518d3ee7d68c3a8e5d20e80502a7d3d5071ea246e79569b2956359b2f2bd1f97c0e830d115299baf0d123229549356b655f0dd9d7391c205d251
-EBUILD ktexteditor-6.7.0.ebuild 1452 BLAKE2B afe949e1abeb91c178f34746c38b81814655daa37cefd74cb0e458f19b62c18b2cdf8bd6f705a2f688c2c07c555c321ad0595137a9e137211e52309128d7efc0 SHA512 f1f44084a67fe1f683e1f48f5a1a9babbb999e669917d916e2dd695315c2db8974ccef791c0b48a440e7fb5c6ed034ccf3772259786bf39726919cf2216a55b5
+EBUILD ktexteditor-6.7.0-r1.ebuild 1520 BLAKE2B b9ccee2ba91c872d8be75fd29335aad19530fecaa7dc9c4a94a50709750abb9769e473ef74659bdb648c9b71a5b5e63cdb3275a4125417c4d1d265145b349f50 SHA512 32c0e214d344adf9762ebaa011323d48c20afcd9fba072cf77ca166fea1ca2ae6327a54fecd404d2a1b9754ef0e940717d0b33786024be883fd44a2d7def65cf
 MISC metadata.xml 617 BLAKE2B 432b6a3bf74f8673ebeda6dd2310bb75f0ecc09e48c2a1d3ca2c954dcd6ce4f8f992124b362e4ad3c1d166fde1f45d7fb9531d17fba201d5a0c93186ebe404ca SHA512 9babd75eaddd27663739ef242a1afbbbb427b986c78d8f6ead6dd026484f523403f827bdcc7a12c539558f6a19e02b73e3bf7a591c3333653dd1217a79a3281f
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-6.7.0-fix-segfault.patch b/kde-frameworks/ktexteditor/files/ktexteditor-6.7.0-fix-segfault.patch
new file mode 100644
index 000000000000..9ae8ebff41b0
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-6.7.0-fix-segfault.patch
@@ -0,0 +1,70 @@
+From 43c148b2664e15e2c517ba1eb53dc04447b7d499 Mon Sep 17 00:00:00 2001
+From: Waqar Ahmed <waqar.17a@gmail.com>
+Date: Wed, 16 Oct 2024 10:32:36 +0500
+Subject: [PATCH] Fix multiblock range handling when unwrapping line
+
+BUG: 494826
+(cherry picked from commit 2c7e0711efd65e68687d530240bb46a1cf8de122)
+---
+ src/buffer/katetextblock.cpp | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/src/buffer/katetextblock.cpp b/src/buffer/katetextblock.cpp
+index 90ed4e480..d1e767dfd 100644
+--- a/src/buffer/katetextblock.cpp
++++ b/src/buffer/katetextblock.cpp
+@@ -219,7 +219,7 @@ void TextBlock::unwrapLine(int line, TextBlock *previousBlock, int fixStartLines
+ 
+         // move all cursors because of the unwrapped line
+         // remember all ranges modified, optimize for the standard case of a few ranges
+-        QVarLengthArray<TextRange *, 32> changedRanges;
++        QVarLengthArray<QPair<TextRange *, bool>, 32> changedRanges;
+         for (TextCursor *cursor : m_cursors) {
+             // this is the unwrapped line
+             if (cursor->lineInBlock() == 0) {
+@@ -230,7 +230,7 @@ void TextBlock::unwrapLine(int line, TextBlock *previousBlock, int fixStartLines
+                 auto range = cursor->kateRange();
+                 if (range && !range->isValidityCheckRequired()) {
+                     range->setValidityCheckRequired();
+-                    changedRanges.push_back(range);
++                    changedRanges.push_back({range, false});
+                 }
+             }
+         }
+@@ -239,15 +239,18 @@ void TextBlock::unwrapLine(int line, TextBlock *previousBlock, int fixStartLines
+         for (auto it = previousBlock->m_cursors.begin(); it != previousBlock->m_cursors.end();) {
+             auto cursor = *it;
+             if (cursor->lineInBlock() == lastLineOfPreviousBlock) {
++                Kate::TextRange *range = cursor->kateRange();
++                // get the value before changing the block
++                const bool spansMultipleBlocks = range && range->spansMultipleBlocks();
+                 cursor->m_line = 0;
+                 cursor->m_block = this;
+                 m_cursors.insert(cursor);
+ 
+                 // remember range, if any, avoid double insert
+-                auto range = cursor->kateRange();
+                 if (range && !range->isValidityCheckRequired()) {
+                     range->setValidityCheckRequired();
+-                    changedRanges.push_back(range);
++                    // the range might not span multiple blocks anymore
++                    changedRanges.push_back({range, spansMultipleBlocks});
+                 }
+ 
+                 // remove from previous block
+@@ -261,7 +264,11 @@ void TextBlock::unwrapLine(int line, TextBlock *previousBlock, int fixStartLines
+         // fixup the ranges that might be effected, because they moved from last line to this block
+         // we might need to invalidate ranges or notify about their changes
+         // checkValidity might trigger delete of the range!
+-        for (TextRange *range : std::as_const(changedRanges)) {
++        for (auto [range, wasMultiblock] : changedRanges) {
++            // if the range doesn't span multiple blocks anymore remove it from buffer multiline range cache
++            if (!range->spansMultipleBlocks() && wasMultiblock) {
++                m_buffer->removeMultilineRange(range);
++            }
+             // afterwards check validity, might delete this range!
+             range->checkValidity();
+         }
+-- 
+2.47.0
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-6.7.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-6.7.0-r1.ebuild
index faa5553cd904..9a041c7561e2 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-6.7.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-6.7.0-r1.ebuild
@@ -43,6 +43,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:6 )"
 
+PATCHES=( "${FILESDIR}/${P}-fix-segfault.patch" ) # KDE-bug 494826
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package editorconfig EditorConfig)