[rpms/amarok] epel10: pull in upstream fixes, fix build with gcc6 (kde#363054)

[rpms/amarok] epel10: pull in upstream fixes, fix build with gcc6 (kde#363054)

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : 4efcb8d58b7bc8c9602ce19cf0ca78a6d2a9e734
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2016-06-01T13:57:17-05:00
Stats  : +368/-35 in 11 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/4efcb8d58b7bc8c9602ce19cf0ca78a6d2a9e734?branch=epel10

Log:
pull in upstream fixes, fix build with gcc6 (kde#363054)

---
diff --git a/0003-Fix-TagLib-version-check.patch b/0003-Fix-TagLib-version-check.patch
index 10c4a90..550e842 100644
--- a/0003-Fix-TagLib-version-check.patch
+++ b/0003-Fix-TagLib-version-check.patch
@@ -1,7 +1,7 @@
 From fec8817c530ce42b6485fdabff6051784b8d9904 Mon Sep 17 00:00:00 2001
 From: Omar Plummer <omarplummer@imergetechnologies.com>
 Date: Fri, 7 Aug 2015 00:24:27 +0200
-Subject: [PATCH 3/6] Fix TagLib version check.
+Subject: [PATCH 03/16] Fix TagLib version check.
 
 The version check compared version strings lexicographically, so "1.7"
 (the min version) compared as greater than "1.10.0".
@@ -39,5 +39,5 @@ index 76b83ac..f485a42 100644
  
  else(TAGLIBCONFIG_EXECUTABLE)
 -- 
-2.5.0
+2.7.4
 

diff --git a/0009-fix-apparent-obvious-error-typo-in-find_library-MYSQ.patch b/0009-fix-apparent-obvious-error-typo-in-find_library-MYSQ.patch
new file mode 100644
index 0000000..f63815d
--- /dev/null
+++ b/0009-fix-apparent-obvious-error-typo-in-find_library-MYSQ.patch
@@ -0,0 +1,42 @@
+From 745b2e18c5b58cfabcbf6e7863572122d673692e Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Fri, 11 Dec 2015 07:12:09 -0600
+Subject: [PATCH 09/16] fix apparent/obvious error (typo?) in
+ find_library(MYSQL_LIBRARIES...
+
+---
+ cmake/modules/FindMySQLAmarok.cmake | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake
+index dffce31..275005c 100644
+--- a/cmake/modules/FindMySQLAmarok.cmake
++++ b/cmake/modules/FindMySQLAmarok.cmake
+@@ -63,15 +63,15 @@ else(MYSQLCONFIG_EXECUTABLE)
+       PATHS
+         ~/usr/lib/mysql
+         /opt/mysql/mysql/lib 
+-        usr/mysql/lib/mysql
+-        opt/local/lib/mysql5/mysql
+-        opt/mysqle/lib/mysql
+-        usr/lib/mysql
+-        usr/lib64/mysql
+-        usr/lib64
+-        usr/local/lib/mysql
+-        opt/local/lib/mysql
+-        opt/ports/lib/mysql5/mysql
++        /usr/mysql/lib/mysql
++        /opt/local/lib/mysql5/mysql
++        /opt/mysqle/lib/mysql
++        /usr/lib/mysql
++        /usr/lib64/mysql
++        /usr/lib64
++        /usr/local/lib/mysql
++        /opt/local/lib/mysql
++        /opt/ports/lib/mysql5/mysql
+     )
+ 
+     find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld_pic mysqld libmysqld
+-- 
+2.7.4
+

diff --git a/0010-Fix-tabs-applet.patch b/0010-Fix-tabs-applet.patch
new file mode 100644
index 0000000..d54e30d
--- /dev/null
+++ b/0010-Fix-tabs-applet.patch
@@ -0,0 +1,28 @@
+From e017e7c501d4966d92653e4845a4f5c348547b82 Mon Sep 17 00:00:00 2001
+From: Myriam Schweingruber <myriam@kde.org>
+Date: Sun, 24 Jan 2016 13:58:24 +0100
+Subject: [PATCH 10/16] Fix tabs applet Change to https to allow fetching
+ guitar tabs again
+
+BUG: 358408
+FIXED-IN: 2.9
+---
+ src/context/engines/tabs/TabsEngine.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/context/engines/tabs/TabsEngine.cpp b/src/context/engines/tabs/TabsEngine.cpp
+index 24a89df..9a6f047 100644
+--- a/src/context/engines/tabs/TabsEngine.cpp
++++ b/src/context/engines/tabs/TabsEngine.cpp
+@@ -244,7 +244,7 @@ TabsEngine::queryUltimateGuitar( const QString &artist, const QString &title )
+ {
+     // Query UltimateGuitar.com (filtering guitar (tabs + chords) and bass tabs)
+     KUrl ultimateGuitarUrl;
+-    ultimateGuitarUrl.setScheme( "http" );
++    ultimateGuitarUrl.setScheme( "https";
+     ultimateGuitarUrl.setHost( "www.ultimate-guitar.com" );
+     ultimateGuitarUrl.setPath( "/search.php" );
+     ultimateGuitarUrl.addQueryItem( "view_state", "advanced" );
+-- 
+2.7.4
+

diff --git a/0012-tabs-applet-Add-missing-to-fix-the-build.patch b/0012-tabs-applet-Add-missing-to-fix-the-build.patch
new file mode 100644
index 0000000..c9ecd3b
--- /dev/null
+++ b/0012-tabs-applet-Add-missing-to-fix-the-build.patch
@@ -0,0 +1,25 @@
+From f6ec3098cde95eeb5fe4bb965cebd4e773b12840 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 26 Jan 2016 15:05:06 +0100
+Subject: [PATCH 12/16] [tabs applet] Add missing ')' to fix the build
+
+---
+ src/context/engines/tabs/TabsEngine.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/context/engines/tabs/TabsEngine.cpp b/src/context/engines/tabs/TabsEngine.cpp
+index 9a6f047..6c0504c 100644
+--- a/src/context/engines/tabs/TabsEngine.cpp
++++ b/src/context/engines/tabs/TabsEngine.cpp
+@@ -244,7 +244,7 @@ TabsEngine::queryUltimateGuitar( const QString &artist, const QString &title )
+ {
+     // Query UltimateGuitar.com (filtering guitar (tabs + chords) and bass tabs)
+     KUrl ultimateGuitarUrl;
+-    ultimateGuitarUrl.setScheme( "https";
++    ultimateGuitarUrl.setScheme( "https" );
+     ultimateGuitarUrl.setHost( "www.ultimate-guitar.com" );
+     ultimateGuitarUrl.setPath( "/search.php" );
+     ultimateGuitarUrl.addQueryItem( "view_state", "advanced" );
+-- 
+2.7.4
+

diff --git a/0013-Fix-for-the-infinite-loop-in-case-a-home-burned-or-o.patch b/0013-Fix-for-the-infinite-loop-in-case-a-home-burned-or-o.patch
new file mode 100644
index 0000000..07a446a
--- /dev/null
+++ b/0013-Fix-for-the-infinite-loop-in-case-a-home-burned-or-o.patch
@@ -0,0 +1,131 @@
+From aaff3348862a1999069feff93d9e1e4d995b7225 Mon Sep 17 00:00:00 2001
+From: Stefano Pettini <stefano.pettini@gmail.com>
+Date: Fri, 25 Mar 2016 10:15:18 +0100
+Subject: [PATCH 13/16] Fix for the infinite loop in case a home-burned or old
+ audio CD is inserted
+
+Home-burned or old audio CDs usually don't have CDTEXT, that is what
+was triggering the bug. The bug was releted to poor management of
+track names, that are generated using the pattern "Track%1.wav". The
+audiocd:/ KIO protocol requires that a device is also added to the
+URL, and this was not done everywhere. Lack of device was triggering
+an unexpected/strange behaviour in some KDE function making Amarok
+enter an infinite loop.
+
+REVIEW: 127468
+BUG: 339190
+---
+ .../collections/audiocd/AudioCdCollection.cpp      | 49 ++++++++++++++++------
+ .../collections/audiocd/AudioCdCollection.h        |  7 ++++
+ 2 files changed, 44 insertions(+), 12 deletions(-)
+
+diff --git a/src/core-impl/collections/audiocd/AudioCdCollection.cpp b/src/core-impl/collections/audiocd/AudioCdCollection.cpp
+index 3dfa7c3..3af6e36 100644
+--- a/src/core-impl/collections/audiocd/AudioCdCollection.cpp
++++ b/src/core-impl/collections/audiocd/AudioCdCollection.cpp
+@@ -91,7 +91,9 @@ KUrl
+ AudioCdCollection::audiocdUrl( const QString &path ) const
+ {
+     KUrl url("audiocd:/");
+-    url.addPath( path );
++
++    if( !path.isEmpty() )
++        url.addPath( path );
+ 
+     if( !m_device.isEmpty() )
+         url.addQueryItem( "device", m_device );
+@@ -346,10 +348,32 @@ AudioCdCollection::checkForStartPlayRequest()
+     }
+ }
+ 
++
++QString
++AudioCdCollection::trackBaseFileName( int i ) const
++{
++    return QString( "Track%1" ).arg( i, 2, 10, QChar('0') );
++}
++
++
++QString
++AudioCdCollection::trackWavFileName( int i ) const
++{
++    return trackBaseFileName( i ) + ".wav";
++}
++
++
++QString
++AudioCdCollection::trackDisplayName( int i ) const
++{
++    return i18n( "Track" ) + ' ' + QString::number( i );
++}
++
++
+ qint64
+-AudioCdCollection::trackLength(int i) const
++AudioCdCollection::trackLength( int i ) const
+ {
+-    KUrl kioUrl = audiocdUrl( QString("Track%1.wav").arg(i, 2, 10, QChar('0') ) );
++    KUrl kioUrl = audiocdUrl( trackWavFileName( i ) );
+     KIO::UDSEntry uds;
+     if ( KIO::NetAccess::stat(kioUrl, uds, NULL) )
+     {
+@@ -480,19 +504,21 @@ AudioCdCollection::noInfoAvailable()
+ 
+ 
+     int i = 1;
+-    QString prefix( "0" );
+-    QString trackName = "Track " + prefix + QString::number( i );
++    QString trackWav = trackWavFileName( i );
+ 
+-    while( KIO::NetAccess::exists( QString( "audiocd:/" + trackName + ".wav" ), KIO::NetAccess::SourceSide, 0 ) )
++    // This will find also data tracks on mixed CDs:
++    // a better way to discover the available audio tracks should be found
++    while( KIO::NetAccess::exists( audiocdUrl( trackWav ), KIO::NetAccess::SourceSide, 0 ) )
+     {
+-        debug() << "got track: " << "audiocd:/" + trackName + ".wav";
++        debug() << "got track url: " << audiocdUrl( trackWav );
+ 
+-        QString baseUrl = "audiocd:/" + m_discCddbId + '/' + QString::number( i );
++        //we hack the url so the engine controller knows what track on the CD to play..
++        KUrl baseUrl = audiocdUrl( m_discCddbId + '/' + QString::number( i ) );
+ 
+-        Meta::AudioCdTrackPtr trackPtr = Meta::AudioCdTrackPtr( new Meta::AudioCdTrack( this, trackName, baseUrl ) );
++        Meta::AudioCdTrackPtr trackPtr = Meta::AudioCdTrackPtr( new Meta::AudioCdTrack( this, trackDisplayName( i ), baseUrl ) );
+ 
+         trackPtr->setTrackNumber( i );
+-        trackPtr->setFileNameBase( trackName );
++        trackPtr->setFileNameBase( trackBaseFileName( i ) );
+         trackPtr->setLength( trackLength( i ) );
+ 
+         memoryCollection()->addTrack( Meta::TrackPtr::staticCast( trackPtr ) );
+@@ -513,8 +539,7 @@ AudioCdCollection::noInfoAvailable()
+         trackPtr->setYear( yearPtr );
+ 
+         i++;
+-        prefix = i < 10 ? "0" : "";
+-        trackName = "Track " + prefix + QString::number( i );
++        trackWav = trackWavFileName( i );
+     }
+ 
+     updateProxyTracks();
+diff --git a/src/core-impl/collections/audiocd/AudioCdCollection.h b/src/core-impl/collections/audiocd/AudioCdCollection.h
+index dc2cad7..e829368 100644
+--- a/src/core-impl/collections/audiocd/AudioCdCollection.h
++++ b/src/core-impl/collections/audiocd/AudioCdCollection.h
+@@ -103,6 +103,13 @@ private:
+ 
+     // Helper function to build the audiocd url.
+     KUrl audiocdUrl( const QString &path = "" ) const;
++    // The file name of the track without extension
++    QString trackBaseFileName( int i ) const;
++    // The file name of the track in .wav format
++    QString trackWavFileName( int i ) const;
++    // The name of the track that should be displayed
++    QString trackDisplayName( int i ) const;
++    // The length of the track in milliseconds
+     qint64 trackLength( int i ) const;
+ 
+     /**
+-- 
+2.7.4
+

diff --git a/0014-Only-link-with-MYSQL_EMBEDDED_LIBRARIES-if-WITH_MYSQ.patch b/0014-Only-link-with-MYSQL_EMBEDDED_LIBRARIES-if-WITH_MYSQ.patch
new file mode 100644
index 0000000..b2e3921
--- /dev/null
+++ b/0014-Only-link-with-MYSQL_EMBEDDED_LIBRARIES-if-WITH_MYSQ.patch
@@ -0,0 +1,34 @@
+From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <kde@mattwhitlock.name>
+Date: Tue, 29 Mar 2016 12:22:41 -0400
+Subject: [PATCH 14/16] Only link with MYSQL_EMBEDDED_LIBRARIES if
+ WITH_MYSQL_EMBEDDED
+
+REVIEW: 127523
+---
+ src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+index 244cde1..4c618fc 100644
+--- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
++++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+@@ -21,11 +21,14 @@ target_link_libraries(amarok_collection-mysqlcollection
+     ${KDE4_KDECORE_LIBS}
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+-    ${MYSQL_EMBEDDED_LIBRARIES}
+     ${CMAKE_DL_LIBS}
+     ${ZLIB_LIBRARIES}
+ )
+ 
++if(WITH_MYSQL_EMBEDDED)
++    target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} )
++endif(WITH_MYSQL_EMBEDDED)
++
+ if(NOT WIN32 AND NOT APPLE)
+     target_link_libraries( amarok_collection-mysqlcollection crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)
+-- 
+2.7.4
+

diff --git a/0015-Fix-a-crash-in-amarok-when-opening-the-Script-Consol.patch b/0015-Fix-a-crash-in-amarok-when-opening-the-Script-Consol.patch
new file mode 100644
index 0000000..fe84565
--- /dev/null
+++ b/0015-Fix-a-crash-in-amarok-when-opening-the-Script-Consol.patch
@@ -0,0 +1,33 @@
+From 2900fe47adde10999a6c0f907d73b00a1c1bd5b1 Mon Sep 17 00:00:00 2001
+From: Myriam Schweingruber <myriam@kde.org>
+Date: Wed, 18 May 2016 21:59:17 +0200
+Subject: [PATCH 15/16] Fix a crash in amarok when opening the Script Console
+
+The script console tries to write to a system folder instead of a user
+ folder. Note to devs: always make sure to test a system installation,
+ not just a local build.
+
+Thanks to Johannes Huber for the quick fix suggestion.
+
+BUG: 363176
+FIXED-IN: 2.9
+---
+ src/scripting/scriptconsole/ScriptConsole.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/scripting/scriptconsole/ScriptConsole.cpp b/src/scripting/scriptconsole/ScriptConsole.cpp
+index 6edd9a2..e4e0fab 100644
+--- a/src/scripting/scriptconsole/ScriptConsole.cpp
++++ b/src/scripting/scriptconsole/ScriptConsole.cpp
+@@ -161,7 +161,7 @@ ScriptConsole::ScriptConsole( QWidget *parent )
+     settings.endGroup();
+ 
+     if( m_savePath.isEmpty() )
+-        m_savePath = KUrl( KStandardDirs::locate( "data", "amarok/scriptconsole/" ) ).path();
++        m_savePath = KUrl( KStandardDirs::locateLocal( "data", "amarok/scriptconsole/" ) ).path();
+ 
+     slotNewScript();
+     connect( m_debugger, SIGNAL(evaluationSuspended()), SLOT(slotEvaluationSuspended()) );
+-- 
+2.7.4
+

diff --git a/0016-Fix-untranslatable-string.patch b/0016-Fix-untranslatable-string.patch
new file mode 100644
index 0000000..66abc58
--- /dev/null
+++ b/0016-Fix-untranslatable-string.patch
@@ -0,0 +1,31 @@
+From a5df287bb855e3cc3555dbc9d5c971021482dac5 Mon Sep 17 00:00:00 2001
+From: Myriam Schweingruber <myriam@kde.org>
+Date: Mon, 30 May 2016 11:25:33 +0200
+Subject: [PATCH 16/16] Fix untranslatable string
+
+Fix untranslatable string in Organize Collection Dialog
+
+BUG: 331443
+FIXED-IN: 2.9
+---
+ src/dialogs/OrganizeCollectionDialog.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/dialogs/OrganizeCollectionDialog.cpp b/src/dialogs/OrganizeCollectionDialog.cpp
+index 1c14710..973e9cb 100644
+--- a/src/dialogs/OrganizeCollectionDialog.cpp
++++ b/src/dialogs/OrganizeCollectionDialog.cpp
+@@ -108,8 +108,8 @@ OrganizeCollectionWidget::buildFormatTip() const
+ {
+     QMap<QString, QString> args;
+     args["albumartist"] = i18n( "%1 or %2", QLatin1String("Album Artist, The") , QLatin1String("The Album Artist") );
+-    args["thealbumartist"] = "The Album Artist";
+-    args["theartist"] = "The Artist";
++    args["thealbumartist"] = i18n( "The Album Artist" );
++    args["theartist"] = i18n( "The Artist" );
+     args["artist"] = i18n( "%1 or %2", QLatin1String("Artist, The") , QLatin1String("The Artist") );
+     args["initial"] = i18n( "Artist's Initial" );
+     args["filetype"] = i18n( "File Extension of Source" );
+-- 
+2.7.4
+

diff --git a/amarok-2.8.90-find_mysql.patch b/amarok-2.8.90-find_mysql.patch
deleted file mode 100644
index 816b551..0000000
--- a/amarok-2.8.90-find_mysql.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up amarok-2.8.90/cmake/modules/FindMySQLAmarok.cmake.mysql amarok-2.8.90/cmake/modules/FindMySQLAmarok.cmake
---- amarok-2.8.90/cmake/modules/FindMySQLAmarok.cmake.mysql	2015-06-11 00:24:42.000000000 -0500
-+++ amarok-2.8.90/cmake/modules/FindMySQLAmarok.cmake	2015-12-10 12:06:39.235741796 -0600
-@@ -63,15 +63,15 @@ else(MYSQLCONFIG_EXECUTABLE)
-       PATHS
-         ~/usr/lib/mysql
-         /opt/mysql/mysql/lib 
--        usr/mysql/lib/mysql
--        opt/local/lib/mysql5/mysql
--        opt/mysqle/lib/mysql
--        usr/lib/mysql
--        usr/lib64/mysql
--        usr/lib64
--        usr/local/lib/mysql
--        opt/local/lib/mysql
--        opt/ports/lib/mysql5/mysql
-+        /usr/mysql/lib/mysql
-+        /opt/local/lib/mysql5/mysql
-+        /opt/mysqle/lib/mysql
-+        /usr/lib/mysql
-+        /usr/lib64/mysql
-+        /usr/lib64
-+        /usr/local/lib/mysql
-+        /opt/local/lib/mysql
-+        /opt/ports/lib/mysql5/mysql
-     )
- 
-     find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld_pic mysqld libmysqld

diff --git a/amarok-2.8.90-gcc6.patch b/amarok-2.8.90-gcc6.patch
new file mode 100644
index 0000000..d795a19
--- /dev/null
+++ b/amarok-2.8.90-gcc6.patch
@@ -0,0 +1,20 @@
+diff -up amarok-2.8.90/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp.gcc6 amarok-2.8.90/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
+--- amarok-2.8.90/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp.gcc6	2016-06-01 13:46:19.544354657 -0500
++++ amarok-2.8.90/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp	2016-06-01 13:44:35.437043666 -0500
+@@ -28,6 +28,7 @@
+ #include "playlist/PlaylistModelStack.h"
+ 
+ using namespace Playlists;
++using namespace Playlist;
+ 
+ XSPFPlaylist::XSPFPlaylist( const KUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad )
+     : PlaylistFile( url, provider )
+@@ -101,7 +102,7 @@ XSPFPlaylist::load()
+     //FIXME: this needs to be moved to whatever is creating the XSPFPlaylist
+     if( m_autoAppendAfterLoad )
+         The::playlistController()->insertPlaylist(
+-                    ::Playlist::ModelStack::instance()->bottom()->rowCount(),
++                    ModelStack::instance()->bottom()->rowCount(),
+                     Playlists::PlaylistPtr( this )
+                 );
+ }

diff --git a/amarok.spec b/amarok.spec
index dfc5d60..f1efb66 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -8,7 +8,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.8.90
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -31,11 +31,18 @@ Patch1: amarok-2.8.0-no_kdewebkit.patch
 ## upstreamable patches
 # make mysql_found non-fatal
 Patch100: amarok-2.8.90-mysql_found.patch
-# fix detection of mysql_libraries in non-mysqlconfig case
-Patch101: amarok-2.8.90-find_mysql.patch
+# fix build using gcc6, https://bugs.kde.org/show_bug.cgi?id=363054
+Patch101: amarok-2.8.90-gcc6.patch
 
 ## upstream patches
 Patch3: 0003-Fix-TagLib-version-check.patch
+Patch9: 0009-fix-apparent-obvious-error-typo-in-find_library-MYSQ.patch
+Patch10: 0010-Fix-tabs-applet.patch
+Patch12: 0012-tabs-applet-Add-missing-to-fix-the-build.patch
+Patch13: 0013-Fix-for-the-infinite-loop-in-case-a-home-burned-or-o.patch
+Patch14: 0014-Only-link-with-MYSQL_EMBEDDED_LIBRARIES-if-WITH_MYSQ.patch
+Patch15: 0015-Fix-a-crash-in-amarok-when-opening-the-Script-Consol.patch
+Patch16: 0016-Fix-untranslatable-string.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -143,11 +150,18 @@ Requires: %{name} = %{version}-%{release}
 %endif
 
 ## upstream
-%patch3 -p1 -b .taglib_version_check
+%patch3 -p1 -b .0003
+%patch9 -p1 -b .0009
+%patch10 -p1 -b .0010
+%patch12 -p1 -b .0012
+%patch13 -p1 -b .0013
+%patch14 -p1 -b .0014
+%patch15 -p1 -b .0015
+%patch16 -p1 -b .0016
 
 ## upstreamable
 #patch100 -p1 -b .mysql_found
-%patch101 -p1 -b .find_mysql
+%patch101 -p1 -b .gcc6
 
 
 %build
@@ -315,6 +329,9 @@ fi
 
 
 %changelog
+* Wed Jun 01 2016 Rex Dieter <rdieter@fedoraproject.org> - 2.8.90-6
+- pull in upstream fixes, fix build with gcc6 (kde#363054)
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.90-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild