[arch-commits] Commit in amarok/trunk (3 files)
Antonio Rojas
arojas at archlinux.org
Wed Jan 25 19:09:54 UTC 2017
Date: Wednesday, January 25, 2017 @ 19:09:53
Author: arojas
Revision: 287441
Drop info and wikipedia applets, they link to qtwebkit and don't work anyway
Added:
amarok/trunk/amarok-no-qtwebkit.patch
Modified:
amarok/trunk/PKGBUILD
Deleted:
amarok/trunk/amarok-no-kdewebkit.patch
---------------------------+
PKGBUILD | 14 ++---
amarok-no-kdewebkit.patch | 117 --------------------------------------------
amarok-no-qtwebkit.patch | 31 +++++++++++
3 files changed, 38 insertions(+), 124 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-25 19:04:31 UTC (rev 287440)
+++ PKGBUILD 2017-01-25 19:09:53 UTC (rev 287441)
@@ -5,15 +5,15 @@
pkgname=amarok
pkgver=2.8.0
-pkgrel=11
+pkgrel=12
pkgdesc="The powerful music player for KDE"
arch=("i686" "x86_64")
url="http://amarok.kde.org/"
license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras'
+depends=('kdebase-runtime' 'mariadb' 'taglib-extras'
'liblastfm' 'ffmpeg' 'libofa' 'qjson')
makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
- 'libmygpo-qt' 'mesa' 'clamz')
+ 'libmygpo-qt' 'mesa' 'clamz' 'qtscriptgenerator')
optdepends=("libgpod: support for Apple iPod audio devices"
"libmtp: support for portable media devices"
"loudmouth: backend needed by mp3tunes for syncing"
@@ -23,11 +23,11 @@
"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)
+ amarok-no-qtwebkit.patch amarok-plasma5.7.patch)
sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
'8b2752a0fe78621bdb9ccdb763919ea265b52b06'
'819cb060cd9c63b576cc433f835cb4c175b07fd0'
- '8e73df4764db86ca5ac1639d3b3b4812cb4e827a'
+ '97748cc0aef26da17b268865bf6b0431153525ce'
'9908c154bf583a1755acf59f9d2790aaff503162')
prepare() {
@@ -37,8 +37,8 @@
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
+# Disable applets that require qtwebkit
+ patch -p1 -i ../amarok-no-qtwebkit.patch
# Fix tooltips MPRIS controls in Plasma 5.7
patch -p1 -i ../amarok-plasma5.7.patch
}
Deleted: amarok-no-kdewebkit.patch
===================================================================
--- amarok-no-kdewebkit.patch 2017-01-25 19:04:31 UTC (rev 287440)
+++ amarok-no-kdewebkit.patch 2017-01-25 19:09:53 UTC (rev 287441)
@@ -1,117 +0,0 @@
-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() );
Added: amarok-no-qtwebkit.patch
===================================================================
--- amarok-no-qtwebkit.patch (rev 0)
+++ amarok-no-qtwebkit.patch 2017-01-25 19:09:53 UTC (rev 287441)
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9094f5e332..a7d5d106a4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,7 +84,7 @@ include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}/shared
+ )
+
+-find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml QtWebKit REQUIRED )
++find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml REQUIRED )
+ find_package( KDE4 4.8.4 REQUIRED )
+
+ include( KDE4Defaults )
+diff --git a/src/context/applets/CMakeLists.txt b/src/context/applets/CMakeLists.txt
+index f4d5456d9f..f4e4526c27 100644
+--- a/src/context/applets/CMakeLists.txt
++++ b/src/context/applets/CMakeLists.txt
+@@ -1,11 +1,11 @@
+ add_subdirectory( albums )
+ add_subdirectory( currenttrack )
+-add_subdirectory( info )
++# add_subdirectory( info )
+ add_subdirectory( labels )
+ add_subdirectory( lyrics )
+ add_subdirectory( photos )
+ add_subdirectory( tabs )
+-add_subdirectory( wikipedia )
++# add_subdirectory( wikipedia )
+
+ if( QT_QTOPENGL_FOUND )
+ add_subdirectory( analyzer )
More information about the arch-commits
mailing list