commit: 95615d91271003f50748c9daf13aa11e1c5df9f0 Author: tastytea <gentoo <AT> tastytea <DOT> de> AuthorDate: Mon May 1 08:43:30 2023 +0000 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> CommitDate: Mon May 1 08:43:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=95615d91
net-im/nheko: fix building with gcc-13 Tested-by: Anders from the Nheko matrix room Signed-off-by: tastytea <gentoo <AT> tastytea.de> ...0.11.3-fix-explicit-optional-construction.patch | 24 ++++++++++++++++++++++ net-im/nheko/nheko-0.11.3.ebuild | 2 ++ 2 files changed, 26 insertions(+) diff --git a/net-im/nheko/files/nheko-0.11.3-fix-explicit-optional-construction.patch b/net-im/nheko/files/nheko-0.11.3-fix-explicit-optional-construction.patch new file mode 100644 index 000000000..5e0118f37 --- /dev/null +++ b/net-im/nheko/files/nheko-0.11.3-fix-explicit-optional-construction.patch @@ -0,0 +1,24 @@ +# upstream commit: <https://github.com/Nheko-Reborn/nheko/commit/d7c10ae> + +From d7c10ae90417fcbb7f81edd4e40d89e91436244b Mon Sep 17 00:00:00 2001 +From: Nicolas Werner <[email protected]> +Date: Fri, 24 Mar 2023 19:48:47 +0100 +Subject: [PATCH] Fix explicit optional construction on gcc13 + +--- + src/timeline/EventStore.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp +index 3c214dcbe..dd0e920de 100644 +--- a/src/timeline/EventStore.cpp ++++ b/src/timeline/EventStore.cpp +@@ -650,7 +650,7 @@ EventStore::get(int idx, bool decrypt) + if (edits_.empty()) + event = cache::client()->getEvent(room_id_, *event_id); + else +- event = {edits_.back()}; ++ event = mtx::events::collections::TimelineEvent{edits_.back()}; + + if (!event) + return nullptr; diff --git a/net-im/nheko/nheko-0.11.3.ebuild b/net-im/nheko/nheko-0.11.3.ebuild index 23609af60..732df7f66 100644 --- a/net-im/nheko/nheko-0.11.3.ebuild +++ b/net-im/nheko/nheko-0.11.3.ebuild @@ -67,6 +67,8 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}"/${P}-fix-explicit-optional-construction.patch ) + src_configure() { local -a mycmakeargs=( -DVOIP=$(usex voip)
