Tue Apr 17 00:01:34 UTC 2012

1 files changed, 36 insertions, 46 deletions

diff --git a/testing/calligra/PKGBUILD b/testing/calligra/PKGBUILD
index 89a5570fc..41c4c0ee5 100644
--- a/testing/calligra/PKGBUILD
+++ b/testing/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156147 2012-04-14 12:49:49Z andrea $
+# $Id: PKGBUILD 156197 2012-04-15 16:00:02Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -20,17 +20,18 @@ pkgname=('calligra-filters'
          'calligra-sheets'
          'calligra-words'
          'calligra-handbook'
-         'calligra-thesaurus-doc'
          'calligra-braindump'
          'calligra-flow')
 pkgver=2.4.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
-url='http://www.calligra-suite.org'
+url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular' 'libgsf'
-             'libwpd' 'libwpg' 'pstoedit' 'glew' 'gsl' 'cmake' 'automoc4'
-             'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'lcms2')
+makedepends=('cmake' 'automoc4' 'boost ' 'eigen2'
+             'kdepimlibs' 'libpqxx' 'freetds' 'xbase'
+             'kdegraphics-okular' 'gsl' 'kdeedu-marble'
+             'libwpd' 'libwpg' 'pstoedit' 'glew'
+             'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
         'do-not-build-hancomword.patch')
@@ -46,24 +47,16 @@ build() {
   cd build
   cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_active=OFF \
     -DBUILD_mobile=OFF \
-    -DBUILD_mysql=OFF \
-    -DKDCRAW_LOCAL_FOUND=/usr/lib/libkdcraw.so \
-    -DWITH_Marble=OFF \
     -DIHAVEPATCHEDQT=1
   make
 }
 
 package_calligra-filters() {
   pkgdesc="Filters for the Calligra office suite"
-  optdepends=('libgsf: Microsoft Word document importer'
-              'libwpd: WordPerfect document importer'
-              'libwpg: Corel WordPerfect Graphics image importer'
-              'pstoedit: Karbon EPS import filter'
-              'libkdcraw: support for raw images')
+  optdepends=('libwpg: Corel WordPerfect Graphics image importer')
   conflicts=('koffice-filters')
   replaces=('koffice-filters')
   install=calligra-filters.install
@@ -94,9 +87,10 @@ package_calligra-libs() {
 
 package_calligra-plugins() {
   pkgdesc="Plugins for the Calligra office suite"
-  depends=('calligra-libs')
+  depends=('calligra-libs' 'calligra-filters')
+  optdepends=('kdeedu-marble: map shape for Calligra')
   conflicts=('koffice-plugins' 'koffice-kchart')
-  replaces=('koffice-plugins' 'koffice-kchart')
+  replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
 
   cd "${srcdir}"/build/plugins
   make DESTDIR="${pkgdir}" install
@@ -104,7 +98,6 @@ package_calligra-plugins() {
 
 package_calligra-pics() {
   pkgdesc="Icons for the Calligra office suite"
-  depends=('calligra-libs')
   conflicts=('koffice-pics')
   replaces=('koffice-pics')
   install=calligra.install
@@ -143,13 +136,11 @@ package_calligra-tools() {
   make DESTDIR="${pkgdir}" install
 }
 
-#### package common files done #####
-
-#### package apps and their docs #####
-
 package_calligra-karbon() {
   pkgdesc="Create scalable vector drawings"
-  depends=('calligra-libs' 'calligra-templates')
+  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
+  optdepends=('calligra-filters: import/export filters'
+              'calligra-tools: extra calligra tools')
   conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
   replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
   install=calligra-karbon.install
@@ -161,6 +152,13 @@ package_calligra-karbon() {
 package_calligra-kexi() {
   pkgdesc="Develop desktop database applications"
   depends=('calligra-libs' 'calligra-templates')
+  optdepends=('libmysqlclient: MySQL driver'
+              'libpqxx: PostgreSQL driver'
+              'freetds: Sybase & MS SQL driver'
+              'xbase: XBase driver'
+              'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
+              'kdeedu-marble: map form widget'
+              'calligra-plugins: extra calligra plugins')
   conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
   replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
   install=calligra-kexi.install
@@ -192,8 +190,8 @@ package_calligra-plan() {
 
 package_calligra-stage() {
   pkgdesc="Write presentation documents"
-  depends=('calligra-libs' 'calligra-templates')
-  optdepends=('calligra-filters: import/export filters')
+  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
+  optdepends=('calligra-plugins: extra calligra plugins')
   conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
   replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
   install=calligra-stage.install
@@ -204,9 +202,8 @@ package_calligra-stage() {
 
 package_calligra-krita() {
   pkgdesc="Edit and paint images"
-  depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'glew'
-           'qimageblitz' 'poppler-qt' 'openexr' 'opengtl')
-  optdepends=('calligra-filters: import/export filters')
+  depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime'
+           'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw')
   conflicts=('koffice-krita' 'calligra-krita-doc')
   replaces=('koffice-krita' 'calligra-krita-doc')
   install=calligra-krita.install
@@ -217,8 +214,10 @@ package_calligra-krita() {
 
 package_calligra-sheets() {
   pkgdesc="Write spreadsheet documents"
-  depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'gsl')
-  optdepends=('calligra-filters: import/export filters')
+  depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime')
+  optdepends=('calligra-filters: import/export filters'
+              'calligra-plugins: extra calligra plugins'
+              'calligra-tools: extra calligra tools')
   conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
   replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
   install=calligra-sheets.install
@@ -229,9 +228,9 @@ package_calligra-sheets() {
 
 package_calligra-words() {
   pkgdesc="Word Processor"
-  depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'calligra-pics'
-           'calligra-kounavail' 'kdegraphics-okular')
-  optdepends=('calligra-filters: import/export filters')
+  depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail'
+           'calligra-plugins' 'kdegraphics-okular')
+  optdepends=('calligra-tools: extra calligra tools')
   conflicts=('koffice-kword')
   replaces=('koffice-kword')
   install=calligra-words.install
@@ -249,17 +248,9 @@ package_calligra-handbook() {
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-thesaurus-doc() {
-  pkgdesc="Documentation for Thesaurus"
-  conflicts=('koffice-thesaurus-doc')
-  replaces=('koffice-thesaurus-doc')
-
-  cd "${srcdir}"/build/doc/thesaurus
-  make DESTDIR="${pkgdir}" install
-}
-
 package_calligra-braindump() {
   pkgdesc="Notes and idea gathering"
+  depends=('calligra-libs' 'kdebase-runtime')
   install=calligra-braindump.install
 
   cd "${srcdir}"/build/braindump
@@ -268,12 +259,11 @@ package_calligra-braindump() {
 
 package_calligra-flow() {
   pkgdesc="Flowchart & Diagram Editing"
-  install=calligra-flow.install
+  depends=('calligra-libs' 'kdebase-runtime')
   conflicts=('calligra-flow-doc')
   replaces=('calligra-flow-doc')
+  install=calligra-flow.install
 
   cd "${srcdir}"/build/flow
   make DESTDIR="${pkgdir}" install
 }
-
-##### package apps done #####