[arch-commits] Commit in amarok/repos (16 files)

Antonio Rojas arojas at archlinux.org
Wed Jan 25 19:10:30 UTC 2017


    Date: Wednesday, January 25, 2017 @ 19:10:29
  Author: arojas
Revision: 287442

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  amarok/repos/extra-i686/PKGBUILD
    (from rev 287441, amarok/trunk/PKGBUILD)
  amarok/repos/extra-i686/amarok-no-qtwebkit.patch
    (from rev 287441, amarok/trunk/amarok-no-qtwebkit.patch)
  amarok/repos/extra-i686/amarok-plasma5.7.patch
    (from rev 287441, amarok/trunk/amarok-plasma5.7.patch)
  amarok/repos/extra-i686/taglib_version_detect.patch
    (from rev 287441, amarok/trunk/taglib_version_detect.patch)
  amarok/repos/extra-x86_64/PKGBUILD
    (from rev 287441, amarok/trunk/PKGBUILD)
  amarok/repos/extra-x86_64/amarok-no-qtwebkit.patch
    (from rev 287441, amarok/trunk/amarok-no-qtwebkit.patch)
  amarok/repos/extra-x86_64/amarok-plasma5.7.patch
    (from rev 287441, amarok/trunk/amarok-plasma5.7.patch)
  amarok/repos/extra-x86_64/taglib_version_detect.patch
    (from rev 287441, amarok/trunk/taglib_version_detect.patch)
Deleted:
  amarok/repos/extra-i686/PKGBUILD
  amarok/repos/extra-i686/amarok-no-kdewebkit.patch
  amarok/repos/extra-i686/amarok-plasma5.7.patch
  amarok/repos/extra-i686/taglib_version_detect.patch
  amarok/repos/extra-x86_64/PKGBUILD
  amarok/repos/extra-x86_64/amarok-no-kdewebkit.patch
  amarok/repos/extra-x86_64/amarok-plasma5.7.patch
  amarok/repos/extra-x86_64/taglib_version_detect.patch

------------------------------------------+
 /PKGBUILD                                |  120 +++++++++++++++++++++++++++++
 /amarok-plasma5.7.patch                  |   36 ++++++++
 /taglib_version_detect.patch             |   52 ++++++++++++
 extra-i686/PKGBUILD                      |   60 --------------
 extra-i686/amarok-no-kdewebkit.patch     |  117 ----------------------------
 extra-i686/amarok-no-qtwebkit.patch      |   31 +++++++
 extra-i686/amarok-plasma5.7.patch        |   18 ----
 extra-i686/taglib_version_detect.patch   |   26 ------
 extra-x86_64/PKGBUILD                    |   60 --------------
 extra-x86_64/amarok-no-kdewebkit.patch   |  117 ----------------------------
 extra-x86_64/amarok-no-qtwebkit.patch    |   31 +++++++
 extra-x86_64/amarok-plasma5.7.patch      |   18 ----
 extra-x86_64/taglib_version_detect.patch |   26 ------
 13 files changed, 270 insertions(+), 442 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-01-25 19:09:53 UTC (rev 287441)
