[neon/network/neochat/Neon/unstable] debian/patches: guard against gcc15 specific insert_range usage

[Carlos De Maine]

Git commit 482acc3d51e8e845a750dc8e21012ddf6b167f92 by Carlos De Maine.
Committed on 14/07/2026 at 03:08.
Pushed by carlosdem into branch 'Neon/unstable'.

guard against gcc15 specific insert_range usage

use a temp var to catch the result and then use a traditional .insert function instead

A  +64   -0    debian/patches/gcc_15_isms.diff
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/network/neochat/-/commit/482acc3d51e8e845a750dc8e21012ddf6b167f92

diff --git a/debian/patches/gcc_15_isms.diff b/debian/patches/gcc_15_isms.diff
new file mode 100644
index 0000000..7df1c33
--- /dev/null
+++ b/debian/patches/gcc_15_isms.diff
@@ -0,0 +1,64 @@
+diff --git a/src/libneochat/eventhandler.cpp b/src/libneochat/eventhandler.cpp
+index 3fb51e61b..e76856f50 100644
+--- a/src/libneochat/eventhandler.cpp
++++ b/src/libneochat/eventhandler.cpp
+@@ -729,8 +729,12 @@ Blocks::BlockPtrs EventHandler::blocksForEvent(NeoChatRoom *room, const RoomEven
+         return {};
+     }
+     Blocks::BlockPtrs blocks;
++#if defined(__GNUC__) && __GNUC__ >= 15
+     blocks.insert_range(blocks.end(), blocksForEventType(room, event, parent));
+-
++#else
++    auto source_range = blocksForEventType(room, event, parent);
++    blocks.insert(blocks.end(), source_range.begin(), source_range.end());
++#endif
+     const auto roomMessageEvent = eventCast<const RoomMessageEvent>(event);
+     if (roomMessageEvent
+         && ((roomMessageEvent->isThreaded() && roomMessageEvent->id() == roomMessageEvent->threadRootEventId())
+@@ -786,6 +790,7 @@ Blocks::BlockPtrs EventHandler::blocksForEventType(NeoChatRoom *room, const Room
+         Blocks::BlockPtrs components;
+         components.push_back(blockForMediaEvent(room, event, parent));
+         if (const auto body = rawMessageBody(*event); !event->is<StickerEvent>() && !body.isEmpty()) {
++#if defined(__GNUC__) && __GNUC__ >= 15
+             components.insert_range(components.end(),
+                                     TextHandler().textComponents(body,
+                                                                  messageBodyInputFormat(*event),
+@@ -798,6 +803,20 @@ Blocks::BlockPtrs EventHandler::blocksForEventType(NeoChatRoom *room, const Room
+ #endif
+                                                                  false,
+                                                                  parent));
++#else
++            auto text_components = TextHandler().textComponents(body,
++                                                                messageBodyInputFormat(*event),
++                                                                room,
++                                                                event,
++#if Quotient_VERSION_MINOR > 9
++                                                                event->isReplaced(),
++#else
++                                                                roomMessageEvent->isReplaced(),
++#endif
++                                                                false, parent);
++
++            components.insert(components.end(), text_components.begin(), text_components.end());
++#endif
+         }
+         return components;
+     }
+diff --git a/src/messagecontent/models/eventmessagecontentmodel.cpp b/src/messagecontent/models/eventmessagecontentmodel.cpp
+index d14d7f33c..84fa88f1b 100644
+--- a/src/messagecontent/models/eventmessagecontentmodel.cpp
++++ b/src/messagecontent/models/eventmessagecontentmodel.cpp
+@@ -324,7 +324,12 @@ Blocks::BlockPtrs EventMessageContentModel::messageContentComponents(bool isEdit
+     if (isEditing) {
+         blocks.push_back(new Blocks::ChatBarBlock(Blocks::ChatBar, true, {}, this));
+     } else {
++#if defined(__GNUC__) && __GNUC__ >= 15
+         blocks.insert_range(blocks.end(), EventHandler::blocksForEvent(m_room, event, this));
++#else
++        auto event_blocks = EventHandler::blocksForEvent(m_room, event, this);
++        blocks.insert(blocks.end(), event_blocks.begin(), event_blocks.end());
++#endif
+     }
+ 
+ #if Quotient_VERSION_MINOR > 9
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9d5ce1f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gcc_15_isms.diff