amarok-2.8.0-11.nonprism1: don't link to kdewebkit

3 files changed, 144 insertions, 2 deletions

diff --git a/nonprism/amarok/PKGBUILD b/nonprism/amarok/PKGBUILD
index c783a929d..eb214a21c 100644
--- a/nonprism/amarok/PKGBUILD
+++ b/nonprism/amarok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 266877 2016-05-04 19:19:12Z arojas $
+# $Id: PKGBUILD 287014 2017-01-20 13:07:45Z arojas $
 # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=amarok
 pkgver=2.8.0
-pkgrel=9.nonprism1
+pkgrel=11.nonprism1
 pkgdesc="The powerful music player for KDE, without Amazon MP3 store support"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/"
@@ -25,10 +25,13 @@ optdepends=("libgpod: support for Apple iPod audio devices"
             "gst-libav: MP3 codecs")
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         taglib_version_detect.patch amarok-ffmpeg3.patch::"https://git.reviewboard.kde.org/r/126682/diff/raw/"
+        amarok-no-kdewebkit.patch amarok-plasma5.7.patch
         remove-amazon-references-on-docs.patch)
 sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
           '8b2752a0fe78621bdb9ccdb763919ea265b52b06'
           '819cb060cd9c63b576cc433f835cb4c175b07fd0'
