diff --git a/PKGBUILD b/PKGBUILD index 3c247c8..277cbb7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=nheko pkgver=0.11.3 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop client for the Matrix protocol" arch=('x86_64') url="https://nheko.im/nheko-reborn/nheko" @@ -20,8 +20,15 @@ optdepends=('qt-jdenticon: Auto-generated profile pictures (identicons)' 'libnice: VoIP/Video calls' 'gst-plugin-qmlgl: Video calls and Screen sharing') makedepends=(cmake ninja boost qt5-tools fontconfig nlohmann-json asciidoc lmdbxx spdlog) -source=("$pkgname-$pkgver.tar.gz::https://nheko.im/nheko-reborn/${pkgname}/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz") -sha512sums=('b305c1f9045469d8163ea9d851b74f524578cecfd4463e1c2f1a62206b7bf308e4cf537930e03f7f565edc1f72ef12ad9fc8d3950a73fdd11c35ae4fc62f8d2d') +source=("$pkgname-$pkgver.tar.gz::https://nheko.im/nheko-reborn/${pkgname}/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz" + "$pkgname-$pkgver-fix-for-fmt-10.patch") +sha512sums=('b305c1f9045469d8163ea9d851b74f524578cecfd4463e1c2f1a62206b7bf308e4cf537930e03f7f565edc1f72ef12ad9fc8d3950a73fdd11c35ae4fc62f8d2d' + '67c630939ed11611038a12f13270bb43f8d52f4ffbac35b94f7ffee145ae4d2387ac462cc8b63857d661e4d8a92d77f32ff29222bd47fd61546ca6f214d0f7f9') + +prepare(){ + cd "$pkgname-v$pkgver" + patch -Np1 < "../$pkgname-$pkgver-fix-for-fmt-10.patch" +} build() { cmake \ diff --git a/nheko-0.11.3-fix-for-fmt-10.patch b/nheko-0.11.3-fix-for-fmt-10.patch new file mode 100644 index 0000000..0314c9d --- /dev/null +++ b/nheko-0.11.3-fix-for-fmt-10.patch @@ -0,0 +1,81 @@ +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 f4aad6b3a..7a19cba4d 100644 +--- a/src/Cache.cpp ++++ b/src/Cache.cpp +@@ -434,7 +434,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 a240a095c..1e7ed7bcc 100644 +--- a/src/encryption/DeviceVerificationFlow.cpp ++++ b/src/encryption/DeviceVerificationFlow.cpp +@@ -37,7 +37,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 2f3b6eae8..a59bc4c61 100644 +--- a/src/timeline/InputBar.cpp ++++ b/src/timeline/InputBar.cpp +@@ -948,14 +948,14 @@ + 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 2adf25387..5fae0654f 100644 +--- a/src/ui/MxcMediaProxy.cpp ++++ b/src/ui/MxcMediaProxy.cpp +@@ -37,11 +37,11 @@ + 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), +-- +GitLab +