mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-22 05:23:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

net-im/nheko: remove patches for old versions

Browse Source 
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
This commit is contained in:
Anna (cybertailor) Vyalkova
2024-12-08 14:27:42 +05:00
parent 895732c219
commit 962b7ced97
2 changed files with 0 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
net-im/nheko/files/nheko-0.11.3-fix-build-against-fmt10.patch
View File

@@ -1,82 +0,0 @@
# source: <https://src.fedoraproject.org/rpms/nheko/blob/rawhide/f/nheko-0.11.3-fmt10-fix.patch>
# backport of upstream commit
# <https://github.com/Nheko-Reborn/nheko/commit/e89e65d> by xvitaly for Fedora.
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),

24
net-im/nheko/files/nheko-0.11.3-fix-explicit-optional-construction.patch
View File

@@ -1,24 +0,0 @@
# upstream commit: <https://github.com/Nheko-Reborn/nheko/commit/d7c10ae>
From d7c10ae90417fcbb7f81edd4e40d89e91436244b Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Fri, 24 Mar 2023 19:48:47 +0100
Subject: [PATCH] Fix explicit optional construction on gcc13
---
src/timeline/EventStore.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp
index 3c214dcbe..dd0e920de 100644
--- a/src/timeline/EventStore.cpp
+++ b/src/timeline/EventStore.cpp
@@ -650,7 +650,7 @@ EventStore::get(int idx, bool decrypt)
if (edits_.empty())
event = cache::client()->getEvent(room_id_, *event_id);
else
- event = {edits_.back()};
+ event = mtx::events::collections::TimelineEvent{edits_.back()};
if (!event)
return nullptr;