diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
| commit | 96f47f7059e8ad389d0aa757b2c66ad7cd8daf74 (patch) | |
| tree | f107c3838373376ef130dcfcb5a980cf8ad30a5f /extra/calligra | |
| parent | 40ece75655aebe0dd951a0489ed2111f1c27f8a8 (diff) | |
| parent | 3ff20dedff636571ad0faa4736af5b23e4623ffe (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cantata/PKGBUILD
community/gpsmanshp/PKGBUILD
community/pigz/PKGBUILD
extra/calligra/PKGBUILD
extra/genius/PKGBUILD
extra/gnumeric/PKGBUILD
extra/goffice/PKGBUILD
extra/graphicsmagick/PKGBUILD
extra/libgphoto2/PKGBUILD
extra/python-numpy/PKGBUILD
Diffstat (limited to 'extra/calligra')
| -rw-r--r-- | extra/calligra/PKGBUILD | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index f3f650d7d..b89db3b4e 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178833 2013-02-27 14:34:41Z andrea $ +# $Id: PKGBUILD 179991 2013-03-13 21:33:19Z 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.6.1 -pkgrel=2 +pkgver=2.6.2 +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' 'opencolorio' + 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' - 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa' 'vc') + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('8ba98f3ccb3c5097eb059d86b51f6139') +md5sums=('1c2feb12677ee71eb2e428e589b33862') build() { mkdir build @@ -107,7 +107,7 @@ package_calligra-karbon() { package_calligra-kexi() { pkgdesc="Develop desktop database applications" depends=('calligra-libs' 'glew' 'fftw') - optdepends=('libmysqlclient: MySQL driver' + optdepends=('libmariadbclient: MariaDB driver' 'freetds: Sybase & MS SQL driver' 'xbase: XBase driver' 'calligra-sheets: Spreadsheet-to-Kexi-table import plugin' |