+++ extra-i686/PKGBUILD	2017-01-25 19:10:29 UTC (rev 287442)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=amarok
-pkgver=2.8.0
-pkgrel=11
-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'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
-             'libmygpo-qt' 'mesa' 'clamz')
-optdepends=("libgpod: support for Apple iPod audio devices"
-            "libmtp: support for portable media devices"
-            "loudmouth: backend needed by mp3tunes for syncing"
-            "ifuse: support for Apple iPod Touch and iPhone"
-            "libmygpo-qt: gpodder.net Internet Service"
-            "clamz: allow to download songs from Amazon.com"
-            "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)
-sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
-          '8b2752a0fe78621bdb9ccdb763919ea265b52b06'
-          '819cb060cd9c63b576cc433f835cb4c175b07fd0'
-          '8e73df4764db86ca5ac1639d3b3b4812cb4e827a'
-          '9908c154bf583a1755acf59f9d2790aaff503162')
-
-prepare() {
-  mkdir build
-
-  cd ${pkgname}-${pkgver}
-  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() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_NepomukCore=OFF \
-    -DWITH_Soprano=OFF
-  make
-}
-
-package(){
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: amarok/repos/extra-i686/PKGBUILD (from rev 287441, amarok/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-01-25 19:10:29 UTC (rev 287442)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=amarok
+pkgver=2.8.0
+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' 'taglib-extras'
+        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
+             '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"
+            "ifuse: support for Apple iPod Touch and iPhone"
+            "libmygpo-qt: gpodder.net Internet Service"
+            "clamz: allow to download songs from Amazon.com"
+            "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-qtwebkit.patch amarok-plasma5.7.patch)
+sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
+          '8b2752a0fe78621bdb9ccdb763919ea265b52b06'
+          '819cb060cd9c63b576cc433f835cb4c175b07fd0'
+          '97748cc0aef26da17b268865bf6b0431153525ce'
+          '9908c154bf583a1755acf59f9d2790aaff503162')
+
+prepare() {
+  mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../taglib_version_detect.patch
+# Fix build against ffmpeg 3.0
+  patch -p1 -i ../amarok-ffmpeg3.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
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_NepomukCore=OFF \
+    -DWITH_Soprano=OFF
+  make
+}
+
+package(){
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/amarok-no-kdewebkit.patch
===================================================================
--- extra-i686/amarok-no-kdewebkit.patch	2017-01-25 19:09:53 UTC (rev 287441)
+++ extra-i686/amarok-no-kdewebkit.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -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() );

Copied: amarok/repos/extra-i686/amarok-no-qtwebkit.patch (from rev 287441, amarok/trunk/amarok-no-qtwebkit.patch)
===================================================================
--- extra-i686/amarok-no-qtwebkit.patch	                        (rev 0)
+++ extra-i686/amarok-no-qtwebkit.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -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 )

Deleted: extra-i686/amarok-plasma5.7.patch
===================================================================
--- extra-i686/amarok-plasma5.7.patch	2017-01-25 19:09:53 UTC (rev 287441)
+++ extra-i686/amarok-plasma5.7.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -1,18 +0,0 @@
-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
-

Copied: amarok/repos/extra-i686/amarok-plasma5.7.patch (from rev 287441, amarok/trunk/amarok-plasma5.7.patch)
===================================================================
--- extra-i686/amarok-plasma5.7.patch	                        (rev 0)
+++ extra-i686/amarok-plasma5.7.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -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
+

Deleted: extra-i686/taglib_version_detect.patch
===================================================================
--- extra-i686/taglib_version_detect.patch	2017-01-25 19:09:53 UTC (rev 287441)
+++ extra-i686/taglib_version_detect.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -1,26 +0,0 @@
-diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
-index 76b83ac..21a10a8 100644
---- a/cmake/modules/FindTaglib.cmake
-+++ b/cmake/modules/FindTaglib.cmake
-@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
- 
-   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
- 
--  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
-      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
-      set(TAGLIB_FOUND FALSE)
--  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
- 
-      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
- 
-@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
-         set(TAGLIB_FOUND TRUE)
-      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
-+  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) 
-   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
- 
- else(TAGLIBCONFIG_EXECUTABLE)

