File fix_fmt10_issues.patch of Package nheko
Slightly rebased version of upstream commit:
From e89e65dc17020772eb057414b4f0c5d6f4ad98d0 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 28 Jun 2023 13:16:10 +0200
Subject: [PATCH] Fix build against fmt10
fixes #1499
---
src/Cache.cpp | 2 +-
src/encryption/DeviceVerificationFlow.cpp | 2 +-
src/timeline/InputBar.cpp | 10 ++++++----
src/ui/MxcMediaProxy.cpp | 9 ++++++---
4 files changed, 14 insertions(+), 9 deletions(-)
Index: nheko-0.11.3/src/Cache.cpp
===================================================================
--- nheko-0.11.3.orig/src/Cache.cpp
+++ nheko-0.11.3/src/Cache.cpp
@@ -438,7 +438,7 @@ Cache::loadSecretsFromStore(
if (job->error() && job->error() != QKeychain::Error::EntryNotFound) {
nhlog::db()->error("Restoring secret '{}' failed ({}): {}",
name.toStdString(),
- job->error(),
+ static_cast<int>(job->error()),
job->errorString().toStdString());
fatalSecretError();
Index: nheko-0.11.3/src/encryption/DeviceVerificationFlow.cpp
===================================================================
--- nheko-0.11.3.orig/src/encryption/DeviceVerificationFlow.cpp
+++ nheko-0.11.3/src/encryption/DeviceVerificationFlow.cpp
@@ -39,7 +39,7 @@ DeviceVerificationFlow::DeviceVerificati
, deviceIds(std::move(deviceIds_))
, model_(model)
{
- nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", flow_type, (void *)this);
+ nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", static_cast<int>(flow_type), (void *)this);
if (deviceIds.size() == 1)
deviceId = deviceIds.front();
Index: nheko-0.11.3/src/timeline/InputBar.cpp
===================================================================
--- nheko-0.11.3.orig/src/timeline/InputBar.cpp
+++ nheko-0.11.3/src/timeline/InputBar.cpp
@@ -948,14 +948,16 @@ MediaUpload::MediaUpload(std::unique_ptr
this,
[mediaPlayer](QMediaPlayer::Error error) {
nhlog::ui()->debug("Media player error {} and errorStr {}",
- error,
+ static_cast<int>(error),
mediaPlayer->errorString().toStdString());
});
connect(mediaPlayer,
&QMediaPlayer::mediaStatusChanged,
[mediaPlayer](QMediaPlayer::MediaStatus status) {
nhlog::ui()->debug(
- "Media player status {} and error {}", status, mediaPlayer->error());
+ "Media player status {} and error {}",
+ static_cast<int>(status),
+ static_cast<int>(mediaPlayer->error()));
});
connect(mediaPlayer,
qOverload<const QString &, const QVariant &>(&QMediaPlayer::metaDataChanged),
Index: nheko-0.11.3/src/ui/MxcMediaProxy.cpp
===================================================================
--- nheko-0.11.3.orig/src/ui/MxcMediaProxy.cpp
+++ nheko-0.11.3/src/ui/MxcMediaProxy.cpp
@@ -37,11 +37,13 @@ MxcMediaProxy::MxcMediaProxy(QObject *pa
qOverload<QMediaPlayer::Error>(&MxcMediaProxy::error),
[this](QMediaPlayer::Error error) {
nhlog::ui()->info("Media player error {} and errorStr {}",
- error,
+ static_cast<int>(error),
this->errorString().toStdString());
});
connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) {
- nhlog::ui()->info("Media player status {} and error {}", status, this->error());
+ nhlog::ui()->info("Media player status {} and error {}",
+ static_cast<int>(status),
+ static_cast<int>(this->error()));
});
connect(this,
qOverload<const QString &, const QVariant &>(&MxcMediaProxy::metaDataChanged),
Index: nheko-0.11.3/src/ChatPage.cpp
===================================================================
--- nheko-0.11.3.orig/src/ChatPage.cpp
+++ nheko-0.11.3/src/ChatPage.cpp
@@ -1248,7 +1248,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;
}