diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-01 10:33:01 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-01 10:33:01 +0100 |
| commit | 59b32159d6180c35a742ced756dc139659dc1dd5 (patch) | |
| tree | 4f03740ae853d27d51d69666d511ffb527d27a9e /extra/amarok/PKGBUILD | |
| parent | 5330206481631dda2c1e585b758c58f90ab807ee (diff) | |
| parent | c34f78dd37c2a2015d43de5d89748a2f8147ba1b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/openscenegraph/PKGBUILD
community-testing/speed-dreams/PKGBUILD
community-testing/speed-dreams/speed-dreams.desktop
community-testing/xemacs/PKGBUILD
community/ibus/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/virtuoso/PKGBUILD
multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
multilib-testing/lib32-pango/PKGBUILD
multilib-testing/wine/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-gmp/PKGBUILD
multilib/lib32-libidn/PKGBUILD
multilib/lib32-pixman/PKGBUILD
testing/fontforge/PKGBUILD
testing/java7-openjdk/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdegraphics-okular/PKGBUILD
testing/kdegraphics-strigi-analyzer/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libreoffice/PKGBUILD.next_stable
testing/opencv/PKGBUILD
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php.ini.patch
testing/xine-ui/PKGBUILD
Diffstat (limited to 'extra/amarok/PKGBUILD')
| -rw-r--r-- | extra/amarok/PKGBUILD | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index b38398183..2a9c7b8eb 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145092 2011-12-16 20:04:34Z ronald $ +# $Id: PKGBUILD 148378 2012-01-30 21:38:30Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org" @@ -21,11 +21,16 @@ optdepends=("libgpod: support for Apple iPod audio devices" "ifuse: support for Apple iPod Touch and iPhone" "libmygpo-qt: gpodder.net Internet Service") install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + "toolbarfix.patch") +sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2' + 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f') build() { cd "${srcdir}" + + patch -Np0 -i "${srcdir}"/toolbarfix.patch + mkdir build cd build cmake ../${pkgname}-${pkgver} \ |