diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-19 17:54:19 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-19 17:54:19 -0300 |
| commit | 251b132bc8d5157b996afff54617d2483637aa4b (patch) | |
| tree | 7c1b56c3d3ffaadc49e329930b7eb0be75b328cb /extra/amarok | |
| parent | 3ed19e74567434fe0bc82d835513b5b62f151838 (diff) | |
| parent | 07455ea1de16867b168628e8a9f7f5bffc169a5f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/r8168-lts/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/r8168-lts/PKGBUILD
community-testing/sage-mathematics/PKGBUILD
community/ruby-gtk2/PKGBUILD
core/dhcpcd/PKGBUILD
core/glibc/PKGBUILD
core/net-tools/PKGBUILD
cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
extra/cups/PKGBUILD
extra/maxima/PKGBUILD
extra/scim-hangul/PKGBUILD
extra/speech-dispatcher/PKGBUILD
extra/subversion/PKGBUILD
extra/telepathy-idle/PKGBUILD
extra/x11vnc/PKGBUILD
multilib-testing/binutils-multilib/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libxml2/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-p11-kit/PKGBUILD
testing/binutils/PKGBUILD
testing/calligra/PKGBUILD
testing/dhcp/PKGBUILD
testing/gcc/PKGBUILD
testing/glibc/PKGBUILD
testing/inkscape/PKGBUILD
testing/iproute2/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libreoffice/PKGBUILD.36
testing/poppler/PKGBUILD
Diffstat (limited to 'extra/amarok')
| -rw-r--r-- | extra/amarok/PKGBUILD | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index a744ec262..510062cc1 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 163143 2012-07-08 09:30:39Z ibiru $ +# $Id: PKGBUILD 165272 2012-08-14 19:57:06Z ronald $ # 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.5.0 -pkgrel=5 +pkgver=2.6.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org" @@ -21,25 +21,12 @@ 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" - "toolbarfix.patch" - "amarok-2.5.0-ffmpeg-fixes.patch" - "contextviewfix.patch") -sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2' - 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f' - '61193ccc48e9f99b4856eef27fe7a4aaf465feec' - 'a95e3bfb177adacc268552ae479dd88b70f5f9e1') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('2cfcdabb67436418ba0012075ba105bbb630b48d') build() { cd "${srcdir}" - patch -Np0 -i "${srcdir}"/toolbarfix.patch - patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch - - pushd ${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}"/contextviewfix.patch # FS#30448 - popd - mkdir build cd build cmake ../${pkgname}-${pkgver} \ |