diff --git a/nheko-0.11.3-fmt10-fix.patch b/nheko-0.11.3-fmt10-fix.patch new file mode 100644 index 0000000..68e4eb3 --- /dev/null +++ b/nheko-0.11.3-fmt10-fix.patch @@ -0,0 +1,78 @@ +From e89e65dc17020772eb057414b4f0c5d6f4ad98d0 Mon Sep 17 00:00:00 2001 +From: Nicolas Werner +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(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(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 source_, + this, + [mediaPlayer](QMediaPlayer::Error error) { + nhlog::ui()->debug("Media player error {} and errorStr {}", +- error, ++ static_cast(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(status), static_cast(mediaPlayer->error())); + }); + connect(mediaPlayer, + qOverload(&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(&MxcMediaProxy::error), + [this](QMediaPlayer::Error error) { + nhlog::ui()->info("Media player error {} and errorStr {}", +- error, ++ static_cast(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(status), static_cast(this->error())); + }); + connect(this, + qOverload(&MxcMediaProxy::metaDataChanged), diff --git a/nheko.spec b/nheko.spec index 2e6a672..ea1a9bf 100644 --- a/nheko.spec +++ b/nheko.spec @@ -12,6 +12,8 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # https://github.com/Nheko-Reborn/nheko/commit/d7c10ae90417fcbb7f81edd4e40d89e91436244b 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(Olm) >= 3.2.12 @@ -129,6 +131,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog * Wed Jun 28 2023 Vitaly Zaitsev - 0.11.3-3 - Rebuilt due to fmt 10 update. +- Backported upstream patch with fmt 10 build fix. * Fri Mar 24 2023 Vitaly Zaitsev - 0.11.3-2 - Backported upstream patch with GCC 13 build fix.