Accepting request 513797 from home:wolfi323:branches:KDE:Applications

- Add Add-forceCheck-for-ManualCheckSystem.patch to make the manual system check work again after the previous fix

OBS-URL: https://build.opensuse.org/request/show/513797
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=31

Add-forceCheck-for-ManualCheckSystem.patch

@@ -0,0 +1,61 @@
+From 762fc98addfc5a83e80aa1c7d83384a512c48f33 Mon Sep 17 00:00:00 2001
+From: Leslie Zhai <lesliezhai@llvm.org.cn>
+Date: Wed, 2 Aug 2017 14:44:29 +0800
+Subject: Add forceCheck for ManualCheckSystem.
+
+CCBUG: 381368
+---
+ src/k3b.cpp                    | 2 +-
+ src/k3bsystemproblemdialog.cpp | 4 ++--
+ src/k3bsystemproblemdialog.h   | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/k3b.cpp b/src/k3b.cpp
+index c3c21d4..96d3501 100644
+--- a/src/k3b.cpp
++++ b/src/k3b.cpp
+@@ -1422,7 +1422,7 @@ void K3b::MainWindow::slotCheckSystem()
+ 
+ void K3b::MainWindow::slotManualCheckSystem()
+ {
+-    K3b::SystemProblemDialog::checkSystem( this, K3b::SystemProblemDialog::AlwaysNotify );
++    K3b::SystemProblemDialog::checkSystem(this, K3b::SystemProblemDialog::AlwaysNotify, true/* forceCheck */);
+ }
+ 
+ 
+diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
+index 0d0f363..34cf710 100644
+--- a/src/k3bsystemproblemdialog.cpp
++++ b/src/k3bsystemproblemdialog.cpp
+@@ -169,13 +169,13 @@ void K3b::SystemProblemDialog::done(int r)
+ }
+ 
+ 
+-void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel level )
++void K3b::SystemProblemDialog::checkSystem(QWidget* parent, NotificationLevel level, bool forceCheck)
+ {
+     QList<K3b::SystemProblem> problems;
+     bool showDeviceSettingsButton = false;
+     bool showBinSettingsButton = false;
+ 
+-    if (!readCheckSystemConfig())
++    if (!forceCheck && !readCheckSystemConfig())
+         return;
+ 
+     if( k3bcore->deviceManager()->allDevices().isEmpty() ) {
+diff --git a/src/k3bsystemproblemdialog.h b/src/k3bsystemproblemdialog.h
+index b406b25..573b557 100644
+--- a/src/k3bsystemproblemdialog.h
++++ b/src/k3bsystemproblemdialog.h
+@@ -78,7 +78,7 @@ namespace K3b {
+          * or K3b is started for the first time.
+          */
+         static bool readCheckSystemConfig();
+-        static void checkSystem( QWidget* parent = 0, NotificationLevel level = NotifyOnlyErrors );
++        static void checkSystem(QWidget* parent = 0, NotificationLevel level = NotifyOnlyErrors, bool forceCheck = false);
+ 
+     protected:
+         void done(int) Q_DECL_OVERRIDE;
+-- 
+cgit v0.11.2
+

k3b.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug  2 07:13:07 UTC 2017 - wbauer@tmo.at
+
+- Add Add-forceCheck-for-ManualCheckSystem.patch to make the manual
+  system check work again after the previous fix
+
 -------------------------------------------------------------------
 Tue Aug  1 11:45:24 UTC 2017 - wbauer@tmo.at
 

k3b.spec

@@ -38,6 +38,8 @@ Patch1:         Don-t-suggest-to-install-libburn.patch
 Patch2:         Fix-do-not-show-again.patch
 # PATCH-FIX-UPSTREAM
 Patch3:         Add-readCheckSystemConfig.patch
+# PATCH-FIX-UPSTREAM
+Patch4:         Add-forceCheck-for-ManualCheckSystem.patch
 
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
@@ -128,6 +130,7 @@ This package contain files needed for development with k3b.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 CXXFLAGS="%{optflags} -fno-strict-aliasing"