diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-09 11:13:39 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-09 11:13:39 +0100 |
| commit | 80c5e58be137999f5d9690b682e888436ffe69b2 (patch) | |
| tree | 5aef91b2cbc21ef5471d9ab69066ba7beaf747f0 /extra/calligra/PKGBUILD | |
| parent | 9866fa59a35ebbae88bec725eba8551f34990e03 (diff) | |
| parent | e9c244cac8e5dc1c59c7e8b7bc885fef04224b70 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-dataenc/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
core/openssl/PKGBUILD
extra/cabal-install/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/kdebindings-python/PKGBUILD
Diffstat (limited to 'extra/calligra/PKGBUILD')
| -rw-r--r-- | extra/calligra/PKGBUILD | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index dc21f98a3..0d8d9de5f 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175909 2013-01-23 21:19:46Z andrea $ +# $Id: PKGBUILD 177768 2013-02-08 09:03:22Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -17,18 +17,18 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.5.5 +pkgver=2.6.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' - 'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg' - 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt>=0.22.0' 'libkdcraw' + 'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' + 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('0fcf72319d0a5a806aed50e3a2f3ceb4') +md5sums=('df7c2816d2bbe5e2fe87ea0be3fe668c') build() { mkdir build @@ -54,7 +54,7 @@ package_calligra-filters() { package_calligra-libs() { pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs' 'lcms2') + depends=('kdepimlibs' 'lcms2' 'kactivities') conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics' 'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces' 'calligra-pics' 'calligra-servicetypes' 'calligra-templates') @@ -74,6 +74,7 @@ package_calligra-plugins() { optdepends=('kdeedu-marble: map shape for Calligra') conflicts=('koffice-plugins' 'koffice-kchart') replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula') + install=calligra-plugins.install cd "${srcdir}"/build/plugins make DESTDIR="${pkgdir}" install @@ -149,7 +150,7 @@ package_calligra-stage() { package_calligra-krita() { pkgdesc="Edit and paint images" depends=('calligra-plugins' 'kdebase-runtime' 'eigen2' - 'poppler-qt' 'libkdcraw' 'fftw' 'glew' 'opengtl') + 'opencolorio' 'libkdcraw' 'fftw' 'glew' 'opengtl') conflicts=('koffice-krita' 'calligra-krita-doc') replaces=('koffice-krita' 'calligra-krita-doc') install=calligra-krita.install |