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 <[email protected]> +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=(
