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

[Antonio Rojas]

    Date: Sunday, August 23, 2015 @ 17:10:16
  Author: arojas
Revision: 244739

libmarblewidget.so.22 rebuild

Modified:
  calligra/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-23 11:44:34 UTC (rev 244738)
+++ PKGBUILD	2015-08-23 15:10:16 UTC (rev 244739)
@@ -21,11 +21,11 @@
          'calligra-stage'
          'calligra-words')
 pkgver=2.9.6
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen' 'kdeedu-marble'
+makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen' 'libmarble4'
              'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
              'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw' 'libodfgen'
              'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio'
@@ -41,6 +41,11 @@
 # Fix build against libwps 0.4
   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}
 }
 
 build() {
@@ -50,7 +55,10 @@
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DBUILD_active=OFF \
-    -DWITH_Soprano=OFF
+    -DWITH_Soprano=OFF \
+    -DMARBLE_INCLUDE_DIR=/usr/include/marble4 \
+    -DMARBLE_GLOBAL_HEADER=/usr/include/marble4/MarbleGlobal.h \
+    -DMARBLE_LIBRARIES=/usr/lib/libmarblewidget.so
   make
 }
 
@@ -88,7 +96,7 @@
 package_calligra-plugins() {
   pkgdesc="Plugins for the Calligra office suite"
   depends=('calligra-libs' 'calligra-filters' 'libspnav')
-  optdepends=('kdeedu-marble: map shape for Calligra')
+  optdepends=('libmarble4: map shape for Calligra')
   conflicts=('koffice-plugins' 'koffice-kchart')
   replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
   install=calligra-plugins.install
@@ -121,7 +129,7 @@
               'freetds: Sybase & MS SQL driver'
               'xbase: XBase driver'
               'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
-              'kdeedu-marble: map form widget'
+              'libmarble4: 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')