Fixed FTBFS on F40+.

This commit is contained in:
Vitaly 2024-03-27 11:57:08 +01:00
parent e13eb29be6
commit 8afc1265e7
No known key found for this signature in database
GPG Key ID: FE1EA9ACA989AAAA
2 changed files with 25 additions and 0 deletions

View File

@ -0,0 +1,23 @@
From 871e403f6799df48cfbbe08eba56d473a0c34216 Mon Sep 17 00:00:00 2001
From: q234rty <q23456yuiop@gmail.com>
Date: Thu, 17 Aug 2023 15:13:01 +0800
Subject: [PATCH] Fix build with fmt 10.1.0
I have no idea whether this is a fmt bug, and if this isn't a fmt bug how did this work before, but oh well...
---
src/ChatPage.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 4686b0f53..06d883032 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -1269,7 +1269,7 @@ ChatPage::getBackupVersion()
nhlog::crypto()->info("Our backup key {} does not match the one "
"used in the online backup {}",
pubkey,
- auth_data["public_key"]);
+ auth_data["public_key"].get<std::string>());
cache::client()->deleteBackupVersion();
return;
}

View File

@ -14,6 +14,8 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
Patch100: %{name}-0.11.3-gcc13-fix.patch
# https://github.com/Nheko-Reborn/nheko/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0
Patch101: %{name}-0.11.3-fmt10-fix.patch
# https://github.com/Nheko-Reborn/nheko/commit/871e403f6799df48cfbbe08eba56d473a0c34216
Patch102: %{name}-0.11.3-fmt10.1-fix.patch
BuildRequires: cmake(MatrixClient) >= 0.9.2
BuildRequires: cmake(Olm) >= 3.2.12