Date: Wednesday, March 7, 2018 @ 07:28:13 Author: arojas Revision: 317957
Update to 2.9.0 Modified: amarok/trunk/PKGBUILD Deleted: amarok/trunk/amarok-plasma5.7.patch ------------------------+ PKGBUILD | 45 +++++++++++++++------------------------------ amarok-plasma5.7.patch | 18 ------------------ 2 files changed, 15 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-03-06 21:53:21 UTC (rev 317956) +++ PKGBUILD 2018-03-07 07:28:13 UTC (rev 317957) @@ -1,17 +1,17 @@ # $Id$ # Maintainer: Ronald van Haren <ron...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> # Contributor: Andrea Scarpino <and...@archlinux.org> # Contributor: damir <da...@archlinux.org> pkgname=amarok -pkgver=2.8.0 -pkgrel=19 +pkgver=2.9.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=(x86_64) url="http://amarok.kde.org/" -license=('GPL2' 'LGPL2.1' 'FDL') -depends=('kdebase-runtime' 'mariadb' 'taglib-extras' - 'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'qtscriptgenerator') +license=(GPL2 LGPL2.1 FDL) +depends=(kdebase-runtime mariadb taglib-extras liblastfm ffmpeg libofa qjson qtscriptgenerator) makedepends=('automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt' 'qca-qt4') optdepends=('libgpod: support for Apple iPod audio devices' 'libmtp: support for portable media devices' @@ -18,35 +18,20 @@ 'loudmouth: backend needed by mp3tunes for syncing' 'ifuse: support for Apple iPod Touch and iPhone' 'libmygpo-qt: gpodder.net Internet Service' - 'gst-libav: MP3 codecs') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - taglib_version_detect.patch::"https://cgit.kde.org/amarok.git/patch/?id=fec8817c" - amarok-ffmpeg3.patch::"https://git.reviewboard.kde.org/r/126682/diff/raw/" - amarok-no-qtwebkit.patch::"https://cgit.kde.org/amarok.git/patch/?id=d65ce101" - amarok-plasma5.7.patch::"https://cgit.kde.org/amarok.git/patch/?id=9449ec56") -sha256sums=('f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6' - 'bd7034e519999b6522e72e3961ca758630ad9b4db88557f795cf08956ea3dfee' - 'fbb18f1ff234716f6f8d3afd710b50f337453e536eb8288c3a9c4613edd6570f' - '6880a314a437100a3496540f2f9a0f2d14a4ff61deeeee07a42ba3f4beb1432b' - 'acc0fa104c99be046fa07b01a142f77c323b99943833d2e2139bfdcbec39e4a5') + 'gst-libav: MP3 codecs' + 'qca-qt4: Ampache support') +source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}) +sha256sums=('e3678de79db36956bc8588b9905726ace1b9188e7fdf89eaea265f1cb03116fd' + 'SKIP') +validpgpkeys=(D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heire...@exherbo.org> 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 + mkdir -p build } build() { cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ + cmake ../$pkgname-$pkgver \ -DKDE4_BUILD_TESTS=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_NepomukCore=OFF \ @@ -55,7 +40,7 @@ make } -package(){ +package() { cd build - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } Deleted: amarok-plasma5.7.patch =================================================================== --- amarok-plasma5.7.patch 2018-03-06 21:53:21 UTC (rev 317956) +++ amarok-plasma5.7.patch 2018-03-07 07:28:13 UTC (rev 317957) @@ -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 -