7 changed files with 168 additions and 225 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,35 @@
-/nheko-*.tar.gz
+/header_only.tar.gz
+/lmdbxx-0b43ca8.tar.gz
+/matrix-structs-97201f9.tar.gz
+/nheko-73bc1ff.tar.gz
+/nheko-43ba4d5.tar.gz
+/nheko-a1ea11d.tar.gz
+/matrix-structs-335ece4.tar.gz
+/nheko-c75a136.tar.gz
+/matrix-structs-a84b372.tar.gz
+/nheko-0.2.0.tar.gz
+/matrix-structs-850100c.tar.gz
+/nheko-0.2.1.tar.gz
+/header_only-f3b7019.tar.gz
+/matrix-structs-7d5d5f7.tar.gz
+/nheko-0.3.0.tar.gz
+/tweeny-b94ce07.tar.gz
+/matrix-structs-a65c0be.tar.gz
+/nheko-0.3.1.tar.gz
+/matrix-structs-690080d.tar.gz
+/nheko-0.4.0.tar.gz
+/matrix-structs-5e57c23.tar.gz
+/nheko-0.4.1.tar.gz
+/nheko-0.4.2.tar.gz
+/matrix-structs-eeb7373.tar.gz
+/nheko-0.4.3.tar.gz
+/nheko-0.5.1.tar.gz
+/nheko-0.5.2.tar.gz
+/nheko-0.5.3.tar.gz
+/nheko-0.5.4.tar.gz
+/nheko-0.5.5.tar.gz
+/nheko-0.6.0.tar.gz
+/nheko-0.6.1.tar.gz
+/nheko-0.6.2.tar.gz
+/nheko-0.6.3.tar.gz
+/nheko-0.6.4.tar.gz
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.11.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
--- a/nheko-0.11.3-fmt10-fix.patch
+++ b/nheko-0.11.3-fmt10-fix.patch
@ -1,78 +0,0 @@
-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),
--- a/nheko-0.11.3-fmt10.1-fix.patch
+++ b/nheko-0.11.3-fmt10.1-fix.patch
@ -1,23 +0,0 @@
-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;
-                   }
--- a/nheko-0.11.3-gcc13-fix.patch
+++ b/nheko-0.11.3-gcc13-fix.patch
@ -1,22 +0,0 @@
-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;
--- a/nheko.spec
+++ b/nheko.spec
@ -1,80 +1,44 @@
 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
+Version: 0.6.4
+Release: 2%{?dist}
 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
+# Application and 3rd-party modules licensing:
+# * S0 - GPLv3+ -- main source.
+License: GPLv3+
+URL: https://github.com/Nheko-Reborn/nheko
+Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz

-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(Qt5DBus)
+BuildRequires: cmake(Qt5Core)
 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: cmake(Qt5Network)
+BuildRequires: cmake(Qt5Multimedia)
+BuildRequires: cmake(Qt5Concurrent)
+BuildRequires: cmake(Qt5LinguistTools)

-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: spdlog-devel >= 0.16
+BuildRequires: json-devel >= 3.1.2
+BuildRequires: mpark-variant-devel
 BuildRequires: desktop-file-utils
-BuildRequires: gcc
-BuildRequires: gcc-c++
 BuildRequires: libappstream-glib
-BuildRequires: lmdbxx-devel >= 1.0.0
+BuildRequires: mtxclient-devel
+BuildRequires: libsodium-devel
+BuildRequires: openssl-devel
+BuildRequires: libolm-devel
+BuildRequires: tweeny-devel
+BuildRequires: lmdbxx-devel
 BuildRequires: ninja-build
+BuildRequires: boost-devel
+BuildRequires: cmark-devel
+BuildRequires: lmdb-devel
+BuildRequires: zlib-devel
+BuildRequires: gcc-c++
+BuildRequires: cmake
+BuildRequires: gcc

 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
@ -82,53 +46,123 @@ for Matrix that feels more like a mainstream chat app.

 %prep
 %autosetup -p1
