Backported upstream patch with fmt 10 build fix.
This commit is contained in:
parent
547246627d
commit
b631adc2b6
78
nheko-0.11.3-fmt10-fix.patch
Normal file
78
nheko-0.11.3-fmt10-fix.patch
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
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(-)
|
||||||
|
|
||||||
|
diff --git a/src/Cache.cpp b/src/Cache.cpp
|
||||||
|
index c575ebf7..0c5e879c 100644
|
||||||
|
--- a/src/Cache.cpp
|
||||||
|
+++ b/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();
|
||||||
|
diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
|
||||||
|
index 0e9043dd..7dee9e6b 100644
|
||||||
|
--- a/src/encryption/DeviceVerificationFlow.cpp
|
||||||
|
+++ b/src/encryption/DeviceVerificationFlow.cpp
|
||||||
|
@@ -39,7 +39,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
|
||||||
|
, 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();
|
||||||
|
|
||||||
|
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
|
||||||
|
index 94944337..1fb210d8 100644
|
||||||
|
--- a/src/timeline/InputBar.cpp
|
||||||
|
+++ b/src/timeline/InputBar.cpp
|
||||||
|
@@ -948,14 +948,14 @@ MediaUpload::MediaUpload(std::unique_ptr<QIODevice> source_,
|
||||||
|
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),
|
||||||
|
diff --git a/src/ui/MxcMediaProxy.cpp b/src/ui/MxcMediaProxy.cpp
|
||||||
|
index da5a2231..dbe63469 100644
|
||||||
|
--- a/src/ui/MxcMediaProxy.cpp
|
||||||
|
+++ b/src/ui/MxcMediaProxy.cpp
|
||||||
|
@@ -37,11 +37,11 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent)
|
||||||
|
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),
|
@ -12,6 +12,8 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
|||||||
|
|
||||||
# https://github.com/Nheko-Reborn/nheko/commit/d7c10ae90417fcbb7f81edd4e40d89e91436244b
|
# https://github.com/Nheko-Reborn/nheko/commit/d7c10ae90417fcbb7f81edd4e40d89e91436244b
|
||||||
Patch100: %{name}-0.11.3-gcc13-fix.patch
|
Patch100: %{name}-0.11.3-gcc13-fix.patch
|
||||||
|
# https://github.com/Nheko-Reborn/nheko/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0
|
||||||
|
Patch101: %{name}-0.11.3-fmt10-fix.patch
|
||||||
|
|
||||||
BuildRequires: cmake(MatrixClient) >= 0.9.2
|
BuildRequires: cmake(MatrixClient) >= 0.9.2
|
||||||
BuildRequires: cmake(Olm) >= 3.2.12
|
BuildRequires: cmake(Olm) >= 3.2.12
|
||||||
@ -129,6 +131,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
|
|||||||
%changelog
|
%changelog
|
||||||
* Wed Jun 28 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 0.11.3-3
|
* Wed Jun 28 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 0.11.3-3
|
||||||
- Rebuilt due to fmt 10 update.
|
- Rebuilt due to fmt 10 update.
|
||||||
|
- Backported upstream patch with fmt 10 build fix.
|
||||||
|
|
||||||
* Fri Mar 24 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 0.11.3-2
|
* Fri Mar 24 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 0.11.3-2
|
||||||
- Backported upstream patch with GCC 13 build fix.
|
- Backported upstream patch with GCC 13 build fix.
|
||||||
|
Loading…
Reference in New Issue
Block a user