[neon/network/neochat/Neon/stable_noble] debian/patches: refresh patch once more
Carlos De Maine
null at kde.org
Wed Aug 19 05:47:55 BST 2026
Git commit bdad8fa38b09d29d7ac3c21deb3bf2835b560436 by Carlos De Maine.
Committed on 19/08/2026 at 04:46.
Pushed by carlosdem into branch 'Neon/stable_noble'.
refresh patch once more
M +9 -8 debian/patches/gcc_15_isms.diff
https://invent.kde.org/neon/network/neochat/-/commit/bdad8fa38b09d29d7ac3c21deb3bf2835b560436
diff --git a/debian/patches/gcc_15_isms.diff b/debian/patches/gcc_15_isms.diff
index 1466b43..9a5e1e6 100644
--- a/debian/patches/gcc_15_isms.diff
+++ b/debian/patches/gcc_15_isms.diff
@@ -2,7 +2,7 @@ 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
-@@ -719,8 +719,12 @@ Blocks::BlockPtrs EventHandler::blocksForEvent(NeoChatRoom *room, const RoomEven
+@@ -719,8 +719,12 @@ Blocks::BlockPtrs EventHandler::blocksForEvent(NeoChatRoom *room, const Quotient::RoomEvent *event, QObject *parent)
return {};
}
Blocks::BlockPtrs blocks;
@@ -13,17 +13,18 @@ index 3fb51e61b..e76856f50 100644
+ 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 Quotient::RoomMessageEvent>(event);
if (roomMessageEvent
- && ((roomMessageEvent->isThreaded() && roomMessageEvent->id() == roomMessageEvent->threadRootEventId())
-@@ -764,6 +768,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()) {
+ && ((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;
+ 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),
+ EventHandler::messageBodyInputFormat(*event),
@@ -798,6 +803,20 @@ Blocks::BlockPtrs EventHandler::blocksForEventType(NeoChatRoom *room, const Room
#endif
false,
More information about the Neon-commits
mailing list