[neon/network/neochat/Neon/stable_noble] debian/patches: refresh again

Carlos De Maine null at kde.org
Wed Aug 19 06:12:47 BST 2026


Git commit 629176c0fc2a1f1634322551b3f8a19ac379ff4d by Carlos De Maine.
Committed on 19/08/2026 at 05:12.
Pushed by carlosdem into branch 'Neon/stable_noble'.

refresh again

M  +9    -11   debian/patches/gcc_15_isms.diff

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

diff --git a/debian/patches/gcc_15_isms.diff b/debian/patches/gcc_15_isms.diff
index e9ae12e..28f649c 100644
--- a/debian/patches/gcc_15_isms.diff
+++ b/debian/patches/gcc_15_isms.diff
@@ -1,8 +1,8 @@
 diff --git a/src/libneochat/eventhandler.cpp b/src/libneochat/eventhandler.cpp
-index 3fb51e61b..e76856f50 100644
+index 466f28c45..5a5a2ca84 100644
 --- a/src/libneochat/eventhandler.cpp
 +++ b/src/libneochat/eventhandler.cpp
-@@ -719,8 +719,12 @@ Blocks::BlockPtrs EventHandler::blocksForEvent(NeoChatRoom *room, const Quotient::RoomEvent *event, QObject *parent)
+@@ -719,8 +719,12 @@ Blocks::BlockPtrs EventHandler::blocksForEvent(NeoChatRoom *room, const Quotient
          return {};
      }
      Blocks::BlockPtrs blocks;
@@ -15,32 +15,30 @@ index 3fb51e61b..e76856f50 100644
 +#endif
      const auto roomMessageEvent = eventCast<const Quotient::RoomMessageEvent>(event);
      if (roomMessageEvent
-        && ((roomMessageEvent->isThreaded() && roomMessageEvent->id() == roomMessageEvent->threadRootEventId())
-@@ -764,6 +768,7 @@ Blocks::BlockPtrs EventHandler::blocksForEventType(NeoChatRoom *room, const Quotient::RoomEvent *event, QObject *parent)
-         Blocks::BlockPtrs components;
+         && ((roomMessageEvent->isThreaded() && roomMessageEvent->id() == roomMessageEvent->threadRootEventId())
+@@ -765,6 +769,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,
-                                                                 EventHandler::messageBodyInputFormat(*event),
-@@ -798,6 +803,20 @@ Blocks::BlockPtrs EventHandler::blocksForEventType(NeoChatRoom *room, const Room
+                                                                  EventHandler::messageBodyInputFormat(*event),
+@@ -777,6 +782,19 @@ Blocks::BlockPtrs EventHandler::blocksForEventType(NeoChatRoom *room, const Quot
  #endif
                                                                   false,
                                                                   parent));
 +#else
 +            auto text_components = TextHandler().textComponents(body,
-+                                                                messageBodyInputFormat(*event),
-+                                                                room,
-+                                                                event,
++                                    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
          }


More information about the Neon-commits mailing list