[arch-commits] Commit in amarok/trunk (PKGBUILD kde411.patch)
Andrea Scarpino
andrea at nymeria.archlinux.org
Sat Jun 15 07:43:42 UTC 2013
Date: Saturday, June 15, 2013 @ 09:43:42
Author: andrea
Revision: 188523
upgpkg: amarok 2.7.1-2
Fix a crash on KDE 4.11
Added:
amarok/trunk/kde411.patch
Modified:
amarok/trunk/PKGBUILD
--------------+
PKGBUILD | 18 +++++++++++++-----
kde411.patch | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-15 07:20:50 UTC (rev 188522)
+++ PKGBUILD 2013-06-15 07:43:42 UTC (rev 188523)
@@ -6,7 +6,7 @@
pkgname=amarok
replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
pkgver=2.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="The powerful music player for KDE"
arch=("i686" "x86_64")
url="http://amarok.kde.org/"
@@ -22,11 +22,19 @@
"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")
-sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d')
-
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+ 'kde411.patch')
+sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d'
+ 'c2fd0153ec622fccac47ebd31a1b0548c6222541')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/kde411.patch
+}
+
build() {
- mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
Added: kde411.patch
===================================================================
--- kde411.patch (rev 0)
+++ kde411.patch 2013-06-15 07:43:42 UTC (rev 188523)
@@ -0,0 +1,35 @@
+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 );
More information about the arch-commits
mailing list