[neon/network/neochat/Neon/stable] debian/patches: rebase patch for stable branch

[Carlos De Maine]

Git commit b4309d2adb003dc4e6ef210fc5beb8a11173803e by Carlos De Maine.
Committed on 14/07/2026 at 04:32.
Pushed by carlosdem into branch 'Neon/stable'.

rebase patch for stable branch

R  +19   -10   debian/patches/gcc_15_isms-testing.diff [from: debian/patches/gcc_15_isms.diff - 072% similarity]

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

diff --git a/debian/patches/gcc_15_isms.diff b/debian/patches/gcc_15_isms-testing.diff
similarity index 72%
rename from debian/patches/gcc_15_isms.diff
rename to debian/patches/gcc_15_isms-testing.diff
index 7df1c33..8c6ec73 100644
--- a/debian/patches/gcc_15_isms.diff
+++ b/debian/patches/gcc_15_isms-testing.diff
@@ -1,30 +1,32 @@
 diff --git a/src/libneochat/eventhandler.cpp b/src/libneochat/eventhandler.cpp
-index 3fb51e61b..e76856f50 100644
+index 466f28c45..c2ed86e5d 100644
 --- a/src/libneochat/eventhandler.cpp
 +++ b/src/libneochat/eventhandler.cpp
-@@ -729,8 +729,12 @@ Blocks::BlockPtrs EventHandler::blocksForEvent(NeoChatRoom *room, const RoomEven
+@@ -719,9 +719,15 @@ Blocks::BlockPtrs EventHandler::blocksForEvent(NeoChatRoom *room, const Quotient
          return {};
      }
      Blocks::BlockPtrs blocks;
 +#if defined(__GNUC__) && __GNUC__ >= 15
      blocks.insert_range(blocks.end(), blocksForEventType(room, event, parent));
--
+ 
+     const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
 +#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);
++    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()) {
+             || room->threads().contains(roomMessageEvent->id()))) {
+@@ -765,6 +771,7 @@ Blocks::BlockPtrs EventHandler::blocksForEventType(NeoChatRoom *room, const Quot
+         components.push_back(EventHandler::blockForMediaEvent(room, event, parent));
+         auto body = EventHandler::rawMessageBody(*event);
+         if (!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
+                                                                  EventHandler::messageBodyInputFormat(*event),
+@@ -777,6 +784,20 @@ Blocks::BlockPtrs EventHandler::blocksForEventType(NeoChatRoom *room, const Quot
  #endif
                                                                   false,
                                                                   parent));
@@ -45,6 +47,13 @@ index 3fb51e61b..e76856f50 100644
          }
          return components;
      }
+@@ -992,4 +1013,4 @@ QString EventHandler::locationAssetType(const Quotient::RoomEvent *event)
+     return assetType;
+ }
+ 
+-#include "moc_eventhandler.cpp"
++#include "moc_eventhandler.cpp"
+\ No newline at end of file
 diff --git a/src/messagecontent/models/eventmessagecontentmodel.cpp b/src/messagecontent/models/eventmessagecontentmodel.cpp
 index d14d7f33c..84fa88f1b 100644
 --- a/src/messagecontent/models/eventmessagecontentmodel.cpp