-rm -rf third_party/{blurhash,cpp-httplib*}
+mkdir -p %{_target_platform}
+sed -e '/-Wall/d' -e '/-Wextra/d' -e '/-Werror/d' -e '/-pedantic/d' -e '/-pipe/d' -i CMakeLists.txt
+echo "set_target_properties(nheko PROPERTIES SKIP_BUILD_RPATH TRUE)" >> CMakeLists.txt
+echo "include_directories(%{_includedir}/mpark)" >> CMakeLists.txt

 %build
-%cmake -G Ninja \
+pushd %{_target_platform}
+    %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
+    -DUSE_BUNDLED=OFF \
+    ..
+popd
+%ninja_build -C %{_target_platform}

 %install
-%cmake_install
+%ninja_install -C %{_target_platform}

 %check
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{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}/metainfo/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/zsh/site-functions/_%{name}
-%{_mandir}/man1/%{name}.1*

 %changelog
-%autochangelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu May 23 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 0.6.4-1
+- Updated to version 0.6.4.
+
+* Sun Feb 10 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 0.6.3-1
+- Switched upstream to a new maintained fork.
+- Updated to version 0.6.3.
+
+* Thu Jan 31 2019 Kalev Lember <klember@redhat.com> - 0.6.2-4
+- Rebuilt for Boost 1.69
+
+* Sat Jan 05 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 0.6.2-3
+- Rebuilt due to libolm update.
+
+* Mon Dec 10 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.6.2-2
+- Backported patch with localization update from maintained fork.
+
+* Sun Oct 07 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.6.2-1
+- Updated to version 0.6.2.
+
+* Wed Sep 26 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.6.1-2
+- Fixed bogus changelog entry.
+
+* Wed Sep 26 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.6.1-1
+- Updated to version 0.6.1.
+
+* Sat Sep 22 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.6.0-1
+- Updated to version 0.6.0.
+
+* Sun Sep 02 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.5.5-1
+- Updated to version 0.5.5.
+
+* Wed Aug 22 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.5.4-1
+- Updated to version 0.5.4.
+
+* Wed Aug 15 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.5.3-2
+- Backported patch with crash fix on logout.
+
+* Sun Aug 12 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.5.3-1
+- Updated to version 0.5.3.
+
+* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 0.5.2-2
+- Rebuild with fixed binutils
+
+* Sat Jul 28 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.5.2-1
+- Updated to version 0.5.2.
+
+* Fri Jul 27 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.5.1-2
+- Rebuild for new binutils
+
+* Thu Jul 26 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.5.1-1
+- Updated to version 0.5.1.
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jul 12 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.4.3-2
+- Fixed issue with system shutdown on KDE Plasma.
+
+* Sun Jun 03 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.4.3-1
+- Updated to version 0.4.3.
+
+* Fri May 25 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.4.2-1
+- Updated to version 0.4.2.
+
+* Thu May 24 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.4.1-1
+- Updated to version 0.4.1.
+
+* Fri May 04 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.4.0-1
+- Updated to version 0.4.0.
+
+* Fri Apr 13 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.3.1-1
+- Updated to version 0.3.1.
+
+* Tue Apr 03 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.3.0-1
+- Updated to version 0.3.0.
+
+* Wed Mar 14 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.2.1-1
+- Updated to version 0.2.1.
+
+* Mon Mar 05 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 0.2.0-1
+- Updated to version 0.2.0.
+
+* Thu Dec 28 2017 Vitaly Zaitsev <vitaly@easycoding.org> - 0.1.0-1
+- Updated to version 0.1.0.
+
+* Mon Sep 25 2017 Vitaly Zaitsev <vitaly@easycoding.org> - 0-1.20170924git9def76a
+- Initial SPEC release.
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (nheko-0.11.3.tar.gz) = bd5b94def3c56bb2c91c40c3ef967ee3b14cb71a7e5b01028743a849932c918620c2b1a1b822705e49dacc80dae6c48712f63bf9a68698858b0faaf1a816c9cd
+SHA512 (nheko-0.6.4.tar.gz) = 782673a3ae642029307517798e5be96cf0473cd4261af891988a35dfeb5e2e724d2c034407f62addd2e15973d287d11c6590d70cca739c705354cb0151536470