Backported upstream patch with GCC 13 build fix.
This commit is contained in:
parent
1943a7a46f
commit
71a771a1b7
22
nheko-0.11.3-gcc13-fix.patch
Normal file
22
nheko-0.11.3-gcc13-fix.patch
Normal file
@ -0,0 +1,22 @@
|
||||
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;
|
@ -1,6 +1,6 @@
|
||||
Name: nheko
|
||||
Version: 0.11.3
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
|
||||
# Main source - GPL-3.0-or-later.
|
||||
# cpp-httplib - bundled - MIT.
|
||||
@ -10,6 +10,9 @@ Summary: Desktop client for the Matrix protocol
|
||||
URL: https://github.com/Nheko-Reborn/%{name}
|
||||
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
|
||||
|
||||
BuildRequires: cmake(MatrixClient) >= 0.9.2
|
||||
BuildRequires: cmake(Olm) >= 3.2.12
|
||||
BuildRequires: cmake(Qt5Concurrent)
|
||||
@ -123,6 +126,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||
%{_mandir}/man1/%{name}.1*
|
||||
|
||||
%changelog
|
||||
* Fri Mar 24 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 0.11.3-2
|
||||
- Backported upstream patch with GCC 13 build fix.
|
||||
|
||||
* Thu Feb 23 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 0.11.3-1
|
||||
- Updated to version 0.11.3.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user