From c351610155b99cff7b14ae606ab22bd1bd5c8277 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 15 Aug 2018 14:13:47 +0200 Subject: [PATCH] Backported patch with crash fix on logout. --- nheko-fix-logout-crash.patch | 25 +++++++++++++++++++++++++ nheko.spec | 8 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 nheko-fix-logout-crash.patch diff --git a/nheko-fix-logout-crash.patch b/nheko-fix-logout-crash.patch new file mode 100644 index 0000000..4be2e80 --- /dev/null +++ b/nheko-fix-logout-crash.patch @@ -0,0 +1,25 @@ +From 04c888c44c91bfbf15331351e8fa65de976dc7e3 Mon Sep 17 00:00:00 2001 +From: Konstantinos Sideris +Date: Mon, 13 Aug 2018 09:35:55 +0300 +Subject: [PATCH] Fix crash on logout + +--- + src/dialogs/Logout.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/dialogs/Logout.cpp b/src/dialogs/Logout.cpp +index f790eb9..54ccb7c 100644 +--- a/src/dialogs/Logout.cpp ++++ b/src/dialogs/Logout.cpp +@@ -47,9 +47,11 @@ Logout::Logout(QWidget *parent) + + confirmBtn_ = new FlatButton("OK", this); + confirmBtn_->setFont(buttonFont); ++ confirmBtn_->setRippleStyle(ui::RippleStyle::NoRipple); + + cancelBtn_ = new FlatButton(tr("CANCEL"), this); + cancelBtn_->setFont(buttonFont); ++ cancelBtn_->setRippleStyle(ui::RippleStyle::NoRipple); + + buttonLayout->addStretch(1); + buttonLayout->addWidget(confirmBtn_); diff --git a/nheko.spec b/nheko.spec index 1fa864b..b5d1536 100644 --- a/nheko.spec +++ b/nheko.spec @@ -1,7 +1,7 @@ Summary: Desktop client for the Matrix protocol Name: nheko Version: 0.5.3 -Release: 1%{?dist} +Release: 2%{?dist} # Application and 3rd-party modules licensing: # * S0 - GPLv3+ -- main source. @@ -13,6 +13,9 @@ License: GPLv3+ and ASL 2.0 and CC-BY URL: https://github.com/mujx/nheko Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://github.com/mujx/nheko/commit/04c888c44c91bfbf15331351e8fa65de976dc7e3 +Patch100: %{name}-fix-logout-crash.patch + BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Core) @@ -81,6 +84,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Wed Aug 15 2018 Vitaly Zaitsev - 0.5.3-2 +- Backported patch with crash fix on logout. + * Sun Aug 12 2018 Vitaly Zaitsev - 0.5.3-1 - Updated to version 0.5.3.