[arch-commits] Commit in calligra/trunk (PKGBUILD)

Andrea Scarpino andrea at archlinux.org
Mon Aug 20 08:29:59 UTC 2012


    Date: Monday, August 20, 2012 @ 04:29:58
  Author: andrea
Revision: 165454

Cleanup deps; build missing plugins; add missing docs; remove kounavail from words' dependencies (FS#31202)

Modified:
  calligra/trunk/PKGBUILD

----------+
 PKGBUILD |   37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-20 08:27:22 UTC (rev 165453)
+++ PKGBUILD	2012-08-20 08:29:58 UTC (rev 165454)
@@ -22,15 +22,14 @@
          'calligra-braindump'
          'calligra-flow')
 pkgver=2.5.0
-pkgrel=1
+pkgrel=2
 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'
-             'libwps' 'libwpg' 'pstoedit' 'glew'
-             'fftw' 'opengtl' 'lcms2' 'libkdcraw')
+makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
+             'lcms2' 'libmysqlclient' 'libpqxx' 'freetds' 'xbase' 'libwpg'
+             'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
+             'openjpeg' 'kdegraphics-okular' 'pstoedit')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
 md5sums=('bea9b5e9d95691caaba385ef5522a60d')
@@ -41,9 +40,7 @@
   cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_active=OFF \
-    -DBUILD_mobile=OFF \
-    -DIHAVEPATCHEDQT=1
+    -DBUILD_active=OFF
   make
 }
 
@@ -132,7 +129,7 @@
 
 package_calligra-karbon() {
   pkgdesc="Create scalable vector drawings"
-  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
+  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime' 'pstoedit')
   optdepends=('calligra-filters: import/export filters'
               'calligra-tools: extra calligra tools')
   conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
@@ -145,7 +142,7 @@
 
 package_calligra-kexi() {
   pkgdesc="Develop desktop database applications"
-  depends=('calligra-libs' 'calligra-templates')
+  depends=('calligra-libs' 'calligra-templates' 'glew' 'fftw')
   optdepends=('libmysqlclient: MySQL driver'
               'libpqxx: PostgreSQL driver'
               'freetds: Sybase & MS SQL driver'
@@ -159,6 +156,8 @@
 
   cd "${srcdir}"/build/kexi
   make DESTDIR="${pkgdir}" install
+  cd "${srcdir}"/build/doc/kexi
+  make DESTDIR="${pkgdir}" install
 }
 
 package_calligra-plan() {
@@ -182,12 +181,14 @@
 
   cd "${srcdir}"/build/stage
   make DESTDIR="${pkgdir}" install
+  cd "${srcdir}"/build/doc/stage
+  make DESTDIR="${pkgdir}" install
 }
 
 package_calligra-krita() {
   pkgdesc="Edit and paint images"
-  depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime'
-           'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw')
+  depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' 'eigen2'
+           'poppler-qt' 'libkdcraw' 'fftw' 'glew' 'opengtl')
   conflicts=('koffice-krita' 'calligra-krita-doc')
   replaces=('koffice-krita' 'calligra-krita-doc')
   install=calligra-krita.install
@@ -198,7 +199,7 @@
 
 package_calligra-sheets() {
   pkgdesc="Write spreadsheet documents"
-  depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime')
+  depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime' 'eigen2')
   optdepends=('calligra-filters: import/export filters'
               'calligra-plugins: extra calligra plugins'
               'calligra-tools: extra calligra tools')
@@ -208,12 +209,13 @@
 
   cd "${srcdir}"/build/sheets
   make DESTDIR="${pkgdir}" install
+  cd "${srcdir}"/build/doc/sheets
+  make DESTDIR="${pkgdir}" install
 }
 
 package_calligra-words() {
   pkgdesc="Word Processor"
-  depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail'
-           'calligra-plugins' 'kdegraphics-okular')
+  depends=('calligra-templates' 'calligra-pics' 'calligra-plugins' 'kdegraphics-okular')
   optdepends=('calligra-tools: extra calligra tools')
   conflicts=('koffice-kword')
   replaces=('koffice-kword')
@@ -227,6 +229,7 @@
   pkgdesc="Documentation for Calligra"
   conflicts=('koffice-handbook')
   replaces=('koffice-handbook')
+  options=('docs')
 
   cd "${srcdir}"/build/doc/calligra
   make DESTDIR="${pkgdir}" install
@@ -243,7 +246,7 @@
 
 package_calligra-flow() {
   pkgdesc="Flowchart & Diagram Editing"
-  depends=('calligra-words' 'kdebase-runtime')
+  depends=('calligra-words')
   conflicts=('calligra-flow-doc')
   replaces=('calligra-flow-doc')
   install=calligra-flow.install




More information about the arch-commits mailing list