diff --git a/.gitignore b/.gitignore index 6d04984..093f96b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /nheko-0.6.4.tar.gz /nheko-0.7.1.tar.gz /nheko-0.7.2.tar.gz +/nheko-0.8.0.tar.gz diff --git a/nheko-themes-fix.patch b/nheko-themes-fix.patch deleted file mode 100644 index 62ed571..0000000 --- a/nheko-themes-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e1706f4df5505ebe400cb389ddf6a860557e0c77 Mon Sep 17 00:00:00 2001 -From: Lorem -Date: Sun, 14 Jun 2020 13:56:15 +0530 -Subject: [PATCH] Fix not being able to change theme - ---- - src/UserSettingsPage.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp -index 88cbd1c9..05ff6d38 100644 ---- a/src/UserSettingsPage.cpp -+++ b/src/UserSettingsPage.cpp -@@ -271,7 +271,7 @@ UserSettings::setPresence(Presence state) - void - UserSettings::setTheme(QString theme) - { -- if (theme == theme) -+ if (theme == theme_) - return; - theme_ = theme; - save(); diff --git a/nheko.spec b/nheko.spec index a80b88b..76353e4 100644 --- a/nheko.spec +++ b/nheko.spec @@ -1,58 +1,66 @@ %undefine __cmake_in_source_build + +%if 0%{?fedora} && 0%{?fedora} >= 34 +%bcond_without clang +%else %bcond_with clang +%endif %if %{with clang} -%if 0%{?fedora} && 0%{?fedora} >= 33 %global toolchain clang -%else -%global optflags %(echo %{optflags} | sed -e 's/-mcet//g' -e 's/-fcf-protection//g' -e 's/-fstack-clash-protection//g' -e 's/$/ -Qunused-arguments -Wno-unknown-warning-option -Wno-deprecated-declarations/') -%endif %endif Name: nheko -Version: 0.7.2 -Release: 5%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Desktop client for the Matrix protocol License: GPLv3+ URL: https://github.com/Nheko-Reborn/nheko Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# https://github.com/Nheko-Reborn/nheko/pull/220 -Patch100: %{name}-themes-fix.patch - -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5Multimedia) +BuildRequires: cmake(MatrixClient) >= 0.4.0 +BuildRequires: cmake(Olm) >= 3.1.0 BuildRequires: cmake(Qt5Concurrent) -BuildRequires: cmake(Qt5QuickWidgets) +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(Tweeny) +BuildRequires: cmake(mpark_variant) +BuildRequires: cmake(nlohmann_json) >= 3.2.0 +BuildRequires: cmake(spdlog) >= 1.0.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(libsodium) +BuildRequires: pkgconfig(lmdb) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(zlib) -BuildRequires: mtxclient-devel >= 0.3.1 -BuildRequires: spdlog-devel >= 0.16 BuildRequires: boost-devel >= 1.70 -BuildRequires: json-devel >= 3.1.2 -BuildRequires: mpark-variant-devel +BuildRequires: cmake BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: libappstream-glib -BuildRequires: libsodium-devel -BuildRequires: openssl-devel -BuildRequires: libolm-devel -BuildRequires: tweeny-devel BuildRequires: lmdbxx-devel BuildRequires: ninja-build -BuildRequires: cmark-devel -BuildRequires: lmdb-devel -BuildRequires: zlib-devel -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: gcc %if %{with clang} BuildRequires: compiler-rt @@ -61,6 +69,7 @@ BuildRequires: llvm %endif Requires: hicolor-icon-theme +Requires: qt5-qtquickcontrols2%{?_isa} %description The motivation behind the project is to provide a native desktop app @@ -71,21 +80,13 @@ for Matrix that feels more like a mainstream chat app. %build %cmake -G Ninja \ -%if %{with clang} - -DCMAKE_C_COMPILER=%{_bindir}/clang \ - -DCMAKE_CXX_COMPILER=%{_bindir}/clang++ \ - -DCMAKE_AR=%{_bindir}/llvm-ar \ - -DCMAKE_RANLIB=%{_bindir}/llvm-ranlib \ - -DCMAKE_LINKER=%{_bindir}/llvm-ld \ - -DCMAKE_OBJDUMP=%{_bindir}/llvm-objdump \ - -DCMAKE_NM=%{_bindir}/llvm-nm \ -%else - -DCMAKE_AR=%{_bindir}/gcc-ar \ - -DCMAKE_RANLIB=%{_bindir}/gcc-ranlib \ - -DCMAKE_NM=%{_bindir}/gcc-nm \ -%endif -DCMAKE_BUILD_TYPE=Release \ + -DCOMPILE_QML:BOOL=OFF \ -DHUNTER_ENABLED:BOOL=OFF \ + -DCI_BUILD:BOOL=OFF \ + -DASAN:BOOL=OFF \ + -DQML_DEBUGGING:BOOL=OFF \ + -DBUILD_DOCS:BOOL=OFF \ -DUSE_BUNDLED_BOOST:BOOL=OFF \ -DUSE_BUNDLED_SPDLOG:BOOL=OFF \ -DUSE_BUNDLED_OLM:BOOL=OFF \ @@ -97,6 +98,7 @@ for Matrix that feels more like a mainstream chat app. -DUSE_BUNDLED_TWEENY:BOOL=OFF \ -DUSE_BUNDLED_JSON:BOOL=OFF \ -DUSE_BUNDLED_OPENSSL:BOOL=OFF \ + -DUSE_BUNDLED_QTKEYCHAIN:BOOL=OFF \ -DUSE_BUNDLED_SODIUM:BOOL=OFF %cmake_build @@ -116,8 +118,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog -* Tue Dec 01 2020 Rex Dieter - 0.7.2-5 -- drop hard-coded/versioned Qt5 dependency +* Wed Jan 20 2021 Vitaly Zaitsev - 0.8.0-1 +- Updated to version 0.8.0. * Mon Nov 23 2020 Vitaly Zaitsev - 0.7.2-4 - Rebuilt due to Qt 5.15.2 update. diff --git a/sources b/sources index 8e19ca6..2228276 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nheko-0.7.2.tar.gz) = 53378a4a239aeb7f5a578c269f90043f9162cd357225059b0848720bfe2756db34866baf98d1b6b8c332a04e6d676ed4ad14df29cf76cccfce3fe67743cc694a +SHA512 (nheko-0.8.0.tar.gz) = c427904bc846956aeda57ec6bc1bcf25962caa99f47da669c006d5adeb10b8b14c75aa98d9879fa91b558af8d0e9b475f52c60a1a3ee34b2cd5780f84130bcdb