[neon/network/neochat/Neon/stable] debian/patches: drop unneccessary patch
Carlos De Maine
null at kde.org
Mon Jul 27 06:30:34 BST 2026
Git commit 58872998cee5d2f0c9f34e6e21535274aa0074f5 by Carlos De Maine.
Committed on 27/07/2026 at 05:30.
Pushed by carlosdem into branch 'Neon/stable'.
drop unneccessary patch
D +0 -73 debian/patches/gcc_15_isms-testing.diff
D +0 -1 debian/patches/series
https://invent.kde.org/neon/network/neochat/-/commit/58872998cee5d2f0c9f34e6e21535274aa0074f5
diff --git a/debian/patches/gcc_15_isms-testing.diff b/debian/patches/gcc_15_isms-testing.diff
deleted file mode 100644
index 8c6ec73..0000000
--- a/debian/patches/gcc_15_isms-testing.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/src/libneochat/eventhandler.cpp b/src/libneochat/eventhandler.cpp
-index 466f28c45..c2ed86e5d 100644
---- a/src/libneochat/eventhandler.cpp
-+++ b/src/libneochat/eventhandler.cpp
-@@ -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);
- if (roomMessageEvent
- && ((roomMessageEvent->isThreaded() && roomMessageEvent->id() == roomMessageEvent->threadRootEventId())
- || 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,
- EventHandler::messageBodyInputFormat(*event),
-@@ -777,6 +784,20 @@ Blocks::BlockPtrs EventHandler::blocksForEventType(NeoChatRoom *room, const Quot
- #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;
- }
-@@ -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
-+++ 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
deleted file mode 100644
index 084eb8a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-gcc_15_isms-testing.diff
More information about the Neon-commits
mailing list