From 589b04a652719a5997b751d6fee314671a2fd9a6 Mon Sep 17 00:00:00 2001
From: Bernhard M. Wiedemann <bwiedemann@suse.de>
Date: Sep 30 2019 14:05:56 +0000
Subject: update 2019-09-30 14:05


---

diff --git a/.files b/.files
index 473a8ab..7ebc414 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 26d4f1d..4863c5a 100644
--- a/.rev
+++ b/.rev
@@ -993,4 +993,12 @@ https://git.reviewboard.kde.org/r/104878/ (forwarded request 116659 from StefanB
     <comment>Use a Qt5 snapshot for amarok (New try)</comment>
     <requestid>725141</requestid>
   </revision>
+  <revision rev="117" vrev="1">
+    <srcmd5>6570cbf28468a2978ae66c516d7fb046</srcmd5>
+    <version>2.9.70git.20190920T110913~b986f52d1d</version>
+    <time>1569851559</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>732143</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index 9732a08..0c79e1c 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-f47de471be9c6e294f8dcc88855f87a4
+58244e3bbd8f8ed5cdf2f768fb5d4a1b
diff --git a/0001-Fix-a-crash-when-running-amarok-l-path-to-file.patch b/0001-Fix-a-crash-when-running-amarok-l-path-to-file.patch
deleted file mode 100644
index 3f96e6c..0000000
--- a/0001-Fix-a-crash-when-running-amarok-l-path-to-file.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6875f9656ef3f0abb3f076cf264cf7a2cc9c61eb Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Wed, 21 Aug 2019 20:36:15 +0200
-Subject: [PATCH] Fix a crash when running 'amarok -l /path/to/file'
-
-Summary: BUG: 410870
-
-Test Plan:
-amarok -l <somefile>
-
-Before: Assert "you need to call AmarokConfig::instance before using"
-
-After: the file is queued and played.
-
-Subscribers: #amarok, amarok-devel
-
-Differential Revision: https://phabricator.kde.org/D23326
----
- src/App.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/App.cpp b/src/App.cpp
-index 3ac7fe7de1..ec5a729d5f 100644
---- a/src/App.cpp
-+++ b/src/App.cpp
-@@ -443,14 +443,13 @@ App::continueInit()
- 
-     PERF_LOG( "Begin App::continueInit" )
- 
-+    AmarokConfig::instance( "amarokrc" );
-     newInstance();
- 
-     const bool restoreSession = m_args->positionalArguments().isEmpty() || m_args->isSet( "append" )
-                                 || m_args->isSet( "queue" )
-                                 || Amarok::config().readEntry( "AppendAsDefault", false );
- 
--    AmarokConfig::instance( "amarokrc" );
--
- #ifdef DEBUG_BUILD_TYPE
-     new DebugLogger( this );
- #endif // DEBUG_BUILD_TYPE
--- 
-2.23.0
-
diff --git a/_servicedata b/_servicedata
index f6af45e..f486b23 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
                   <param name="url">git://anongit.kde.org/amarok</param>
-                <param name="changesrevision">600806141d6c1c22fdd28fe8d8e26837d5d71adc</param>
+                <param name="changesrevision">b986f52d1d53b675a0d21a7507941e368acd3a14</param>
   </service>
 </servicedata>
\ No newline at end of file
diff --git a/amarok-2.9.70git.20190820T023444~600806141d.tar.xz b/amarok-2.9.70git.20190820T023444~600806141d.tar.xz
deleted file mode 120000
index c953a77..0000000
--- a/amarok-2.9.70git.20190820T023444~600806141d.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeifle756xg2uxllx24uccc7ssa4v7zoivmvwqzm2u6qewujti3rrc4
\ No newline at end of file
diff --git a/amarok-2.9.70git.20190920T110913~b986f52d1d.tar.xz b/amarok-2.9.70git.20190920T110913~b986f52d1d.tar.xz
new file mode 120000
index 0000000..af679ed
--- /dev/null
+++ b/amarok-2.9.70git.20190920T110913~b986f52d1d.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeigczeobjo74lyj66ftvrekxcmdu7uq2cncnuks5kxpsya2wsex4na
\ No newline at end of file
diff --git a/amarok.changes b/amarok.changes
index 62e24b0..2ec2788 100644
--- a/amarok.changes
+++ b/amarok.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Fri Sep 20 10:23:20 UTC 2019 - Wolfgang Bauer <wbauer@tmo.at>
+
+- Update to version 2.9.70git.20190920T110913~b986f52d1d:
+  * Don't delete whole folder when deleting a track (kde#411760)
+  * [TagDialog] Really enable "Open in filemanager" button for local files
+  * Fix a crash when running 'amarok -l /path/to/file' (kde#410870)
+- Drop 0001-Fix-a-crash-when-running-amarok-l-path-to-file.patch,
+  merged upstream
+
+-------------------------------------------------------------------
 Wed Aug 21 19:30:40 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
 
 - Add 0001-Fix-a-crash-when-running-amarok-l-path-to-file.patch (kde#410870)
diff --git a/amarok.spec b/amarok.spec
index 3e7ffee..85069cc 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -17,7 +17,7 @@
 
 
 Name:           amarok
-Version:        2.9.70git.20190820T023444~600806141d
+Version:        2.9.70git.20190920T110913~b986f52d1d
 Release:        0
 Summary:        Media Player
 License:        GPL-2.0-or-later
@@ -33,8 +33,6 @@ Patch1:         flac_mimetype_bnc671581.diff
 Patch2:         disable-web-plugins-by-default.patch
 # PATCH-FIX-OPENSUSE
 Patch3:         0001-Work-around-QTBUG-75797-for-openQA.patch
-# PATCH-FIX-UPSTREAM
-Patch4:         0001-Fix-a-crash-when-running-amarok-l-path-to-file.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  fftw-devel