diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-19 09:54:35 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-19 09:54:35 +0200 |
| commit | 3c8f9aba21e3ac85376497cc12d67fd8f34c0839 (patch) | |
| tree | 087ffae170ab2cdc6b4424179493869dbe1405d0 /extra/digikam | |
| parent | b93deb686e23603e67eee07fced30237db47c367 (diff) | |
| parent | e4afcc505c31482d7d7cee60bb6388bfacc8ad7f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/nginx/PKGBUILD
community-testing/oss/PKGBUILD
staging/kdebase-workspace/PKGBUILD
Diffstat (limited to 'extra/digikam')
| -rw-r--r-- | extra/digikam/PKGBUILD | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 61eb3a574..e7e667a8f 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 158119 2012-05-03 02:26:57Z foutrelis $ +# $Id: PKGBUILD 161969 2012-06-17 18:33:21Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.5.0 -pkgrel=6 +pkgver=2.6.0 +pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,22 +14,12 @@ url="http://www.digikam.org/" makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - "boost148.patch" "libkipi140.patch" "digikam-2.5.0-gcc-4.7.0.patch") -sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383' - '93853084905b21309c46ce7d585021e76283d429' - '8a8f624fd0ca768a9dcd706405eb6e4944892d87' - '5058831a4f1209468d0249c03f0e243f176f995a') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('a7a9e4e342f118b603a11539c98a01c9970254df') + build() { cd "${srcdir}" - pushd ${pkgname}-${pkgver}/core - patch -Np0 -i ${srcdir}/boost148.patch - patch -Np1 -i ${srcdir}/libkipi140.patch - popd - - patch -Np0 -i ${srcdir}/digikam-2.5.0-gcc-4.7.0.patch - mkdir build cd build # Use internal lensfun (FS#21816) |