[gentoo-commits] repo/proj/guru:dev commit in: net-im/nheko/files/, net-im/nheko/

[gentoo-commits] repo/proj/guru:dev commit in: net-im/nheko/files/, net-im/nheko/

[Ronny Gutbrod]

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 <nicolas.werner@hotmail.de>
+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)

[gentoo-commits] repo/proj/guru:dev commit in: net-im/nheko/files/, net-im/nheko/

[Anna Vyalkova]

commit:     0bbb8412c6ea23abfc045ab91d4fc3f40361a9f8
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sun Dec  8 09:30:45 2024 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun Dec  8 09:30:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0bbb8412

net-im/nheko: fix build with libfmt 11

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 net-im/nheko/files/nheko-0.12.0-fmt11.patch | 51 +++++++++++++++++++++++++++++
 net-im/nheko/nheko-0.12.0-r1.ebuild         |  5 ++-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/net-im/nheko/files/nheko-0.12.0-fmt11.patch b/net-im/nheko/files/nheko-0.12.0-fmt11.patch
new file mode 100644
index 000000000..fd08b7c2a
--- /dev/null
+++ b/net-im/nheko/files/nheko-0.12.0-fmt11.patch
@@ -0,0 +1,51 @@
+From 8ff28245275eeb0cfe4ed40bd62b97cebbce4861 Mon Sep 17 00:00:00 2001
+From: Vitaly <vitaly@easycoding.org>
+Date: Tue, 16 Jul 2024 12:30:45 +0200
+Subject: [PATCH] Fixed build against fmt 11.
+
+---
+ src/RegisterPage.cpp                      | 2 ++
+ src/Utils.cpp                             | 1 +
+ src/encryption/DeviceVerificationFlow.cpp | 1 +
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
+index 93e2cf1b..562d2c82 100644
+--- a/src/RegisterPage.cpp
++++ b/src/RegisterPage.cpp
+@@ -4,6 +4,8 @@
+ 
+ #include <set>
+ 
++#include <fmt/ranges.h>
++
+ #include <mtx/responses/common.hpp>
+ #include <mtx/responses/register.hpp>
+ #include <mtx/responses/version.hpp>
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3e7340f4..99d337c4 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -26,6 +26,7 @@
+ #include <QWindow>
+ #include <QXmlStreamReader>
+ 
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+ 
+ #include <cmark.h>
+diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
+index cb595df0..0757d88c 100644
+--- a/src/encryption/DeviceVerificationFlow.cpp
++++ b/src/encryption/DeviceVerificationFlow.cpp
+@@ -9,6 +9,7 @@
+ #include <QDateTime>
+ #include <QTimer>
+ 
++#include <fmt/ranges.h>
+ #include <nlohmann/json.hpp>
+ 
+ #include "Cache.h"
+-- 
+2.47.1
+

diff --git a/net-im/nheko/nheko-0.12.0-r1.ebuild b/net-im/nheko/nheko-0.12.0-r1.ebuild
index 1160dc354..a94486186 100644
--- a/net-im/nheko/nheko-0.12.0-r1.ebuild
+++ b/net-im/nheko/nheko-0.12.0-r1.ebuild
@@ -76,7 +76,10 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-remove-wayland-dep-on-x11.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.0-fmt11.patch
+	"${FILESDIR}"/${PN}-0.12.0-remove-wayland-dep-on-x11.patch
+)
 
 src_configure() {
 	local -a mycmakeargs=(