From e386fef8b4794057f8b6171f52846b5489e04a2cc830d1eda66ab38776ba0047 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 11 Jun 2020 17:42:15 +0000 Subject: [PATCH] 20.04.2 (+respins) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ksystemlog?expand=0&rev=130 --- ...urrentChanged-signal-on-window-close.patch | 29 ------------------- ksystemlog-20.04.1.tar.xz | 3 -- ksystemlog-20.04.1.tar.xz.sig | 11 ------- ksystemlog-20.04.2.tar.xz | 3 ++ ksystemlog-20.04.2.tar.xz.sig | 11 +++++++ ksystemlog.changes | 12 ++++++++ ksystemlog.spec | 5 +--- 7 files changed, 27 insertions(+), 47 deletions(-) delete mode 100644 Disconnect-QtabWidget_currentChanged-signal-on-window-close.patch delete mode 100644 ksystemlog-20.04.1.tar.xz delete mode 100644 ksystemlog-20.04.1.tar.xz.sig create mode 100644 ksystemlog-20.04.2.tar.xz create mode 100644 ksystemlog-20.04.2.tar.xz.sig diff --git a/Disconnect-QtabWidget_currentChanged-signal-on-window-close.patch b/Disconnect-QtabWidget_currentChanged-signal-on-window-close.patch deleted file mode 100644 index 14c5531..0000000 --- a/Disconnect-QtabWidget_currentChanged-signal-on-window-close.patch +++ /dev/null @@ -1,29 +0,0 @@ -From eeab31a116535efc6d4757f027897265736ed161 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -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 - diff --git a/ksystemlog-20.04.1.tar.xz b/ksystemlog-20.04.1.tar.xz deleted file mode 100644 index 7be84c9..0000000 --- a/ksystemlog-20.04.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d16ad8b37a5a751ec8c5a72b6738a7cffacdd2698246ec3f6f9d6eeb138246a0 -size 1929568 diff --git a/ksystemlog-20.04.1.tar.xz.sig b/ksystemlog-20.04.1.tar.xz.sig deleted file mode 100644 index 8bce992..0000000 --- a/ksystemlog-20.04.1.tar.xz.sig +++ /dev/null @@ -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----- diff --git a/ksystemlog-20.04.2.tar.xz b/ksystemlog-20.04.2.tar.xz new file mode 100644 index 0000000..a88724f --- /dev/null +++ b/ksystemlog-20.04.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:097796719fa8b503cffb0a036e2f8d4152acaf3c8ad8b4ae721b528a2fa6dceb +size 1929584 diff --git a/ksystemlog-20.04.2.tar.xz.sig b/ksystemlog-20.04.2.tar.xz.sig new file mode 100644 index 0000000..881fc3f --- /dev/null +++ b/ksystemlog-20.04.2.tar.xz.sig @@ -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----- diff --git a/ksystemlog.changes b/ksystemlog.changes index 79bf31c..2d5ec4d 100644 --- a/ksystemlog.changes +++ b/ksystemlog.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jun 9 12:15:47 UTC 2020 - Christophe Giboudeaux + +- 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 diff --git a/ksystemlog.spec b/ksystemlog.spec index 197dcde..52cc61e 100644 --- a/ksystemlog.spec +++ b/ksystemlog.spec @@ -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