diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-21 09:52:33 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-21 09:52:33 -0300 |
commit | 4c50cd8958fa83e4edbf7d2f9c6b475300f40538 (patch) | |
tree | dc9e49842b221641263384e2b49ab0d8ad6d0e59 /extra/calligra/PKGBUILD | |
parent | 125e2429b897d89b7e37fd8ca7b6e11926f677ae (diff) | |
parent | a3669c04838b48b6891b2ffc4b296fa515f8174f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/qingy/PKGBUILD
community/mfs/PKGBUILD
extra/mysql/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/calligra/PKGBUILD')
-rw-r--r-- | extra/calligra/PKGBUILD | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 7eb040e06..c10db20f4 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164831 2012-08-06 23:07:05Z andrea $ +# $Id: PKGBUILD 165426 2012-08-19 07:57:30Z andyrtr $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -13,7 +13,6 @@ pkgname=('calligra-filters' 'calligra-tools' 'calligra-karbon' 'calligra-kexi' - 'calligra-kounavail' 'calligra-plan' 'calligra-stage' 'calligra-krita' @@ -22,22 +21,21 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.4.3 -pkgrel=3 +pkgver=2.5.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' 'kdepimlibs' 'libpqxx' 'freetds' 'xbase' 'kdegraphics-okular' 'gsl' 'kdeedu-marble' - 'libwpd' 'libwpg' 'pstoedit' 'glew' + 'libwps' 'libwpg' 'pstoedit' 'glew' 'fftw' 'opengtl' 'lcms2' 'libkdcraw') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('469d639f17e3d6a186baabd899147e39') +md5sums=('bea9b5e9d95691caaba385ef5522a60d') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ @@ -51,7 +49,8 @@ build() { package_calligra-filters() { pkgdesc="Filters for the Calligra office suite" - optdepends=('libwpg: Corel WordPerfect Graphics image importer') + optdepends=('libwpg: Corel WordPerfect Graphics image importer' + 'libwps: Microsoft Works file word processor format import') conflicts=('koffice-filters') replaces=('koffice-filters') install=calligra-filters.install @@ -162,16 +161,6 @@ package_calligra-kexi() { make DESTDIR="${pkgdir}" install } -package_calligra-kounavail() { - pkgdesc="Unavailable Calligra Document" - depends=('calligra-libs') - conflicts=('koffice-kounavail') - replaces=('koffice-kounavail') - - cd "${srcdir}"/build/kounavail - make DESTDIR="${pkgdir}" install -} - package_calligra-plan() { pkgdesc="Calligra Project Management Component" depends=('calligra-words') |