[arch-commits] Commit in amarok/trunk (PKGBUILD kde411.patch)

[Andrea Scarpino]

    Date: Friday, August 16, 2013 @ 15:35:21
  Author: andrea
Revision: 193109

upgpkg: amarok 2.8.0-1

Upstream release

Modified:
  amarok/trunk/PKGBUILD
Deleted:
  amarok/trunk/kde411.patch

--------------+
 PKGBUILD     |   14 ++++----------
 kde411.patch |   35 -----------------------------------
 2 files changed, 4 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-16 11:02:03 UTC (rev 193108)
+++ PKGBUILD	2013-08-16 13:35:21 UTC (rev 193109)
@@ -4,9 +4,8 @@
 # Contributor: damir <damir at 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 @@
             "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() {

Deleted: kde411.patch
===================================================================
--- kde411.patch	2013-08-16 11:02:03 UTC (rev 193108)
+++ kde411.patch	2013-08-16 13:35:21 UTC (rev 193109)
@@ -1,35 +0,0 @@
-commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448
-Author: Hrvoje Senjan <hrvoje.senjan at 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 at 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 );