Date: Monday, July 15, 2013 @ 20:18:01 Author: svenstaro Revision: 190106
archrelease: copy trunk to staging-i686, staging-x86_64 Added: amarok/repos/staging-i686/ amarok/repos/staging-i686/PKGBUILD (from rev 190105, amarok/trunk/PKGBUILD) amarok/repos/staging-i686/amarok.install (from rev 190105, amarok/trunk/amarok.install) amarok/repos/staging-i686/kde411.patch (from rev 190105, amarok/trunk/kde411.patch) amarok/repos/staging-x86_64/ amarok/repos/staging-x86_64/PKGBUILD (from rev 190105, amarok/trunk/PKGBUILD) amarok/repos/staging-x86_64/amarok.install (from rev 190105, amarok/trunk/amarok.install) amarok/repos/staging-x86_64/kde411.patch (from rev 190105, amarok/trunk/kde411.patch) -------------------------------+ staging-i686/PKGBUILD | 49 ++++++++++++++++++++++++++++++++++++++++ staging-i686/amarok.install | 12 +++++++++ staging-i686/kde411.patch | 35 ++++++++++++++++++++++++++++ staging-x86_64/PKGBUILD | 49 ++++++++++++++++++++++++++++++++++++++++ staging-x86_64/amarok.install | 12 +++++++++ staging-x86_64/kde411.patch | 35 ++++++++++++++++++++++++++++ 6 files changed, 192 insertions(+) Copied: amarok/repos/staging-i686/PKGBUILD (from rev 190105, amarok/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2013-07-15 18:18:01 UTC (rev 190106) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Ronald van Haren <ron...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgname=amarok +replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') +pkgver=2.7.1 +pkgrel=3 +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") +install="${pkgname}.install" +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() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package(){ + cd build + make DESTDIR="${pkgdir}" install +} Copied: amarok/repos/staging-i686/amarok.install (from rev 190105, amarok/trunk/amarok.install) =================================================================== --- staging-i686/amarok.install (rev 0) +++ staging-i686/amarok.install 2013-07-15 18:18:01 UTC (rev 190106) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: amarok/repos/staging-i686/kde411.patch (from rev 190105, amarok/trunk/kde411.patch) =================================================================== --- staging-i686/kde411.patch (rev 0) +++ staging-i686/kde411.patch 2013-07-15 18:18:01 UTC (rev 190106) @@ -0,0 +1,35 @@ +commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448 +Author: Hrvoje Senjan <hrvoje.sen...@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.sen...@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 ); Copied: amarok/repos/staging-x86_64/PKGBUILD (from rev 190105, amarok/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2013-07-15 18:18:01 UTC (rev 190106) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Ronald van Haren <ron...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgname=amarok +replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') +pkgver=2.7.1 +pkgrel=3 +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") +install="${pkgname}.install" +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() { + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package(){ + cd build + make DESTDIR="${pkgdir}" install +} Copied: amarok/repos/staging-x86_64/amarok.install (from rev 190105, amarok/trunk/amarok.install) =================================================================== --- staging-x86_64/amarok.install (rev 0) +++ staging-x86_64/amarok.install 2013-07-15 18:18:01 UTC (rev 190106) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: amarok/repos/staging-x86_64/kde411.patch (from rev 190105, amarok/trunk/kde411.patch) =================================================================== --- staging-x86_64/kde411.patch (rev 0) +++ staging-x86_64/kde411.patch 2013-07-15 18:18:01 UTC (rev 190106) @@ -0,0 +1,35 @@ +commit e899704b3db4af2ff228eb0d4dbbec05fb9a2448 +Author: Hrvoje Senjan <hrvoje.sen...@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.sen...@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 );