[rpms/amarok] epel10.2: pull in upstream fixes

[rpms/amarok] epel10.2: pull in upstream fixes

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 67e69015fbae5bc8445e429f663e8188e9f45775
Author : Rex Dieter <rdieter@math.unl.edu>
Date   : 2016-08-07T12:19:49-05:00
Stats  : +390/-25 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/67e69015fbae5bc8445e429f663e8188e9f45775?branch=epel10.2

Log:
pull in upstream fixes

---
diff --git a/0017-gcc6-buildfix.patch b/0017-gcc6-buildfix.patch
new file mode 100644
index 0000000..b6f0abc
--- /dev/null
+++ b/0017-gcc6-buildfix.patch
@@ -0,0 +1,36 @@
+From 9308403e1c8484052f277bf6de32ee07c93a4beb Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Wed, 1 Jun 2016 13:58:26 -0500
+Subject: [PATCH 17/26] gcc6 buildfix
+
+courtesy of opensuse, thx
+
+BUG: 363054
+---
+ src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
+index 4bdb9b9..e327354 100644
+--- a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
++++ b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
+@@ -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 )
+                 );
+ }
+-- 
+2.7.4
+

diff --git a/0019-Disable-non-SSL-connections-in-wikipedia-applet.patch b/0019-Disable-non-SSL-connections-in-wikipedia-applet.patch
new file mode 100644
index 0000000..84f040d
--- /dev/null
+++ b/0019-Disable-non-SSL-connections-in-wikipedia-applet.patch
@@ -0,0 +1,170 @@
+From 8c15258b28870b6d9990b24f87ce913e2049bac8 Mon Sep 17 00:00:00 2001
+From: Olivier CHURLAUD <olivier@churlaud.com>
+Date: Tue, 21 Jun 2016 00:06:33 +0200
+Subject: [PATCH 19/26] Disable non SSL connections in wikipedia applet.
+
+REVIEW: 128248
+BUG: 348313
+---
+ ChangeLog                                              |  3 ++-
+ src/context/applets/wikipedia/WikipediaApplet.cpp      |  7 +------
+ src/context/applets/wikipedia/WikipediaApplet_p.h      |  1 -
+ .../applets/wikipedia/wikipediaGeneralSettings.ui      |  7 -------
+ src/context/engines/wikipedia/WikipediaEngine.cpp      | 18 +++---------------
+ 5 files changed, 6 insertions(+), 30 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 2cce0f4..d508c6d 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -70,7 +70,8 @@ VERSION 2.8.90
+    * Check for QtBindings at runtime instead. Disable scripts and display error message
+      if missing. (BR 325006)
+    * Print playlist download errors to the debug log. (BR 325120)
+-
++   * Wikipedia Applet only connect with SSL, so that redirects are handled
++     correctly. (BR 349313)
+ 
+ VERSION 2.8
+   FEATURES:
+diff --git a/src/context/applets/wikipedia/WikipediaApplet.cpp b/src/context/applets/wikipedia/WikipediaApplet.cpp
+index 2ceb2b0..7f1c732 100644
+--- a/src/context/applets/wikipedia/WikipediaApplet.cpp
++++ b/src/context/applets/wikipedia/WikipediaApplet.cpp
+@@ -250,14 +250,11 @@ WikipediaAppletPrivate::_loadSettings()
+     }
+     langList = list;
+     useMobileWikipedia = (generalSettingsUi.mobileCheckBox->checkState() == Qt::Checked);
+-    useSSL = (generalSettingsUi.sslCheckBox->checkState() == Qt::Checked);
+     Amarok::config("Wikipedia Applet").writeEntry( "PreferredLang", list );
+     Amarok::config("Wikipedia Applet").writeEntry( "UseMobile", useMobileWikipedia );
+-    Amarok::config( "Wikipedia Applet" ).writeEntry( "UseSSL", useSSL );
+     _paletteChanged( App::instance()->palette() );
+     dataContainer->setData( "lang", langList );
+     dataContainer->setData( "mobile", useMobileWikipedia );
+-    dataContainer->setData( "ssl", useSSL );
+     scheduleEngineUpdate();
+ }
+ 
+@@ -414,7 +411,7 @@ WikipediaAppletPrivate::_getLangMap()
+     languageSettingsUi.progressBar->setValue( 0 );
+ 
+     KUrl url;
+-    url.setScheme( "http" );
++    url.setScheme( "https" );
+     url.setHost( "en.wikipedia.org" );
+     url.setPath( "/w/api.php" );
+     url.addQueryItem( "action", "query" );
+@@ -663,7 +660,6 @@ WikipediaApplet::init()
+     d->_paletteChanged( App::instance()->palette() );
+     d->dataContainer->setData( "lang", d->langList );
+     d->dataContainer->setData( "mobile", d->useMobileWikipedia );
+-    d->dataContainer->setData( "ssl", d->useSSL );
+     d->scheduleEngineUpdate();
+ 
+     updateConstraints();
+@@ -792,7 +788,6 @@ WikipediaApplet::createConfigurationInterface( KConfigDialog *parent )
+     QWidget *genSettings = new QWidget;
+     d->generalSettingsUi.setupUi( genSettings );
+     d->generalSettingsUi.mobileCheckBox->setCheckState( d->useMobileWikipedia ? Qt::Checked : Qt::Unchecked );
+-    d->generalSettingsUi.sslCheckBox->setCheckState( d->useSSL ? Qt::Checked : Qt::Unchecked );
+ 
+     connect( d->languageSettingsUi.downloadButton, SIGNAL(clicked()), this, SLOT(_getLangMap()) );
+     connect( parent, SIGNAL(okClicked()), this, SLOT(_loadSettings()) );
+diff --git a/src/context/applets/wikipedia/WikipediaApplet_p.h b/src/context/applets/wikipedia/WikipediaApplet_p.h
+index df5ddc3..c52a0bf 100644
+--- a/src/context/applets/wikipedia/WikipediaApplet_p.h
++++ b/src/context/applets/wikipedia/WikipediaApplet_p.h
+@@ -143,7 +143,6 @@ public:
+     bool isForwardHistory;
+     bool isBackwardHistory;
+     bool useMobileWikipedia;
+-    bool useSSL;
+ };
+ 
+ class WikipediaSearchLineEdit : public Plasma::LineEdit
+diff --git a/src/context/applets/wikipedia/wikipediaGeneralSettings.ui b/src/context/applets/wikipedia/wikipediaGeneralSettings.ui
+index 84cb5df..b476ff0 100644
+--- a/src/context/applets/wikipedia/wikipediaGeneralSettings.ui
++++ b/src/context/applets/wikipedia/wikipediaGeneralSettings.ui
+@@ -32,13 +32,6 @@
+        </property>
+       </widget>
+      </item>
+-     <item row="1" column="1">
+-      <widget class="QCheckBox" name="sslCheckBox">
+-       <property name="text">
+-        <string>Use &amp;SSL</string>
+-       </property>
+-      </widget>
+-     </item>
+     </layout>
+    </item>
+   </layout>
+diff --git a/src/context/engines/wikipedia/WikipediaEngine.cpp b/src/context/engines/wikipedia/WikipediaEngine.cpp
+index 969d8fc..d23a327 100644
+--- a/src/context/engines/wikipedia/WikipediaEngine.cpp
++++ b/src/context/engines/wikipedia/WikipediaEngine.cpp
+@@ -45,7 +45,6 @@ public:
+         : q_ptr( parent )
+         , currentSelection( Artist )
+         , useMobileVersion( false )
+-        , useSSL( true )
+         , dataContainer( 0 )
+     {}
+     ~WikipediaEnginePrivate() {}
+@@ -89,7 +88,6 @@ public:
+         }
+     } m_previousTrackMetadata;
+     bool useMobileVersion;
+-    bool useSSL;
+ 
+     Plasma::DataContainer *dataContainer;
+ 
+@@ -171,16 +169,6 @@ WikipediaEnginePrivate::_dataContainerUpdated( const QString &source, const Plas
+         }
+     }
+ 
+-    if( data.contains( QLatin1String("ssl") ) )
+-    {
+-        const bool ssl = data.value( QLatin1String("ssl") ).toBool();
+-        if( ssl != useSSL )
+-        {
+-            useSSL = ssl;
+-            updateEngine();
+-        }
+-    }
+-
+     if( data.contains( QLatin1String("lang") ) )
+     {
+         QStringList langList = data.value( QLatin1String("lang") ).toStringList();
+@@ -544,7 +532,7 @@ WikipediaEnginePrivate::fetchWikiUrl( const QString &title, const QString &urlPr
+     Q_Q( WikipediaEngine );
+     KUrl pageUrl;
+     QString host( ".wikipedia.org" );
+-    pageUrl.setScheme( useSSL ? QLatin1String( "https" ) : QLatin1String( "http" ) );
++    pageUrl.setScheme( QLatin1String( "https" ) );
+ 
+     if( useMobileVersion )
+     {
+@@ -582,7 +570,7 @@ WikipediaEnginePrivate::fetchLangLinks( const QString &title,
+ {
+     Q_Q( WikipediaEngine );
+     KUrl url;
+-    url.setScheme( useSSL ? QLatin1String( "https" ) : QLatin1String( "http" ) );
++    url.setScheme( QLatin1String( "https" ) );
+     url.setHost( hostLang + QLatin1String(".wikipedia.org") );
+     url.setPath( QLatin1String("/w/api.php") );
+     url.addQueryItem( QLatin1String("action"), QLatin1String("query") );
+@@ -604,7 +592,7 @@ WikipediaEnginePrivate::fetchListing( const QString &title, const QString &hostL
+ {
+     Q_Q( WikipediaEngine );
+     KUrl url;
+-    url.setScheme( useSSL ? QLatin1String( "https" ) : QLatin1String( "http" ) );
++    url.setScheme( QLatin1String( "https" ) );
+     url.setHost( hostLang + QLatin1String(".wikipedia.org") );
+     url.setPath( QLatin1String("/w/api.php") );
+     url.addQueryItem( QLatin1String("action"), QLatin1String("query") );
+-- 
+2.7.4
+

diff --git a/0020-Wikipedia-applet-Remove-last-trace-of-no-SSL-possibi.patch b/0020-Wikipedia-applet-Remove-last-trace-of-no-SSL-possibi.patch
new file mode 100644
index 0000000..110c802
--- /dev/null
+++ b/0020-Wikipedia-applet-Remove-last-trace-of-no-SSL-possibi.patch
@@ -0,0 +1,25 @@
+From 333315d68755dc5dcf549386a4d50d8a15ebfbea Mon Sep 17 00:00:00 2001
+From: Olivier CHURLAUD <olivier@churlaud.com>
+Date: Tue, 21 Jun 2016 00:47:49 +0200
+Subject: [PATCH 20/26] Wikipedia applet: Remove last trace of no SSL
+ possibility
+
+---
+ src/context/applets/wikipedia/WikipediaApplet.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/context/applets/wikipedia/WikipediaApplet.cpp b/src/context/applets/wikipedia/WikipediaApplet.cpp
+index 7f1c732..705b9db 100644
+--- a/src/context/applets/wikipedia/WikipediaApplet.cpp
++++ b/src/context/applets/wikipedia/WikipediaApplet.cpp
+@@ -656,7 +656,6 @@ WikipediaApplet::init()
+     // Read config and inform the engine.
+     d->langList = Amarok::config("Wikipedia Applet").readEntry( "PreferredLang", QStringList() << "en" );
+     d->useMobileWikipedia = Amarok::config("Wikipedia Applet").readEntry( "UseMobile", false );
+-    d->useSSL = Amarok::config( "Wikipedia Applet" ).readEntry( "UseSSL", true );
+     d->_paletteChanged( App::instance()->palette() );
+     d->dataContainer->setData( "lang", d->langList );
+     d->dataContainer->setData( "mobile", d->useMobileWikipedia );
+-- 
+2.7.4
+

diff --git a/0024-Substitute-deprecated-MySQL-option-myisam-recover.patch b/0024-Substitute-deprecated-MySQL-option-myisam-recover.patch
new file mode 100644
index 0000000..b8b1f26
--- /dev/null
+++ b/0024-Substitute-deprecated-MySQL-option-myisam-recover.patch
@@ -0,0 +1,40 @@
+From a07f44ddcd61bac1bb2f1e17cfc07d40a940bb5a Mon Sep 17 00:00:00 2001
+From: Terje Rosten <terje.rosten@oracle.com>
+Date: Fri, 23 Oct 2015 12:11:43 +0200
+Subject: [PATCH 24/26] Substitute deprecated MySQL option --myisam-recover
+
+Deprecated MySQL option --myisam-recover has been removed in MySQL 5.7,
+replacement is --myisam-recover-options.
+
+Use MYSQL_VERSION_ID to handle this.
+
+Signed-off-by: Terje Rosten <terje.rosten@oracle.com>
+Signed-off-by: Stefano Pettini <stefano.pettini@gmail.com>
+
+CCMAIL: Terje Rosten <terje.rosten@oracle.com>
+BUG: 354255
+REVIEW: 128157
+FIXED-IN: 2.9
+---
+ src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp b/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
+index 4a9568f..9fa791b 100644
+--- a/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
++++ b/src/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
+@@ -70,7 +70,11 @@ MySqlEmbeddedStorage::init( const QString &storageLocation )
+                << "--default-storage-engine=MyISAM"
+                << "--innodb=OFF"
+                << "--skip-grant-tables"
++#if (defined(MYSQL_VERSION_ID)) && (MYSQL_VERSION_ID >= 50700)
++               << "--myisam-recover-options=FORCE"
++#else
+                << "--myisam-recover=FORCE"
++#endif
+                << "--key-buffer-size=16777216" // (16Mb)
+                << "--character-set-server=utf8"
+                << "--collation-server=utf8_bin";
+-- 
+2.7.4
+

diff --git a/0025-Handle-numeric-fields-properly-in-filter-creation-di.patch b/0025-Handle-numeric-fields-properly-in-filter-creation-di.patch
new file mode 100644
index 0000000..718367e
--- /dev/null
+++ b/0025-Handle-numeric-fields-properly-in-filter-creation-di.patch
@@ -0,0 +1,47 @@
+From 6c49cfdfd97faa146ce7b0d8e95ce2bf596f2b0d Mon Sep 17 00:00:00 2001
+From: Stefano Pettini <stefano.pettini@gmail.com>
+Date: Sun, 19 Jun 2016 00:13:13 +0200
+Subject: [PATCH 25/26] Handle numeric fields properly in filter creation
+ dialogs
+
+Every numeric field, like length, disc number and track number, were
+not properly parsed by the filter dialog or by the dynamic playlist
+dialog into the textual query string used to then apply the filter.
+
+The bug was due to what sounds like an "optimization" that swapped the
+first and second value of a "between" condition, to make sure the
+smaller value was always the first value and the larger always the
+second. The problem was that this was applied also to non-between
+conditions, actually swapping the lenth or disc number with 0, making
+0 appear in the textual representation of the condition.
+
+The fix makes sure that "optimization" is applied only in case of
+actual "between" conditions, leaving the values "unoptimized" for any
+other kind of condition (=, <, > and similar).
+
+REVIEW: 128245
+BUG: 341661
+---
+ src/widgets/MetaQueryWidget.cpp | 6 +++++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/widgets/MetaQueryWidget.cpp b/src/widgets/MetaQueryWidget.cpp
+index abce6b7..40f15d6 100644
+--- a/src/widgets/MetaQueryWidget.cpp
++++ b/src/widgets/MetaQueryWidget.cpp
+@@ -1081,7 +1081,11 @@ QString MetaQueryWidget::Filter::toString( bool invert ) const
+     }
+     else if( isNumeric() )
+     {
+-        if (numValue < numValue2) // two values are only used for "between". We want to order them by size
++        if ( condition != Between )
++        {
++            strValue1 = QString::number( numValue );
++        }
++        else if (numValue < numValue2) // two values are only used for "between". We want to order them by size
+         {
+             strValue1 = QString::number( numValue );
+             strValue2 = QString::number( numValue2 );
+-- 
+2.7.4
+

diff --git a/0026-Use-transparent-background-for-lyrics-browser.patch b/0026-Use-transparent-background-for-lyrics-browser.patch
new file mode 100644
index 0000000..5bc4ab2
--- /dev/null
+++ b/0026-Use-transparent-background-for-lyrics-browser.patch
@@ -0,0 +1,55 @@
+From bdbb3a27f556c41910d3b814e5a4c73a2a93362f Mon Sep 17 00:00:00 2001
+From: Stefano Pettini <stefano.pettini@gmail.com>
+Date: Sun, 19 Jun 2016 02:54:24 +0200
+Subject: [PATCH 26/26] Use transparent background for lyrics browser
+
+This makes the lyrics browser similar to every other context applet.
+Please note that, when editing lyrics, the default textbox background
+is still used.
+
+REVIEW: 128246
+BUG: 314854
+---
+ src/context/applets/lyrics/LyricsBrowser.cpp | 12 +++++-------
+ 2 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/src/context/applets/lyrics/LyricsBrowser.cpp b/src/context/applets/lyrics/LyricsBrowser.cpp
+index abcfe64..d948fea 100644
+--- a/src/context/applets/lyrics/LyricsBrowser.cpp
++++ b/src/context/applets/lyrics/LyricsBrowser.cpp
+@@ -41,7 +41,6 @@ LyricsBrowser::LyricsBrowser( QGraphicsWidget *parent )
+     native->setWordWrapMode( QTextOption::WordWrap );
+     native->setCursorWidth( 0 );
+     native->document()->setDocumentMargin( 10 );
+-    native->viewport()->setAutoFillBackground( true );
+     native->setTextInteractionFlags( Qt::TextBrowserInteraction | Qt::TextSelectableByKeyboard );
+ 
+     Plasma::Svg *borderSvg = new Plasma::Svg( this );
+@@ -105,10 +104,11 @@ void LyricsBrowser::setLyrics( const QString &lyrics )
+ 
+ void LyricsBrowser::setReadOnly( bool readOnly )
+ {
+-    QPalette::ColorRole bg = readOnly ? QPalette::Base : QPalette::AlternateBase;
+-    nativeWidget()->viewport()->setBackgroundRole( bg );
+-    nativeWidget()->setReadOnly( readOnly );
+-    nativeWidget()->setCursorWidth( !readOnly ? 1 : 0 );
++    KTextBrowser *native = nativeWidget();
++
++    native->viewport()->setAutoFillBackground( !readOnly );
++    native->setReadOnly( readOnly );
++    native->setCursorWidth( !readOnly ? 1 : 0 );
+ }
+ 
+ void LyricsBrowser::setRichText( bool richText )
+@@ -122,8 +122,6 @@ void LyricsBrowser::paletteChanged( const QPalette &palette )
+     // set text color using app theme instead of plasma theme
+     p.setColor( QPalette::Text, qApp->palette().text().color() );
+ 
+-    QPalette::ColorRole bg = isReadOnly() ? QPalette::Base : QPalette::AlternateBase;
+-    nativeWidget()->viewport()->setBackgroundRole( bg );
+     nativeWidget()->setPalette( p );
+ }
+ 
+-- 
+2.7.4
+

diff --git a/amarok-2.8.90-gcc6.patch b/amarok-2.8.90-gcc6.patch
deleted file mode 100644
index d795a19..0000000
--- a/amarok-2.8.90-gcc6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 2443c21..17b7ebe 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -8,7 +8,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.8.90
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 # KDE e.V. may determine that future GPL versions are accepted
 License: GPLv2 or GPLv3
@@ -31,8 +31,6 @@ Patch1: amarok-2.8.0-no_kdewebkit.patch
 ## upstreamable patches
 # make mysql_found non-fatal
 Patch100: amarok-2.8.90-mysql_found.patch
-# fix build using gcc6, https://bugs.kde.org/show_bug.cgi?id=363054
-Patch101: amarok-2.8.90-gcc6.patch
 # fix mpris support, https://git.reviewboard.kde.org/r/128418/
 # https://bugs.kde.org/show_bug.cgi?id=365275
 Patch102: amarok-kdebug365275.patch
@@ -46,6 +44,12 @@ 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
+Patch17: 0017-gcc6-buildfix.patch
+Patch19: 0019-Disable-non-SSL-connections-in-wikipedia-applet.patch
+Patch20: 0020-Wikipedia-applet-Remove-last-trace-of-no-SSL-possibi.patch
+Patch24: 0024-Substitute-deprecated-MySQL-option-myisam-recover.patch
+Patch25: 0025-Handle-numeric-fields-properly-in-filter-creation-di.patch
+Patch26: 0026-Use-transparent-background-for-lyrics-browser.patch
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -162,10 +166,15 @@ Requires: %{name} = %{version}-%{release}
 %patch14 -p1 -b .0014
 %patch15 -p1 -b .0015
 %patch16 -p1 -b .0016
+%patch17 -p1 -b .0017
+%patch19 -p1 -b .0019
+%patch20 -p1 -b .0020
+%patch24 -p1 -b .0024
+%patch25 -p1 -b .0025
+%patch26 -p1 -b .0026
+
 
 ## upstreamable
-#patch100 -p1 -b .mysql_found
-%patch101 -p1 -b .gcc6
 %patch102 -p1 -b .kdebug365275
 
 
@@ -334,6 +343,9 @@ fi
 
 
 %changelog
+* Sun Aug 07 2016 Rex Dieter <rdieter@fedoraproject.org> - 2.8.90-8
+- pull in upstream fixes
+
 * Sat Jul 23 2016 Rex Dieter <rdieter@fedoraproject.org> - 2.8.90-7
 - fix mpris support (kde#365275)