Date: Tuesday, October 20, 2015 @ 10:15:00 Author: bluewind Revision: 249539
archrelease: copy trunk to staging-i686, staging-x86_64 Added: calligra/repos/staging-i686/ calligra/repos/staging-i686/PKGBUILD (from rev 249538, calligra/trunk/PKGBUILD) calligra/repos/staging-i686/calligra-braindump.install (from rev 249538, calligra/trunk/calligra-braindump.install) calligra/repos/staging-i686/calligra-extras.install (from rev 249538, calligra/trunk/calligra-extras.install) calligra/repos/staging-i686/calligra-filters.install (from rev 249538, calligra/trunk/calligra-filters.install) calligra/repos/staging-i686/calligra-flow.install (from rev 249538, calligra/trunk/calligra-flow.install) calligra/repos/staging-i686/calligra-gemini.install (from rev 249538, calligra/trunk/calligra-gemini.install) calligra/repos/staging-i686/calligra-karbon.install (from rev 249538, calligra/trunk/calligra-karbon.install) calligra/repos/staging-i686/calligra-kexi.install (from rev 249538, calligra/trunk/calligra-kexi.install) calligra/repos/staging-i686/calligra-krita.install (from rev 249538, calligra/trunk/calligra-krita.install) calligra/repos/staging-i686/calligra-plan.install (from rev 249538, calligra/trunk/calligra-plan.install) calligra/repos/staging-i686/calligra-plugins.install (from rev 249538, calligra/trunk/calligra-plugins.install) calligra/repos/staging-i686/calligra-sheets.install (from rev 249538, calligra/trunk/calligra-sheets.install) calligra/repos/staging-i686/calligra-stage.install (from rev 249538, calligra/trunk/calligra-stage.install) calligra/repos/staging-i686/calligra-words.install (from rev 249538, calligra/trunk/calligra-words.install) calligra/repos/staging-i686/calligra.install (from rev 249538, calligra/trunk/calligra.install) calligra/repos/staging-i686/libwps-0.4.patch (from rev 249538, calligra/trunk/libwps-0.4.patch) calligra/repos/staging-x86_64/ calligra/repos/staging-x86_64/PKGBUILD (from rev 249538, calligra/trunk/PKGBUILD) calligra/repos/staging-x86_64/calligra-braindump.install (from rev 249538, calligra/trunk/calligra-braindump.install) calligra/repos/staging-x86_64/calligra-extras.install (from rev 249538, calligra/trunk/calligra-extras.install) calligra/repos/staging-x86_64/calligra-filters.install (from rev 249538, calligra/trunk/calligra-filters.install) calligra/repos/staging-x86_64/calligra-flow.install (from rev 249538, calligra/trunk/calligra-flow.install) calligra/repos/staging-x86_64/calligra-gemini.install (from rev 249538, calligra/trunk/calligra-gemini.install) calligra/repos/staging-x86_64/calligra-karbon.install (from rev 249538, calligra/trunk/calligra-karbon.install) calligra/repos/staging-x86_64/calligra-kexi.install (from rev 249538, calligra/trunk/calligra-kexi.install) calligra/repos/staging-x86_64/calligra-krita.install (from rev 249538, calligra/trunk/calligra-krita.install) calligra/repos/staging-x86_64/calligra-plan.install (from rev 249538, calligra/trunk/calligra-plan.install) calligra/repos/staging-x86_64/calligra-plugins.install (from rev 249538, calligra/trunk/calligra-plugins.install) calligra/repos/staging-x86_64/calligra-sheets.install (from rev 249538, calligra/trunk/calligra-sheets.install) calligra/repos/staging-x86_64/calligra-stage.install (from rev 249538, calligra/trunk/calligra-stage.install) calligra/repos/staging-x86_64/calligra-words.install (from rev 249538, calligra/trunk/calligra-words.install) calligra/repos/staging-x86_64/calligra.install (from rev 249538, calligra/trunk/calligra.install) calligra/repos/staging-x86_64/libwps-0.4.patch (from rev 249538, calligra/trunk/libwps-0.4.patch) -------------------------------------------+ staging-i686/PKGBUILD | 249 ++++++++++++++++++++++++++++ staging-i686/calligra-braindump.install | 12 + staging-i686/calligra-extras.install | 11 + staging-i686/calligra-filters.install | 12 + staging-i686/calligra-flow.install | 12 + staging-i686/calligra-gemini.install | 12 + staging-i686/calligra-karbon.install | 12 + staging-i686/calligra-kexi.install | 12 + staging-i686/calligra-krita.install | 13 + staging-i686/calligra-plan.install | 12 + staging-i686/calligra-plugins.install | 11 + staging-i686/calligra-sheets.install | 12 + staging-i686/calligra-stage.install | 12 + staging-i686/calligra-words.install | 12 + staging-i686/calligra.install | 11 + staging-i686/libwps-0.4.patch | 51 +++++ staging-x86_64/PKGBUILD | 249 ++++++++++++++++++++++++++++ staging-x86_64/calligra-braindump.install | 12 + staging-x86_64/calligra-extras.install | 11 + staging-x86_64/calligra-filters.install | 12 + staging-x86_64/calligra-flow.install | 12 + staging-x86_64/calligra-gemini.install | 12 + staging-x86_64/calligra-karbon.install | 12 + staging-x86_64/calligra-kexi.install | 12 + staging-x86_64/calligra-krita.install | 13 + staging-x86_64/calligra-plan.install | 12 + staging-x86_64/calligra-plugins.install | 11 + staging-x86_64/calligra-sheets.install | 12 + staging-x86_64/calligra-stage.install | 12 + staging-x86_64/calligra-words.install | 12 + staging-x86_64/calligra.install | 11 + staging-x86_64/libwps-0.4.patch | 51 +++++ 32 files changed, 932 insertions(+) Copied: calligra/repos/staging-i686/PKGBUILD (from rev 249538, calligra/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,249 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Ronald van Haren <ronald.archlinux.org> + +pkgbase=calligra +pkgname=('calligra-braindump' + 'calligra-devtools' + 'calligra-extras' + 'calligra-filters' + 'calligra-flow' + 'calligra-gemini' + 'calligra-handbook' + 'calligra-karbon' + 'calligra-kexi' + 'calligra-krita' + 'calligra-libs' + 'calligra-plan' + 'calligra-plugins' + 'calligra-sheets' + 'calligra-stage' + 'calligra-words') +pkgver=2.9.8 +pkgrel=2 +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' 'opencolorio' + 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libkdcraw' 'libodfgen' + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio' + 'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2' +groups=('calligra') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz" 'libwps-0.4.patch') +md5sums=('c731ceb46211aea2a0e1798f646e0bcb' + '6ea15f8b3938838d89ea0aa08921afd1') + +prepare() { + mkdir -p build + +# 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() { + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_active=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 +} + +package_calligra-filters() { + pkgdesc="Filters for the Calligra office suite" + depends=('libodfgen') + optdepends=('libwpg: Corel WordPerfect Graphics image importer' + 'libwps: Microsoft Works file word processor format import' + 'libvisio: Microsoft Visio import filter' + 'libetonyek: Apple Keynote import filter') + install=calligra-filters.install + + cd build/filters + make DESTDIR="${pkgdir}" install +} + +package_calligra-libs() { + pkgdesc="Libraries for the Calligra office suite" + depends=('kdepimlibs4' 'libkactivities4') + conflicts=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes') + replaces=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes') + + for d in interfaces libs pics servicetypes; do + cd "${srcdir}"/build/${d} + make DESTDIR="${pkgdir}" install + done +} + +package_calligra-plugins() { + pkgdesc="Plugins for the Calligra office suite" + depends=('calligra-libs' 'calligra-filters' 'libspnav') + optdepends=('libmarble4: map shape for Calligra') + install=calligra-plugins.install + + cd build/plugins + make DESTDIR="${pkgdir}" install + + cd ../3rdparty/kdchart + make DESTDIR="${pkgdir}" install +} + +package_calligra-karbon() { + pkgdesc="Create scalable vector drawings" + depends=('calligra-libs' 'kdebase-runtime' 'pstoedit') + optdepends=('calligra-filters: import/export filters' + 'calligra-extras: extra calligra tools') + install=calligra-karbon.install + + cd build/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') + install=calligra-kexi.install + + 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') + install=calligra-plan.install + + cd build/plan + make DESTDIR="${pkgdir}" install + + cd ../3rdparty/kdgantt + make DESTDIR="${pkgdir}" install +} + +package_calligra-stage() { + pkgdesc="Write presentation documents" + depends=('calligra-plugins' 'kdebase-runtime') + install=calligra-stage.install + + cd build/stage + make DESTDIR="${pkgdir}" install + cd ../doc/stage + make DESTDIR="${pkgdir}" install +} + +package_calligra-krita() { + pkgdesc="Edit and paint images" + depends=('calligra-plugins' 'kdebase-runtime' 'opencolorio' 'libkdcraw' + 'fftw' 'glew' 'curl' 'gsl') + install=calligra-krita.install + + cd build/krita + make DESTDIR="${pkgdir}" install +} + +package_calligra-sheets() { + pkgdesc="Write spreadsheet documents" + depends=('calligra-libs' 'gsl' 'kdebase-runtime') + optdepends=('calligra-filters: import/export filters' + 'calligra-plugins: extra calligra plugins' + 'calligra-extras: extra calligra tools') + install=calligra-sheets.install + + cd build/sheets + make DESTDIR="${pkgdir}" install + cd ../doc/sheets + make DESTDIR="${pkgdir}" install +} + +package_calligra-words() { + pkgdesc="Word Processor" + depends=('kdebase-runtime' 'calligra-plugins') + optdepends=('calligra-extras: extra calligra tools') + install=calligra-words.install + + cd build/words + make DESTDIR="${pkgdir}" install +} + +package_calligra-handbook() { + pkgdesc="Documentation for Calligra" + options=('docs') + + cd build/doc/calligra + make DESTDIR="${pkgdir}" install +} + +package_calligra-braindump() { + pkgdesc="Notes and idea gathering" + depends=('calligra-libs' 'kdebase-runtime') + install=calligra-braindump.install + + cd build/braindump + make DESTDIR="${pkgdir}" install +} + +package_calligra-flow() { + pkgdesc="Flowchart & Diagram Editing" + depends=('calligra-words') + optdepends=('calligra-karbon: to export the charts in various formats') + install=calligra-flow.install + + cd build/flow + make DESTDIR="${pkgdir}" install +} + +package_calligra-extras() { + pkgdesc="Calligra suite extras" + depends=('calligra-libs') + optdepends=('kdegraphics-okular') + conflicts=('calligra-tools') + replaces=('calligra-tools') + install=calligra-extras.install + + cd build/extras + make DESTDIR="${pkgdir}" install + + cd ../data + make DESTDIR="${pkgdir}" install +} + +package_calligra-devtools() { + pkgdesc="Calligra developer tools" + depends=('calligra-libs') + + cd build/devtools + make DESTDIR="${pkgdir}" install +} + +package_calligra-gemini() { + pkgdesc="QML interface for Calligra Words and Stage" + depends=('calligra-words' 'calligra-stage') +# optdepends=('libqgit2: GIT plugin') + install=calligra-gemini.install + + cd build/qtquick + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/gemini + make DESTDIR="${pkgdir}" install +} Copied: calligra/repos/staging-i686/calligra-braindump.install (from rev 249538, calligra/trunk/calligra-braindump.install) =================================================================== --- staging-i686/calligra-braindump.install (rev 0) +++ staging-i686/calligra-braindump.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Copied: calligra/repos/staging-i686/calligra-extras.install (from rev 249538, calligra/trunk/calligra-extras.install) =================================================================== --- staging-i686/calligra-extras.install (rev 0) +++ staging-i686/calligra-extras.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-i686/calligra-filters.install (from rev 249538, calligra/trunk/calligra-filters.install) =================================================================== --- staging-i686/calligra-filters.install (rev 0) +++ staging-i686/calligra-filters.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-i686/calligra-flow.install (from rev 249538, calligra/trunk/calligra-flow.install) =================================================================== --- staging-i686/calligra-flow.install (rev 0) +++ staging-i686/calligra-flow.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-i686/calligra-gemini.install (from rev 249538, calligra/trunk/calligra-gemini.install) =================================================================== --- staging-i686/calligra-gemini.install (rev 0) +++ staging-i686/calligra-gemini.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Copied: calligra/repos/staging-i686/calligra-karbon.install (from rev 249538, calligra/trunk/calligra-karbon.install) =================================================================== --- staging-i686/calligra-karbon.install (rev 0) +++ staging-i686/calligra-karbon.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Copied: calligra/repos/staging-i686/calligra-kexi.install (from rev 249538, calligra/trunk/calligra-kexi.install) =================================================================== --- staging-i686/calligra-kexi.install (rev 0) +++ staging-i686/calligra-kexi.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-i686/calligra-krita.install (from rev 249538, calligra/trunk/calligra-krita.install) =================================================================== --- staging-i686/calligra-krita.install (rev 0) +++ staging-i686/calligra-krita.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Copied: calligra/repos/staging-i686/calligra-plan.install (from rev 249538, calligra/trunk/calligra-plan.install) =================================================================== --- staging-i686/calligra-plan.install (rev 0) +++ staging-i686/calligra-plan.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Copied: calligra/repos/staging-i686/calligra-plugins.install (from rev 249538, calligra/trunk/calligra-plugins.install) =================================================================== --- staging-i686/calligra-plugins.install (rev 0) +++ staging-i686/calligra-plugins.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-i686/calligra-sheets.install (from rev 249538, calligra/trunk/calligra-sheets.install) =================================================================== --- staging-i686/calligra-sheets.install (rev 0) +++ staging-i686/calligra-sheets.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-i686/calligra-stage.install (from rev 249538, calligra/trunk/calligra-stage.install) =================================================================== --- staging-i686/calligra-stage.install (rev 0) +++ staging-i686/calligra-stage.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-i686/calligra-words.install (from rev 249538, calligra/trunk/calligra-words.install) =================================================================== --- staging-i686/calligra-words.install (rev 0) +++ staging-i686/calligra-words.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-i686/calligra.install (from rev 249538, calligra/trunk/calligra.install) =================================================================== --- staging-i686/calligra.install (rev 0) +++ staging-i686/calligra.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-i686/libwps-0.4.patch (from rev 249538, calligra/trunk/libwps-0.4.patch) =================================================================== --- staging-i686/libwps-0.4.patch (rev 0) +++ staging-i686/libwps-0.4.patch 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,51 @@ +From e81fe84405bc635dfa93e54fb8a3c8e6065dbf10 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtar...@redhat.com> +Date: Sat, 6 Jun 2015 18:27:24 +0200 +Subject: [PATCH] adapt to libwps 0.4 + +--- + cmake/modules/FindLibWps.cmake | 6 +++--- + filters/words/works/import/WPSImport.cpp | 4 +++- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake +index f8c8225..58ef2b5 100644 +--- a/cmake/modules/FindLibWps.cmake ++++ b/cmake/modules/FindLibWps.cmake +@@ -10,16 +10,16 @@ + + include(LibFindMacros) + libfind_package(LIBWPS LibWpd) +-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3) ++libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4) + + find_path(LIBWPS_INCLUDE_DIR + NAMES libwps/libwps.h + HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR} +- PATH_SUFFIXES libwps-0.3 ++ PATH_SUFFIXES libwps-0.4 + ) + + find_library(LIBWPS_LIBRARY +- NAMES wps wps-0.3 ++ NAMES wps wps-0.4 + HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR} + ) + +diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp +index eea2cc9..94b859d 100644 +--- a/filters/words/works/import/WPSImport.cpp ++++ b/filters/words/works/import/WPSImport.cpp +@@ -91,7 +91,9 @@ public: + bool isSupportedFormat(librevenge::RVNGInputStream &input) + { + WPSKind kind = WPS_TEXT; +- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind); ++ WPSCreator creator = WPS_MSWORKS; ++ bool needsEncoding = false; ++ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding); + if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT) + return false; + return true; +-- +2.4.2 Copied: calligra/repos/staging-x86_64/PKGBUILD (from rev 249538, calligra/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,249 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Ronald van Haren <ronald.archlinux.org> + +pkgbase=calligra +pkgname=('calligra-braindump' + 'calligra-devtools' + 'calligra-extras' + 'calligra-filters' + 'calligra-flow' + 'calligra-gemini' + 'calligra-handbook' + 'calligra-karbon' + 'calligra-kexi' + 'calligra-krita' + 'calligra-libs' + 'calligra-plan' + 'calligra-plugins' + 'calligra-sheets' + 'calligra-stage' + 'calligra-words') +pkgver=2.9.8 +pkgrel=2 +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' 'opencolorio' + 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libkdcraw' 'libodfgen' + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio' + 'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2' +groups=('calligra') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz" 'libwps-0.4.patch') +md5sums=('c731ceb46211aea2a0e1798f646e0bcb' + '6ea15f8b3938838d89ea0aa08921afd1') + +prepare() { + mkdir -p build + +# 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() { + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_active=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 +} + +package_calligra-filters() { + pkgdesc="Filters for the Calligra office suite" + depends=('libodfgen') + optdepends=('libwpg: Corel WordPerfect Graphics image importer' + 'libwps: Microsoft Works file word processor format import' + 'libvisio: Microsoft Visio import filter' + 'libetonyek: Apple Keynote import filter') + install=calligra-filters.install + + cd build/filters + make DESTDIR="${pkgdir}" install +} + +package_calligra-libs() { + pkgdesc="Libraries for the Calligra office suite" + depends=('kdepimlibs4' 'libkactivities4') + conflicts=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes') + replaces=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes') + + for d in interfaces libs pics servicetypes; do + cd "${srcdir}"/build/${d} + make DESTDIR="${pkgdir}" install + done +} + +package_calligra-plugins() { + pkgdesc="Plugins for the Calligra office suite" + depends=('calligra-libs' 'calligra-filters' 'libspnav') + optdepends=('libmarble4: map shape for Calligra') + install=calligra-plugins.install + + cd build/plugins + make DESTDIR="${pkgdir}" install + + cd ../3rdparty/kdchart + make DESTDIR="${pkgdir}" install +} + +package_calligra-karbon() { + pkgdesc="Create scalable vector drawings" + depends=('calligra-libs' 'kdebase-runtime' 'pstoedit') + optdepends=('calligra-filters: import/export filters' + 'calligra-extras: extra calligra tools') + install=calligra-karbon.install + + cd build/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') + install=calligra-kexi.install + + 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') + install=calligra-plan.install + + cd build/plan + make DESTDIR="${pkgdir}" install + + cd ../3rdparty/kdgantt + make DESTDIR="${pkgdir}" install +} + +package_calligra-stage() { + pkgdesc="Write presentation documents" + depends=('calligra-plugins' 'kdebase-runtime') + install=calligra-stage.install + + cd build/stage + make DESTDIR="${pkgdir}" install + cd ../doc/stage + make DESTDIR="${pkgdir}" install +} + +package_calligra-krita() { + pkgdesc="Edit and paint images" + depends=('calligra-plugins' 'kdebase-runtime' 'opencolorio' 'libkdcraw' + 'fftw' 'glew' 'curl' 'gsl') + install=calligra-krita.install + + cd build/krita + make DESTDIR="${pkgdir}" install +} + +package_calligra-sheets() { + pkgdesc="Write spreadsheet documents" + depends=('calligra-libs' 'gsl' 'kdebase-runtime') + optdepends=('calligra-filters: import/export filters' + 'calligra-plugins: extra calligra plugins' + 'calligra-extras: extra calligra tools') + install=calligra-sheets.install + + cd build/sheets + make DESTDIR="${pkgdir}" install + cd ../doc/sheets + make DESTDIR="${pkgdir}" install +} + +package_calligra-words() { + pkgdesc="Word Processor" + depends=('kdebase-runtime' 'calligra-plugins') + optdepends=('calligra-extras: extra calligra tools') + install=calligra-words.install + + cd build/words + make DESTDIR="${pkgdir}" install +} + +package_calligra-handbook() { + pkgdesc="Documentation for Calligra" + options=('docs') + + cd build/doc/calligra + make DESTDIR="${pkgdir}" install +} + +package_calligra-braindump() { + pkgdesc="Notes and idea gathering" + depends=('calligra-libs' 'kdebase-runtime') + install=calligra-braindump.install + + cd build/braindump + make DESTDIR="${pkgdir}" install +} + +package_calligra-flow() { + pkgdesc="Flowchart & Diagram Editing" + depends=('calligra-words') + optdepends=('calligra-karbon: to export the charts in various formats') + install=calligra-flow.install + + cd build/flow + make DESTDIR="${pkgdir}" install +} + +package_calligra-extras() { + pkgdesc="Calligra suite extras" + depends=('calligra-libs') + optdepends=('kdegraphics-okular') + conflicts=('calligra-tools') + replaces=('calligra-tools') + install=calligra-extras.install + + cd build/extras + make DESTDIR="${pkgdir}" install + + cd ../data + make DESTDIR="${pkgdir}" install +} + +package_calligra-devtools() { + pkgdesc="Calligra developer tools" + depends=('calligra-libs') + + cd build/devtools + make DESTDIR="${pkgdir}" install +} + +package_calligra-gemini() { + pkgdesc="QML interface for Calligra Words and Stage" + depends=('calligra-words' 'calligra-stage') +# optdepends=('libqgit2: GIT plugin') + install=calligra-gemini.install + + cd build/qtquick + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/gemini + make DESTDIR="${pkgdir}" install +} Copied: calligra/repos/staging-x86_64/calligra-braindump.install (from rev 249538, calligra/trunk/calligra-braindump.install) =================================================================== --- staging-x86_64/calligra-braindump.install (rev 0) +++ staging-x86_64/calligra-braindump.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Copied: calligra/repos/staging-x86_64/calligra-extras.install (from rev 249538, calligra/trunk/calligra-extras.install) =================================================================== --- staging-x86_64/calligra-extras.install (rev 0) +++ staging-x86_64/calligra-extras.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-x86_64/calligra-filters.install (from rev 249538, calligra/trunk/calligra-filters.install) =================================================================== --- staging-x86_64/calligra-filters.install (rev 0) +++ staging-x86_64/calligra-filters.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-x86_64/calligra-flow.install (from rev 249538, calligra/trunk/calligra-flow.install) =================================================================== --- staging-x86_64/calligra-flow.install (rev 0) +++ staging-x86_64/calligra-flow.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-x86_64/calligra-gemini.install (from rev 249538, calligra/trunk/calligra-gemini.install) =================================================================== --- staging-x86_64/calligra-gemini.install (rev 0) +++ staging-x86_64/calligra-gemini.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Copied: calligra/repos/staging-x86_64/calligra-karbon.install (from rev 249538, calligra/trunk/calligra-karbon.install) =================================================================== --- staging-x86_64/calligra-karbon.install (rev 0) +++ staging-x86_64/calligra-karbon.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Copied: calligra/repos/staging-x86_64/calligra-kexi.install (from rev 249538, calligra/trunk/calligra-kexi.install) =================================================================== --- staging-x86_64/calligra-kexi.install (rev 0) +++ staging-x86_64/calligra-kexi.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-x86_64/calligra-krita.install (from rev 249538, calligra/trunk/calligra-krita.install) =================================================================== --- staging-x86_64/calligra-krita.install (rev 0) +++ staging-x86_64/calligra-krita.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Copied: calligra/repos/staging-x86_64/calligra-plan.install (from rev 249538, calligra/trunk/calligra-plan.install) =================================================================== --- staging-x86_64/calligra-plan.install (rev 0) +++ staging-x86_64/calligra-plan.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Copied: calligra/repos/staging-x86_64/calligra-plugins.install (from rev 249538, calligra/trunk/calligra-plugins.install) =================================================================== --- staging-x86_64/calligra-plugins.install (rev 0) +++ staging-x86_64/calligra-plugins.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-x86_64/calligra-sheets.install (from rev 249538, calligra/trunk/calligra-sheets.install) =================================================================== --- staging-x86_64/calligra-sheets.install (rev 0) +++ staging-x86_64/calligra-sheets.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-x86_64/calligra-stage.install (from rev 249538, calligra/trunk/calligra-stage.install) =================================================================== --- staging-x86_64/calligra-stage.install (rev 0) +++ staging-x86_64/calligra-stage.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-x86_64/calligra-words.install (from rev 249538, calligra/trunk/calligra-words.install) =================================================================== --- staging-x86_64/calligra-words.install (rev 0) +++ staging-x86_64/calligra-words.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-x86_64/calligra.install (from rev 249538, calligra/trunk/calligra.install) =================================================================== --- staging-x86_64/calligra.install (rev 0) +++ staging-x86_64/calligra.install 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: calligra/repos/staging-x86_64/libwps-0.4.patch (from rev 249538, calligra/trunk/libwps-0.4.patch) =================================================================== --- staging-x86_64/libwps-0.4.patch (rev 0) +++ staging-x86_64/libwps-0.4.patch 2015-10-20 08:15:00 UTC (rev 249539) @@ -0,0 +1,51 @@ +From e81fe84405bc635dfa93e54fb8a3c8e6065dbf10 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtar...@redhat.com> +Date: Sat, 6 Jun 2015 18:27:24 +0200 +Subject: [PATCH] adapt to libwps 0.4 + +--- + cmake/modules/FindLibWps.cmake | 6 +++--- + filters/words/works/import/WPSImport.cpp | 4 +++- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake +index f8c8225..58ef2b5 100644 +--- a/cmake/modules/FindLibWps.cmake ++++ b/cmake/modules/FindLibWps.cmake +@@ -10,16 +10,16 @@ + + include(LibFindMacros) + libfind_package(LIBWPS LibWpd) +-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3) ++libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4) + + find_path(LIBWPS_INCLUDE_DIR + NAMES libwps/libwps.h + HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR} +- PATH_SUFFIXES libwps-0.3 ++ PATH_SUFFIXES libwps-0.4 + ) + + find_library(LIBWPS_LIBRARY +- NAMES wps wps-0.3 ++ NAMES wps wps-0.4 + HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR} + ) + +diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp +index eea2cc9..94b859d 100644 +--- a/filters/words/works/import/WPSImport.cpp ++++ b/filters/words/works/import/WPSImport.cpp +@@ -91,7 +91,9 @@ public: + bool isSupportedFormat(librevenge::RVNGInputStream &input) + { + WPSKind kind = WPS_TEXT; +- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind); ++ WPSCreator creator = WPS_MSWORKS; ++ bool needsEncoding = false; ++ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding); + if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT) + return false; + return true; +-- +2.4.2