Copied: amarok/repos/extra-i686/taglib_version_detect.patch (from rev 287441, amarok/trunk/taglib_version_detect.patch)
===================================================================
--- extra-i686/taglib_version_detect.patch	                        (rev 0)
+++ extra-i686/taglib_version_detect.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -0,0 +1,26 @@
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 76b83ac..21a10a8 100644
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
+ 
+   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+      set(TAGLIB_FOUND FALSE)
+-  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ 
+      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
+         set(TAGLIB_FOUND TRUE)
+      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) 
+   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+ else(TAGLIBCONFIG_EXECUTABLE)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-01-25 19:09:53 UTC (rev 287441)
+++ extra-x86_64/PKGBUILD	2017-01-25 19:10:29 UTC (rev 287442)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=amarok
-pkgver=2.8.0
-pkgrel=11
-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'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
-             'libmygpo-qt' 'mesa' 'clamz')
-optdepends=("libgpod: support for Apple iPod audio devices"
-            "libmtp: support for portable media devices"
-            "loudmouth: backend needed by mp3tunes for syncing"
-            "ifuse: support for Apple iPod Touch and iPhone"
-            "libmygpo-qt: gpodder.net Internet Service"
-            "clamz: allow to download songs from Amazon.com"
-            "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)
-sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
-          '8b2752a0fe78621bdb9ccdb763919ea265b52b06'
-          '819cb060cd9c63b576cc433f835cb4c175b07fd0'
-          '8e73df4764db86ca5ac1639d3b3b4812cb4e827a'
-          '9908c154bf583a1755acf59f9d2790aaff503162')
-
-prepare() {
-  mkdir build
-
-  cd ${pkgname}-${pkgver}
-  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() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_NepomukCore=OFF \
-    -DWITH_Soprano=OFF
-  make
-}
-
-package(){
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: amarok/repos/extra-x86_64/PKGBUILD (from rev 287441, amarok/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-01-25 19:10:29 UTC (rev 287442)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=amarok
+pkgver=2.8.0
+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' 'taglib-extras'
+        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
+makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
+             '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"
+            "ifuse: support for Apple iPod Touch and iPhone"
+            "libmygpo-qt: gpodder.net Internet Service"
+            "clamz: allow to download songs from Amazon.com"
+            "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-qtwebkit.patch amarok-plasma5.7.patch)
+sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
+          '8b2752a0fe78621bdb9ccdb763919ea265b52b06'
+          '819cb060cd9c63b576cc433f835cb4c175b07fd0'
+          '97748cc0aef26da17b268865bf6b0431153525ce'
+          '9908c154bf583a1755acf59f9d2790aaff503162')
+
+prepare() {
+  mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../taglib_version_detect.patch
+# Fix build against ffmpeg 3.0
+  patch -p1 -i ../amarok-ffmpeg3.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
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_NepomukCore=OFF \
+    -DWITH_Soprano=OFF
+  make
+}
+
+package(){
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/amarok-no-kdewebkit.patch
===================================================================
--- extra-x86_64/amarok-no-kdewebkit.patch	2017-01-25 19:09:53 UTC (rev 287441)
+++ extra-x86_64/amarok-no-kdewebkit.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -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() );

Copied: amarok/repos/extra-x86_64/amarok-no-qtwebkit.patch (from rev 287441, amarok/trunk/amarok-no-qtwebkit.patch)
===================================================================
--- extra-x86_64/amarok-no-qtwebkit.patch	                        (rev 0)
+++ extra-x86_64/amarok-no-qtwebkit.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -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 )

Deleted: extra-x86_64/amarok-plasma5.7.patch
===================================================================
--- extra-x86_64/amarok-plasma5.7.patch	2017-01-25 19:09:53 UTC (rev 287441)
+++ extra-x86_64/amarok-plasma5.7.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -1,18 +0,0 @@
-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
-

Copied: amarok/repos/extra-x86_64/amarok-plasma5.7.patch (from rev 287441, amarok/trunk/amarok-plasma5.7.patch)
===================================================================
--- extra-x86_64/amarok-plasma5.7.patch	                        (rev 0)
+++ extra-x86_64/amarok-plasma5.7.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -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
+

Deleted: extra-x86_64/taglib_version_detect.patch
===================================================================
--- extra-x86_64/taglib_version_detect.patch	2017-01-25 19:09:53 UTC (rev 287441)
+++ extra-x86_64/taglib_version_detect.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -1,26 +0,0 @@
-diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
-index 76b83ac..21a10a8 100644
---- a/cmake/modules/FindTaglib.cmake
-+++ b/cmake/modules/FindTaglib.cmake
-@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
- 
-   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
- 
--  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
-      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
-      set(TAGLIB_FOUND FALSE)
--  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
- 
-      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
- 
-@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
-         set(TAGLIB_FOUND TRUE)
-      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
-+  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) 
-   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
- 
- else(TAGLIBCONFIG_EXECUTABLE)

Copied: amarok/repos/extra-x86_64/taglib_version_detect.patch (from rev 287441, amarok/trunk/taglib_version_detect.patch)
===================================================================
--- extra-x86_64/taglib_version_detect.patch	                        (rev 0)
+++ extra-x86_64/taglib_version_detect.patch	2017-01-25 19:10:29 UTC (rev 287442)
@@ -0,0 +1,26 @@
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 76b83ac..21a10a8 100644
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
+ 
+   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+      set(TAGLIB_FOUND FALSE)
+-  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ 
+      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
+         set(TAGLIB_FOUND TRUE)
+      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) 
+   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+ else(TAGLIBCONFIG_EXECUTABLE)



More information about the arch-commits mailing list