diff options
| author | root <root@rshg054.dnsready.net> | 2013-08-17 01:48:49 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-08-17 01:48:49 -0700 |
| commit | 74952c750361d72d7b2d14179d4e88b6ce0a0c7e (patch) | |
| tree | 881e3676cf3b53e4c90d21b37b94a008eda1832f /extra/amarok | |
| parent | 6a3f02abeeecab3efb4442e39e28e05897f25316 (diff) | |
Sat Aug 17 01:47:45 PDT 2013
Diffstat (limited to 'extra/amarok')
| -rw-r--r-- | extra/amarok/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/amarok/kde411.patch | 35 |
2 files changed, 5 insertions, 46 deletions
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 241a993e8..de1f4c38f 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 191886 2013-08-01 06:53:20Z bpiotrowski $ +# $Id: PKGBUILD 193110 2013-08-16 13:35:31Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok -replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.7.1 -pkgrel=3 +pkgver=2.8.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org/" @@ -22,16 +21,11 @@ optdepends=("libgpod: support for Apple iPod audio devices" "libmygpo-qt: gpodder.net Internet Service" "clamz: allow to download songs from Amazon.com") install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde411.patch') -sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d' - 'c2fd0153ec622fccac47ebd31a1b0548c6222541') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937') prepare() { mkdir build - - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/kde411.patch } build() { diff --git a/extra/amarok/kde411.patch b/extra/amarok/kde411.patch deleted file mode 100644 index 8099a4432..000000000 --- a/extra/amarok/kde411.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448 -Author: Hrvoje Senjan <hrvoje.senjan@gmail.com> -Date: Mon Jun 10 09:26:37 2013 +0200 - - Remove usage of (fake) Amarok-Mockup theme - - This is due to https://bugs.kde.org/show_bug.cgi?id=320855 - Amarok-Mockup is unused, as far i can see, and also makes Amarok crash with kdelibs master/4.11 - If it is still needed, or there is a better solution, i'll discard the review... - - From 6b85a2899a30db5acebee92182a67778499a8d9e Mon Sep 17 00:00:00 2001 - From: Hrvoje Senjan <hrvoje.senjan@gmail.com> - Date: Sun, 9 Jun 2013 19:55:58 +0200 - Subject: [PATCH 1/1] Kill Amarok-Mockup - - BUG: 320855 - FIXED-IN: 2.8 - REVIEW: 110917 - -diff --git a/src/context/ContextView.cpp b/src/context/ContextView.cpp -index f61518f..152f8da 100644 ---- a/src/context/ContextView.cpp -+++ b/src/context/ContextView.cpp -@@ -78,11 +78,6 @@ ContextView::ContextView( Plasma::Containment *cont, Plasma::Corona *corona, QWi - p.setColor( QPalette::Base, c ); - setPalette( p ); - -- PERF_LOG( "Accessing Plasma::Theme" ); -- // here we initialize all the Plasma paths to Amarok paths -- Plasma::Theme::defaultTheme()->setUseGlobalSettings( false ); -- Theme::defaultTheme()->setThemeName( "Amarok-Mockup" ); -- PERF_LOG( "Access to Plasma::Theme complete" ) - contextScene()->setAppletMimeType( "text/x-amarokappletservicename" ); - - cont->setPos( 0, 0 ); |