extra/calligra to 2.9.11-7

extra/calligra/PKGBUILD

@@ -17,7 +17,6 @@ pkgname=('calligra-braindump'
          'calligra-gemini'
          'calligra-handbook'
          'calligra-karbon'
-         'calligra-kexi'
          'calligra-libs'
          'calligra-plan'
          'calligra-plugins'
@@ -25,15 +24,13 @@ pkgname=('calligra-braindump'
          'calligra-stage'
          'calligra-words')
 pkgver=2.9.11
-pkgrel=5
+pkgrel=7
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' 'libmarble4'
-             'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg'
-             'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'libvisio'
-             'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2'
+makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen'
+             'lcms2' 'libwpg' 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen'
+             'kdegraphics-okular' 'pstoedit' 'libvisio' 'libetonyek' 'libspnav')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz" 'libwps-0.4.patch'
         'https://github.com/KDE/calligra/commit/956bb80db4f300e4f8edeaf19d24fd61eb1932b2.patch'
@@ -50,11 +47,6 @@ prepare() {
   cd $pkgbase-$pkgver
   patch -p1 -i "$srcdir"/libwps-0.4.patch
 
-# Fix build against libmarble4
-  sed -e 's|PATH_SUFFIXES marble|PATH_SUFFIXES marble4|g' -i CMakeLists.txt
-  sed -e 's|#include <marble/|#include <marble4/|g' -e 's|#include "marble/|#include "marble4/|g' \
-    -i plugins/reporting/maps/{*.cpp,*.h,marble/*.h} -i kexi/plugins/forms/widgets/mapbrowser/{*.cpp,*.h}
-
 # Fix build on ARM
   patch -p1 -i ../956bb80db4f300e4f8edeaf19d24fd61eb1932b2.patch
   patch -p1 -i ../calligra-2.9.11-gcc6_arm.patch
@@ -69,9 +61,7 @@ build() {
     -DBUILD_active=OFF \
     -DWITH_Soprano=OFF \
     -DBUILD_krita=OFF \
-    -DMARBLE_INCLUDE_DIR=/usr/include/marble4 \
-    -DMARBLE_GLOBAL_HEADER=/usr/include/marble4/MarbleGlobal.h \
-    -DMARBLE_LIBRARIES=/usr/lib/libmarblewidget.so
+    -DBUILD_kexi=OFF
   make
 }
 
@@ -102,7 +92,6 @@ package_calligra-libs() {
 package_calligra-plugins() {
   pkgdesc="Plugins for the Calligra office suite"
   depends=('calligra-libs' 'calligra-filters' 'libspnav')
-  optdepends=('libmarble4: map shape for Calligra')
 
   cd build/plugins
   make DESTDIR="${pkgdir}" install
@@ -121,23 +110,6 @@ package_calligra-karbon() {
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-kexi() {
-  pkgdesc="Develop desktop database applications"
-  depends=('calligra-libs' 'glew' 'fftw')
-  optdepends=('libmariadbclient: MariaDB driver'
-              'libpqxx: PostgreSQL driver'
-              'freetds: Sybase & MS SQL driver'
-              'xbase: XBase driver'
-              'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
-              'libmarble4: map form widget'
-              'calligra-plugins: extra calligra plugins')
-
-  cd build/kexi
-  make DESTDIR="${pkgdir}" install
-  cd ../doc/kexi
-  make DESTDIR="${pkgdir}" install
-}
-
 package_calligra-plan() {
   pkgdesc="Calligra Project Management Component"
   depends=('calligra-words')