Compare commits
111 Commits
epel8-play
...
rawhide
Author | SHA1 | Date | |
---|---|---|---|
|
d07b835bd2 | ||
|
abdedb7775 | ||
|
7e069609b2 | ||
|
8afc1265e7 | ||
|
e13eb29be6 | ||
|
56291c0960 | ||
|
d6593df8bc | ||
|
c6786f0276 | ||
|
b631adc2b6 | ||
|
547246627d | ||
|
71a771a1b7 | ||
|
1943a7a46f | ||
|
9c9a18f45d | ||
|
f520a5f5a9 | ||
|
3495450819 | ||
|
cc1f742e0f | ||
|
46d7d5e00b | ||
|
c949ab992f | ||
|
62ca2735a2 | ||
|
f489c9a664 | ||
|
b08538b758 | ||
|
a0e39b6b1c | ||
|
22265d1789 | ||
|
2ff6a50ef4 | ||
|
388332f8eb | ||
|
74762b2c1f | ||
|
c1ecac08af | ||
|
33f10e891d | ||
|
05f870ec17 | ||
|
76a635512b | ||
|
af09bb0a00 | ||
|
28398843f2 | ||
|
261f81b468 | ||
|
f45e68c0c4 | ||
|
ba83ea2a01 | ||
|
5d5a9b7fe9 | ||
|
dbbfeeb056 | ||
|
a1a57de2fd | ||
|
0fb69b9ce6 | ||
|
3908aa56da | ||
|
9d93f4c81a | ||
|
86bd138faa | ||
|
1ea5e66dbf | ||
|
7d1a9ae3d7 | ||
|
032aecb5f8 | ||
|
ca4b012c30 | ||
|
bfa4af4173 | ||
|
52091b8ddf | ||
|
dd646fd342 | ||
|
1977d94145 | ||
|
428ab41706 | ||
|
f45e5d7be2 | ||
|
56042a8fe9 | ||
|
df987bd4b9 | ||
|
f9069d4e4e | ||
|
51033ee530 | ||
|
9da9656f63 | ||
|
b7b7eb49ae | ||
|
444dbe039a | ||
|
bda9189cb7 | ||
|
15131cd78c | ||
|
1531a43be0 | ||
|
7d38a23217 | ||
|
f78817145d | ||
|
b491c234e6 | ||
|
075966fa3f | ||
|
150f70f224 | ||
|
9754b712ef | ||
|
686bb403be | ||
|
0900db00b8 | ||
|
64e4f2c837 | ||
|
ba85dc8828 | ||
|
db2bfb1641 | ||
|
111543ff8c | ||
|
431a060aae | ||
|
4ec65dc295 | ||
|
4821f6c36c | ||
|
15f0335832 | ||
|
1aa22202e1 | ||
|
6a7144389a | ||
|
eb63957a18 | ||
|
69a7433959 | ||
|
8dc46e4da7 | ||
|
fa572e934e | ||
|
4e6a8f0f6f | ||
|
292450a51f | ||
|
49010779d2 | ||
|
c351610155 | ||
|
b23dbf182c | ||
|
34bc5dbbb7 | ||
|
94177668e9 | ||
|
8c3af633ee | ||
|
217f876064 | ||
|
3af02da330 | ||
|
f39a967727 | ||
|
fdfb26f985 | ||
|
45e77bc97a | ||
|
55139e4d0d | ||
|
b9cb63a72b | ||
|
deba512e9d | ||
|
9311df1379 | ||
|
69eb9bb4de | ||
|
e610fe18b6 | ||
|
2a6e7ea6fd | ||
|
bddcd56c87 | ||
|
67a2cb918f | ||
|
b0a9616dfc | ||
|
56ffda361c | ||
|
c30b74398e | ||
|
65e2cd25ed | ||
|
9abba2fff0 |
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/nheko-*.tar.gz
|
2
changelog
Normal file
2
changelog
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.3-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
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),
|
23
nheko-0.11.3-fmt10.1-fix.patch
Normal file
23
nheko-0.11.3-fmt10.1-fix.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
From 871e403f6799df48cfbbe08eba56d473a0c34216 Mon Sep 17 00:00:00 2001
|
||||||
|
From: q234rty <q23456yuiop@gmail.com>
|
||||||
|
Date: Thu, 17 Aug 2023 15:13:01 +0800
|
||||||
|
Subject: [PATCH] Fix build with fmt 10.1.0
|
||||||
|
|
||||||
|
I have no idea whether this is a fmt bug, and if this isn't a fmt bug how did this work before, but oh well...
|
||||||
|
---
|
||||||
|
src/ChatPage.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
|
||||||
|
index 4686b0f53..06d883032 100644
|
||||||
|
--- a/src/ChatPage.cpp
|
||||||
|
+++ b/src/ChatPage.cpp
|
||||||
|
@@ -1269,7 +1269,7 @@ ChatPage::getBackupVersion()
|
||||||
|
nhlog::crypto()->info("Our backup key {} does not match the one "
|
||||||
|
"used in the online backup {}",
|
||||||
|
pubkey,
|
||||||
|
- auth_data["public_key"]);
|
||||||
|
+ auth_data["public_key"].get<std::string>());
|
||||||
|
cache::client()->deleteBackupVersion();
|
||||||
|
return;
|
||||||
|
}
|
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;
|
134
nheko.spec
Normal file
134
nheko.spec
Normal file
@ -0,0 +1,134 @@
|
|||||||
|
Name: nheko
|
||||||
|
Version: 0.11.3
|
||||||
|
Release: %autorelease
|
||||||
|
|
||||||
|
# Main source - GPL-3.0-or-later.
|
||||||
|
# cpp-httplib - bundled - MIT.
|
||||||
|
# qtsingleapplication-qt5 - bundled - MIT.
|
||||||
|
License: GPL-3.0-or-later AND MIT
|
||||||
|
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
|
||||||
|
# https://github.com/Nheko-Reborn/nheko/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0
|
||||||
|
Patch101: %{name}-0.11.3-fmt10-fix.patch
|
||||||
|
# https://github.com/Nheko-Reborn/nheko/commit/871e403f6799df48cfbbe08eba56d473a0c34216
|
||||||
|
Patch102: %{name}-0.11.3-fmt10.1-fix.patch
|
||||||
|
|
||||||
|
BuildRequires: cmake(MatrixClient) >= 0.9.2
|
||||||
|
BuildRequires: cmake(Olm) >= 3.2.12
|
||||||
|
BuildRequires: cmake(Qt5Concurrent)
|
||||||
|
BuildRequires: cmake(Qt5Core)
|
||||||
|
BuildRequires: cmake(Qt5DBus)
|
||||||
|
BuildRequires: cmake(Qt5Keychain)
|
||||||
|
BuildRequires: cmake(Qt5LinguistTools)
|
||||||
|
BuildRequires: cmake(Qt5Multimedia)
|
||||||
|
BuildRequires: cmake(Qt5Network)
|
||||||
|
BuildRequires: cmake(Qt5Qml)
|
||||||
|
BuildRequires: cmake(Qt5QuickCompiler)
|
||||||
|
BuildRequires: cmake(Qt5QuickControls2)
|
||||||
|
BuildRequires: cmake(Qt5QuickWidgets)
|
||||||
|
BuildRequires: cmake(Qt5Svg)
|
||||||
|
BuildRequires: cmake(Qt5Widgets)
|
||||||
|
BuildRequires: cmake(fmt) >= 9.1.0
|
||||||
|
BuildRequires: cmake(httplib) >= 0.5.12
|
||||||
|
BuildRequires: cmake(mpark_variant)
|
||||||
|
BuildRequires: cmake(nlohmann_json) >= 3.2.0
|
||||||
|
BuildRequires: cmake(spdlog) >= 1.0.0
|
||||||
|
|
||||||
|
BuildRequires: pkgconfig(blurhash) >= 0.2.0
|
||||||
|
BuildRequires: pkgconfig(coeurl) >= 0.3.0
|
||||||
|
BuildRequires: pkgconfig(gstreamer-1.0)
|
||||||
|
BuildRequires: pkgconfig(gstreamer-app-1.0)
|
||||||
|
BuildRequires: pkgconfig(gstreamer-audio-1.0)
|
||||||
|
BuildRequires: pkgconfig(gstreamer-base-1.0)
|
||||||
|
BuildRequires: pkgconfig(gstreamer-sdp-1.0)
|
||||||
|
BuildRequires: pkgconfig(gstreamer-video-1.0)
|
||||||
|
BuildRequires: pkgconfig(gstreamer-webrtc-1.0)
|
||||||
|
BuildRequires: pkgconfig(libcmark) >= 0.29.0
|
||||||
|
BuildRequires: pkgconfig(libcrypto)
|
||||||
|
BuildRequires: pkgconfig(libevent)
|
||||||
|
BuildRequires: pkgconfig(lmdb)
|
||||||
|
BuildRequires: pkgconfig(openssl)
|
||||||
|
BuildRequires: pkgconfig(re2)
|
||||||
|
BuildRequires: pkgconfig(xcb)
|
||||||
|
BuildRequires: pkgconfig(xcb-ewmh)
|
||||||
|
BuildRequires: pkgconfig(zlib)
|
||||||
|
|
||||||
|
BuildRequires: asciidoc
|
||||||
|
BuildRequires: cmake
|
||||||
|
BuildRequires: desktop-file-utils
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: libappstream-glib
|
||||||
|
BuildRequires: lmdbxx-devel >= 1.0.0
|
||||||
|
BuildRequires: ninja-build
|
||||||
|
|
||||||
|
Requires: hicolor-icon-theme
|
||||||
|
Requires: qt-jdenticon%{?_isa}
|
||||||
|
Requires: qt5-qtquickcontrols2%{?_isa}
|
||||||
|
|
||||||
|
Recommends: google-noto-emoji-color-fonts
|
||||||
|
Recommends: google-noto-emoji-fonts
|
||||||
|
|
||||||
|
# https://github.com/Nheko-Reborn/nheko/issues/391
|
||||||
|
Provides: bundled(qtsingleapplication-qt5) = 3.3.2
|
||||||
|
|
||||||
|
%description
|
||||||
|
The motivation behind the project is to provide a native desktop app
|
||||||
|
for Matrix that feels more like a mainstream chat app.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -p1
|
||||||
|
rm -rf third_party/{blurhash,cpp-httplib*}
|
||||||
|
|
||||||
|
%build
|
||||||
|
%cmake -G Ninja \
|
||||||
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
|
||||||
|
-DCOMPILE_QML:BOOL=OFF \
|
||||||
|
-DHUNTER_ENABLED:BOOL=OFF \
|
||||||
|
-DCI_BUILD:BOOL=OFF \
|
||||||
|
-DASAN:BOOL=OFF \
|
||||||
|
-DQML_DEBUGGING:BOOL=OFF \
|
||||||
|
-DBUILD_DOCS:BOOL=OFF \
|
||||||
|
-DVOIP:BOOL=ON \
|
||||||
|
-DMAN:BOOL=ON \
|
||||||
|
-DUSE_BUNDLED_BLURHASH:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_CMARK:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_COEURL:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_CPPHTTPLIB:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_GTEST:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_JSON:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_LIBEVENT:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_LMDB:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_LMDBXX:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_MTXCLIENT:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_OLM:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_OPENSSL:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_QTKEYCHAIN:BOOL=OFF \
|
||||||
|
-DUSE_BUNDLED_SPDLOG:BOOL=OFF
|
||||||
|
%cmake_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%cmake_install
|
||||||
|
|
||||||
|
%check
|
||||||
|
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
|
||||||
|
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||||
|
|
||||||
|
%files
|
||||||
|
%doc README.md CHANGELOG.md
|
||||||
|
%license COPYING
|
||||||
|
%dir %{_datadir}/zsh/site-functions
|
||||||
|
%{_bindir}/%{name}
|
||||||
|
%{_metainfodir}/%{name}.appdata.xml
|
||||||
|
%{_datadir}/applications/%{name}.desktop
|
||||||
|
%{_datadir}/icons/hicolor/*/apps/%{name}.*
|
||||||
|
%{_datadir}/zsh/site-functions/_%{name}
|
||||||
|
%{_mandir}/man1/%{name}.1*
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
%autochangelog
|
Loading…
Reference in New Issue
Block a user