+          '8e73df4764db86ca5ac1639d3b3b4812cb4e827a'
+          '9908c154bf583a1755acf59f9d2790aaff503162'
           'eed2616fd1465cd16f86f2e3554e3b34b83557af')
 
 prepare() {
@@ -43,6 +46,10 @@ prepare() {
   patch -Np1 -i ../taglib_version_detect.patch
   # fix build against ffmpeg 3.0
   patch -p1 -i ../amarok-ffmpeg3.patch
+  # don't link to kdewebkit (Fedora)
+  patch -p1 -i ../amarok-no-kdewebkit.patch
+  # fix tooltips MPRIS controls in Plasma 5.7
+  patch -p1 -i ../amarok-plasma5.7.patch
 }
 
 build() {
diff --git a/nonprism/amarok/amarok-no-kdewebkit.patch b/nonprism/amarok/amarok-no-kdewebkit.patch
new file mode 100644
index 000000000..9f3b871bb
--- /dev/null
+++ b/nonprism/amarok/amarok-no-kdewebkit.patch
@@ -0,0 +1,117 @@
+diff -up amarok-2.8.0/src/context/applets/CMakeLists.txt.webkit amarok-2.8.0/src/context/applets/CMakeLists.txt
+diff -up amarok-2.8.0/src/context/applets/info/CMakeLists.txt.webkit amarok-2.8.0/src/context/applets/info/CMakeLists.txt
+--- amarok-2.8.0/src/context/applets/info/CMakeLists.txt.webkit	2013-08-14 15:22:52.000000000 -0500
++++ amarok-2.8.0/src/context/applets/info/CMakeLists.txt	2014-06-18 13:35:31.496217418 -0500
+@@ -16,7 +16,6 @@ target_link_libraries(amarok_context_app
+     amarokcore
+     amaroklib
+     ${KDE4_PLASMA_LIBS}
+-    ${KDE4_KDEWEBKIT_LIBS}
+     ${QT_QTWEBKIT_LIBRARY}
+     )
+ 
+diff -up amarok-2.8.0/src/context/applets/info/InfoApplet.cpp.webkit amarok-2.8.0/src/context/applets/info/InfoApplet.cpp
+--- amarok-2.8.0/src/context/applets/info/InfoApplet.cpp.webkit	2013-08-14 15:22:52.000000000 -0500
++++ amarok-2.8.0/src/context/applets/info/InfoApplet.cpp	2014-06-18 14:10:15.337284616 -0500
+@@ -26,7 +26,7 @@
+ #include "PaletteHandler.h"
+ #include "playlist/PlaylistController.h"
+ 
+-#include <KGraphicsWebView>
++#include <QGraphicsWebView>
+ #include <KStandardDirs>
+ 
+ #include <QPainter>
+@@ -63,7 +63,7 @@ void InfoApplet::init()
+ 
+     dataEngine( "amarok-info" )->connectSource( "info", this );
+ 
+-    m_webView = new KGraphicsWebView( this );
++    m_webView = new QGraphicsWebView( this );
+ 
+     QPalette p = m_webView->palette();
+     p.setColor( QPalette::Dark, QColor( 255, 255, 255, 0)  );
+diff -up amarok-2.8.0/src/context/applets/info/InfoApplet.h.webkit amarok-2.8.0/src/context/applets/info/InfoApplet.h
+--- amarok-2.8.0/src/context/applets/info/InfoApplet.h.webkit	2013-08-14 15:22:52.000000000 -0500
++++ amarok-2.8.0/src/context/applets/info/InfoApplet.h	2014-06-18 13:35:31.496217418 -0500
+@@ -27,7 +27,7 @@
+ 
+ #include <QGraphicsProxyWidget>
+ 
+-class KGraphicsWebView;
++class QGraphicsWebView;
+ 
+ class InfoApplet : public Context::Applet
+ {
+@@ -47,7 +47,7 @@ private slots:
+     void linkClicked( const QUrl & url );
+ 
+ private:
+-    KGraphicsWebView *m_webView;
++    QGraphicsWebView *m_webView;
+     bool m_initialized;
+ 
+     static QString s_defaultHtml;
+diff -up amarok-2.8.0/src/context/applets/wikipedia/CMakeLists.txt.webkit amarok-2.8.0/src/context/applets/wikipedia/CMakeLists.txt
+--- amarok-2.8.0/src/context/applets/wikipedia/CMakeLists.txt.webkit	2014-06-18 14:07:24.355163151 -0500
++++ amarok-2.8.0/src/context/applets/wikipedia/CMakeLists.txt	2014-06-18 14:07:34.347695400 -0500
+@@ -18,7 +18,6 @@ target_link_libraries(amarok_context_app
+     amaroklib
+     ${KDE4_PLASMA_LIBS}
+     ${KDE4_KIO_LIBS}
+-    ${KDE4_KDEWEBKIT_LIBS}
+     ${QT_QTWEBKIT_LIBRARY}
+ )
+ 
+diff -up amarok-2.8.0/src/context/applets/wikipedia/WikipediaApplet_p.h.webkit amarok-2.8.0/src/context/applets/wikipedia/WikipediaApplet_p.h
+--- amarok-2.8.0/src/context/applets/wikipedia/WikipediaApplet_p.h.webkit	2013-08-14 15:22:52.000000000 -0500
++++ amarok-2.8.0/src/context/applets/wikipedia/WikipediaApplet_p.h	2014-06-18 13:56:15.446760436 -0500
+@@ -23,7 +23,7 @@
+ #include "ui_wikipediaGeneralSettings.h"
+ #include "ui_wikipediaLanguageSettings.h"
+ 
+-#include <KGraphicsWebView>
++#include <QGraphicsWebView>
+ #include <KLineEdit>
+ #include <KUrl>
+ 
+@@ -180,13 +180,13 @@ protected:
+     }
+ };
+ 
+-class WikipediaWebView : public KGraphicsWebView
++class WikipediaWebView : public QGraphicsWebView
+ {
+     Q_OBJECT
+ 
+ public:
+     WikipediaWebView( QGraphicsItem *parent = 0 )
+-        : KGraphicsWebView( parent )
++        : QGraphicsWebView( parent )
+     {
+         m_lineEdit = new WikipediaSearchLineEdit( this );
+         m_lineEdit->setContentsMargins( 0, 0, 0, 0 );
+@@ -242,7 +242,7 @@ protected:
+             }
+             return false;
+         }
+-        return KGraphicsWebView::eventFilter( obj, event );
++        return QGraphicsWebView::eventFilter( obj, event );
+     }
+ 
+     void keyPressEvent( QKeyEvent *event )
+@@ -258,12 +258,12 @@ protected:
+             event->accept();
+         }
+         else
+-            KGraphicsWebView::keyPressEvent( event );
++            QGraphicsWebView::keyPressEvent( event );
+     }
+ 
+     void resizeEvent( QGraphicsSceneResizeEvent *event )
+     {
+-        KGraphicsWebView::resizeEvent( event );
++        QGraphicsWebView::resizeEvent( event );
+         if( m_topBorder )
+         {
+             m_topBorder->resize( event->newSize().width(), m_topBorder->size().height() );
diff --git a/nonprism/amarok/amarok-plasma5.7.patch b/nonprism/amarok/amarok-plasma5.7.patch
new file mode 100644
index 000000000..99d62243a
--- /dev/null
+++ b/nonprism/amarok/amarok-plasma5.7.patch
@@ -0,0 +1,18 @@
+diff --git a/src/dbus/mpris2/MediaPlayer2.cpp b/src/dbus/mpris2/MediaPlayer2.cpp
+index cbe1a2a..a1d1bda 100644
+--- a/src/dbus/mpris2/MediaPlayer2.cpp
++++ b/src/dbus/mpris2/MediaPlayer2.cpp
+@@ -94,11 +94,7 @@ QString MediaPlayer2::Identity() const
+ 
+ QString MediaPlayer2::DesktopEntry() const
+ {
+-    // Amarok desktop file is installed in $prefix/share/applications/kde4/
+-    // rather than in $prefix/share/applications. The standard way to
+-    // represent this dir is with a "kde4-" prefix. See:
+-    // http://standards.freedesktop.org/menu-spec/1.0/go01.html#term-desktop-file-id
+-    return QLatin1String("kde4-amarok");
++    return QLatin1String("amarok");
+ }
+ 
+ QStringList MediaPlayer2::SupportedUriSchemes() const
+