Accepting request 813720 from KDE:Applications

20.04.2 (+respins) (forwarded request 813365 from cgiboudeaux)

OBS-URL: https://build.opensuse.org/request/show/813720
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ksystemlog?expand=0&rev=91
This commit is contained in:
Dominique Leuenberger 2020-06-14 16:29:19 +00:00 committed by Git OBS Bridge
commit 9f5575f30a
7 changed files with 27 additions and 47 deletions

View File

@ -1,29 +0,0 @@
From eeab31a116535efc6d4757f027897265736ed161 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sun, 17 May 2020 20:22:45 +0000
Subject: Disconnect `QtabWidget::currentChanged` signal on window close event
Otherwise `MainWindow::changeCurrentTab()` may still get called when things are already being destroyed, leading to crashes.
BUG: 409375
FIXED-IN: 20.04.2
---
src/mainWindow.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/mainWindow.cpp b/src/mainWindow.cpp
index 3607f6c..a30449c 100644
--- a/src/mainWindow.cpp
+++ b/src/mainWindow.cpp
@@ -350,6 +350,8 @@ void MainWindow::updateReloading()
void MainWindow::closeEvent(QCloseEvent *event)
{
+ disconnect(d->tabs, &QTabWidget::currentChanged, this, &MainWindow::changeCurrentTab);
+
LogManager *currentLogManager = d->tabs->activeLogManager();
if (currentLogManager) {
currentLogManager->stopWatching();
--
cgit v1.1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d16ad8b37a5a751ec8c5a72b6738a7cffacdd2698246ec3f6f9d6eeb138246a0
size 1929568

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl65/4QACgkQ29LOiT4t
HIdFCwf/c+b3sEUV3oQdaQGkLwFjAxtxyhAHH8+XkVofHw1tTwSMjxT2Bv+i8BOU
binBZWMBGYRtNp1eOh9J9jOp/p7bTPsgf3J8ey67GIHRnLd+QkMJE0kfGj0CqZ2M
fXIUeqqfmQJukFXIvDOOxupQTRcKHapkpQms36zmC8gyF1XWHwF3iuWHsXoGNbL4
la10OrbcvLFPp6al8Apcupfh2B91oficaaDlVx1RTvW8kVG/qXSC5k7VgGygRRb0
9AH5/Jdx5LFuqVbYGaBpcmczMUC/BHEyT0bn89p7PBaWXbFZfbt7dQXj9GwbVALN
/9MRTGciQ8Uymz8xbDVr/uXxRGE72g==
=SHxP
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:097796719fa8b503cffb0a036e2f8d4152acaf3c8ad8b4ae721b528a2fa6dceb
size 1929584

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl7e3dIACgkQ29LOiT4t
HIfZqggAjy9SGPo/Rhjz9GKxvRC3QBWQFqm7oyXjoDMkOBtR0cMW0IIo2Moga2Kc
19kziRnUaqzrwvPKXdhkMP1eN2ler8psNtXe86vPvNUw0zwOvmExE7udHe+CwjYJ
lIJzfc/5Ul4WbZdc/8GlnS2Xr5U1b7uXESf9T6vU788cQcPF+W4rXHN92NWxJ/nY
PEoNRaqwsOOdO9Gpg7zE2GSypdzm5q2DQrpYHBQPxpjahdPMWz4lVuZzspIqtrIi
uRzO06Zy5ZqE3LZto8Lg9NBum7G3oiKczhypl/5cQ9cCMk8eiozKF7vr98yDxanr
kn61FMUOn/ylZ5G4b5px5aZepIDHXA==
=aNTM
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Jun 9 12:15:47 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 20.04.2
* New bugfix release
* For more details please see:
* https://kde.org/announcements/releases/2020-06-apps-update
- Changes since 20.04.1:
* Disconnect `QtabWidget::currentChanged` signal on window close event (kde#409375)
- Drop upstream patch:
* Disconnect-QtabWidget_currentChanged-signal-on-window-close.patch
-------------------------------------------------------------------
Wed May 27 09:56:54 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>

View File

@ -21,15 +21,13 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: ksystemlog
Version: 20.04.1
Version: 20.04.2
Release: 0
Summary: System Log Viewer Tool
License: GPL-2.0-only
Group: System/Monitoring
URL: https://www.kde.org
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch: Disconnect-QtabWidget_currentChanged-signal-on-window-close.patch
BuildRequires: extra-cmake-modules
BuildRequires: oxygen5-icon-theme-large
BuildRequires: pkgconfig
@ -59,7 +57,6 @@ want to quickly see problems occurring on their server.
%prep
%setup -q
%autopatch -p1
%build
%cmake_kf5 -d build