From b86035033099455af60771681684bbc354a84a03b7762ea5ad4d0de58fca2ae8 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sun, 6 Aug 2017 07:52:51 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/k3b?expand=0&rev=35

---
 Add-readCheckSystemConfig.patch |  7 ++---
 Fix-do-not-show-again.patch     | 53 ---------------------------------
 k3b.changes                     |  1 +
 k3b.spec                        |  3 --
 4 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 100644 Fix-do-not-show-again.patch

diff --git a/Add-readCheckSystemConfig.patch b/Add-readCheckSystemConfig.patch
index 0805e81..bbd9969 100644
--- a/Add-readCheckSystemConfig.patch
+++ b/Add-readCheckSystemConfig.patch
@@ -12,7 +12,7 @@ BUG: 381368
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
-index d04a0bd..0d0f363 100644
+index 9897903..bbe40bd 100644
 --- a/src/k3bsystemproblemdialog.cpp
 +++ b/src/k3bsystemproblemdialog.cpp
 @@ -175,6 +175,9 @@ void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel l
@@ -25,7 +25,7 @@ index d04a0bd..0d0f363 100644
      if( k3bcore->deviceManager()->allDevices().isEmpty() ) {
          problems.append( K3b::SystemProblem( K3b::SystemProblem::CRITICAL,
                                             i18n("No optical drive found."),
-@@ -711,13 +714,13 @@ QList<K3b::Device::Device*> K3b::SystemProblemDialog::checkForAutomounting()
+@@ -705,13 +708,13 @@ QList<K3b::Device::Device*> K3b::SystemProblemDialog::checkForAutomounting()
  
  bool K3b::SystemProblemDialog::readCheckSystemConfig()
  {
@@ -44,6 +44,3 @@ index d04a0bd..0d0f363 100644
  }
  
  
--- 
-cgit v0.11.2
-
diff --git a/Fix-do-not-show-again.patch b/Fix-do-not-show-again.patch
deleted file mode 100644
index 03faee2..0000000
--- a/Fix-do-not-show-again.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c1fae2adc90fac9a2af11ec9ef95ecc12033fa41 Mon Sep 17 00:00:00 2001
-From: Leslie Zhai <lesliezhai@llvm.org.cn>
-Date: Mon, 19 Jun 2017 16:42:41 +0800
-Subject: Fix "do not show again" from system configuration problems dialog is
- not remembered
-
-BUG: 381368
-REVIEW: 130162
----
- src/k3bsystemproblemdialog.cpp | 11 +++++------
- src/k3bsystemproblemdialog.h   |  2 +-
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
-index 9dfc50c..126ad31 100644
---- a/src/k3bsystemproblemdialog.cpp
-+++ b/src/k3bsystemproblemdialog.cpp
-@@ -159,14 +159,13 @@ K3b::SystemProblemDialog::SystemProblemDialog( const QList<K3b::SystemProblem>&
- }
- 
- 
--void K3b::SystemProblemDialog::closeEvent( QCloseEvent* e )
-+void K3b::SystemProblemDialog::done(int r)
- {
--    if( m_checkDontShowAgain->isChecked() ) {
--        KConfigGroup grp( KSharedConfig::openConfig(), "General Options" );
--        grp.writeEntry( "check system config", false );
-+    if (m_checkDontShowAgain->isChecked()) {
-+        KConfigGroup grp(KSharedConfig::openConfig(), "General Options");
-+        grp.writeEntry("check system config", false);
-     }
--
--    e->accept();
-+    QDialog::done(r);
- }
- 
- 
-diff --git a/src/k3bsystemproblemdialog.h b/src/k3bsystemproblemdialog.h
-index b45f2f8..b406b25 100644
---- a/src/k3bsystemproblemdialog.h
-+++ b/src/k3bsystemproblemdialog.h
-@@ -81,7 +81,7 @@ namespace K3b {
-         static void checkSystem( QWidget* parent = 0, NotificationLevel level = NotifyOnlyErrors );
- 
-     protected:
--        void closeEvent( QCloseEvent* );
-+        void done(int) Q_DECL_OVERRIDE;
- 
-     private Q_SLOTS:
-         void slotShowDeviceSettings();
--- 
-cgit v0.11.2
-
diff --git a/k3b.changes b/k3b.changes
index 760d40b..f1734cc 100644
--- a/k3b.changes
+++ b/k3b.changes
@@ -5,6 +5,7 @@ Sat Aug  5 18:16:53 UTC 2017 - christophe@krop.fr
   * KDE Applications 17.07.90
   * https://www.kde.org/announcements/announce-applications-17.07.90.php
 - Drop Re-enable-transcode-support.patch (merged upstream)
+- Drop Fix-do-not-show-again.patch (merged upstream)
 
 -------------------------------------------------------------------
 Wed Aug  2 07:13:07 UTC 2017 - wbauer@tmo.at
diff --git a/k3b.spec b/k3b.spec
index fffec90..9976a02 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -33,8 +33,6 @@ Source:         %{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE
 Patch1:         Don-t-suggest-to-install-libburn.patch
 # PATCH-FIX-UPSTREAM
-Patch2:         Fix-do-not-show-again.patch
-# PATCH-FIX-UPSTREAM
 Patch3:         Add-readCheckSystemConfig.patch
 # PATCH-FIX-UPSTREAM
 Patch4:         Add-forceCheck-for-ManualCheckSystem.patch
@@ -125,7 +123,6 @@ This package contain files needed for development with k3b.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1