Date: Monday, December 5, 2016 @ 21:15:43 Author: arojas Revision: 282853
archrelease: copy trunk to testing-i686, testing-x86_64 Added: calligra/repos/testing-i686/PKGBUILD (from rev 282852, calligra/trunk/PKGBUILD) calligra/repos/testing-x86_64/PKGBUILD (from rev 282852, calligra/trunk/PKGBUILD) Deleted: calligra/repos/testing-i686/PKGBUILD calligra/repos/testing-i686/libwps-0.4.patch calligra/repos/testing-x86_64/PKGBUILD calligra/repos/testing-x86_64/libwps-0.4.patch ---------------------------------+ /PKGBUILD | 330 ++++++++++++++++++++++++++++++++++++++ testing-i686/PKGBUILD | 151 ----------------- testing-i686/libwps-0.4.patch | 51 ----- testing-x86_64/PKGBUILD | 151 ----------------- testing-x86_64/libwps-0.4.patch | 51 ----- 5 files changed, 330 insertions(+), 404 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2016-12-05 21:15:09 UTC (rev 282852) +++ testing-i686/PKGBUILD 2016-12-05 21:15:43 UTC (rev 282853) @@ -1,151 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Ronald van Haren <ronald.archlinux.org> - -pkgbase=calligra -pkgname=('calligra-devtools' - 'calligra-extras' - 'calligra-filters' - 'calligra-handbook' - 'calligra-karbon' - 'calligra-libs' - 'calligra-plan' - 'calligra-plugins' - 'calligra-sheets' - 'calligra-stage' - 'calligra-words') -pkgver=3.0.0 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.calligra-suite.org/' -license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('extra-cmake-modules' 'kcmutils' 'kdoctools' 'python' 'kdelibs4support' 'knotifyconfig' - 'kdesignerplugin' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'khtml' 'boost' - 'libwpg' 'poppler-qt5' 'kdiagram' 'kreport' 'eigen' 'marble' 'openjpeg' 'pstoedit' 'libspnav' - 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'gsl' 'openexr' 'akonadi-contacts' 'kcalcore' - 'vc' 'qca-qt5' 'git') -groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.gz") -md5sums=('d658ed72aa7d5f2b0ebd8844007d4ac6') - -prepare() { - mkdir -p build -} - -build() { - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTING=OFF - make -} - -package_calligra-filters() { - pkgdesc="Filters for the Calligra office suite" - depends=('calligra-sheets' 'calligra-words' 'calligra-karbon' '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' - 'pstoedit: EPS to SVG filter' - 'poppler: PDF to SVG filter' - 'khtml: HTML to ODS filter' - 'openjpeg: PDF to SVG filer') - cd build/filters - make DESTDIR="$pkgdir" install -} - -package_calligra-libs() { - pkgdesc="Libraries for the Calligra office suite" - depends=('akonadi-contacts' 'ilmbase' 'kactivities' 'qca-qt5') - - 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-filters' 'libspnav' 'kdiagram') - - cd build/plugins - make DESTDIR="$pkgdir" install -} - -package_calligra-karbon() { - pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'hicolor-icon-theme') - optdepends=('calligra-filters: import/export filters' - 'calligra-extras: extra calligra tools') - - cd build/karbon - make DESTDIR="$pkgdir" install -} - -package_calligra-plan() { - pkgdesc="Calligra Project Management Component" - depends=('calligra-words' 'kreport' 'kcalcore' 'khtml' 'kdiagram') - - cd build/plan - make DESTDIR="$pkgdir" install -} - -package_calligra-stage() { - pkgdesc="Write presentation documents" - depends=('calligra-libs' 'qt5-webkit' 'hicolor-icon-theme') - - cd build/stage - make DESTDIR="$pkgdir" install -} - -package_calligra-sheets() { - pkgdesc="Write spreadsheet documents" - depends=('calligra-libs' 'gsl' 'kdelibs4support' 'kcmutils' 'knotifyconfig' 'hicolor-icon-theme') - optdepends=('calligra-filters: import/export filters' - 'calligra-plugins: extra calligra plugins' - 'calligra-extras: extra calligra tools') - - cd build/sheets - make DESTDIR="$pkgdir" install -} - -package_calligra-words() { - pkgdesc="Word Processor" - depends=('calligra-libs' 'hicolor-icon-theme') - optdepends=('calligra-extras: extra calligra tools') - - 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-extras() { - pkgdesc="Calligra suite extras" - depends=('calligra-libs') - - cd build/extras - make DESTDIR="$pkgdir" install - - cd ../data - make DESTDIR="$pkgdir" install -} - -package_calligra-devtools() { - pkgdesc="Calligra developer tools" - depends=('calligra-sheets' 'calligra-words' 'poppler-qt5') - - cd build/devtools - make DESTDIR="$pkgdir" install -} Copied: calligra/repos/testing-i686/PKGBUILD (from rev 282852, calligra/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-12-05 21:15:43 UTC (rev 282853) @@ -0,0 +1,165 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Ronald van Haren <ronald.archlinux.org> + +pkgbase=calligra +pkgname=('braindump' + 'calligra-devtools' + 'calligra-extras' + 'calligra-filters' + 'calligra-handbook' + 'karbon' + 'calligra-libs' + 'calligra-plan' + 'calligra-plugins' + 'calligra-sheets' + 'calligra-stage' + 'calligra-words') +pkgver=3.0.0 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://www.calligra-suite.org/' +license=('FDL1.2' 'GPL2' 'LGPL') +makedepends=('extra-cmake-modules' 'kcmutils' 'kdoctools' 'python' 'kdelibs4support' 'knotifyconfig' + 'kdesignerplugin' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'khtml' 'boost' + 'libwpg' 'poppler-qt5' 'kdiagram' 'kreport' 'eigen' 'marble' 'openjpeg' 'pstoedit' 'libspnav' + 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'gsl' 'openexr' 'akonadi-contacts' 'kcalcore' + 'vc' 'qca-qt5' 'git') +groups=('calligra') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.gz") +md5sums=('d658ed72aa7d5f2b0ebd8844007d4ac6') + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDE_INSTALL_LIBDIR=lib \ + -DBUILD_TESTING=OFF \ + -DBUILD_UNMAINTAINED=ON + make +} + +package_calligra-filters() { + pkgdesc="Filters for the Calligra office suite" + depends=('calligra-sheets' 'calligra-words' 'calligra-karbon' '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' + 'pstoedit: EPS to SVG filter' + 'poppler: PDF to SVG filter' + 'khtml: HTML to ODS filter' + 'openjpeg: PDF to SVG filer') + cd build/filters + make DESTDIR="$pkgdir" install +} + +package_braindump() { + pkgdesc="Notes and idea gathering" + depends=('qt5-webkit' 'hicolor-icon-theme' 'calligra-libs') + conflicts=('calligra-braindump') + replaces=('calligra-braindump') + + cd build/braindump + make DESTDIR="$pkgdir" install +} + +package_calligra-libs() { + pkgdesc="Libraries for the Calligra office suite" + depends=('akonadi-contacts' 'ilmbase' 'kactivities' 'qca-qt5') + + 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-filters' 'libspnav' 'kdiagram') + + cd build/plugins + make DESTDIR="$pkgdir" install +} + +package_karbon() { + pkgdesc="Create scalable vector drawings" + depends=('calligra-libs' 'hicolor-icon-theme') + optdepends=('calligra-filters: import/export filters' + 'calligra-extras: extra calligra tools') + conflicts=('calligra-karbon') + replaces=('calligra-karbon') + + cd build/karbon + make DESTDIR="$pkgdir" install +} + +package_calligra-plan() { + pkgdesc="Calligra Project Management Component" + depends=('calligra-words' 'kreport' 'kcalcore' 'khtml' 'kdiagram') + + cd build/plan + make DESTDIR="$pkgdir" install +} + +package_calligra-stage() { + pkgdesc="Write presentation documents" + depends=('calligra-libs' 'qt5-webkit' 'hicolor-icon-theme') + + cd build/stage + make DESTDIR="$pkgdir" install +} + +package_calligra-sheets() { + pkgdesc="Write spreadsheet documents" + depends=('calligra-libs' 'gsl' 'kdelibs4support' 'kcmutils' 'knotifyconfig' 'hicolor-icon-theme') + optdepends=('calligra-filters: import/export filters' + 'calligra-plugins: extra calligra plugins' + 'calligra-extras: extra calligra tools') + + cd build/sheets + make DESTDIR="$pkgdir" install +} + +package_calligra-words() { + pkgdesc="Word Processor" + depends=('calligra-libs' 'hicolor-icon-theme') + optdepends=('calligra-extras: extra calligra tools') + + 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-extras() { + pkgdesc="Calligra suite extras" + depends=('calligra-libs') + + cd build/extras + make DESTDIR="$pkgdir" install + + cd ../data + make DESTDIR="$pkgdir" install +} + +package_calligra-devtools() { + pkgdesc="Calligra developer tools" + depends=('calligra-sheets' 'calligra-words' 'poppler-qt5') + + cd build/devtools + make DESTDIR="$pkgdir" install +} Deleted: testing-i686/libwps-0.4.patch =================================================================== --- testing-i686/libwps-0.4.patch 2016-12-05 21:15:09 UTC (rev 282852) +++ testing-i686/libwps-0.4.patch 2016-12-05 21:15:43 UTC (rev 282853) @@ -1,51 +0,0 @@ -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 Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2016-12-05 21:15:09 UTC (rev 282852) +++ testing-x86_64/PKGBUILD 2016-12-05 21:15:43 UTC (rev 282853) @@ -1,151 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Ronald van Haren <ronald.archlinux.org> - -pkgbase=calligra -pkgname=('calligra-devtools' - 'calligra-extras' - 'calligra-filters' - 'calligra-handbook' - 'calligra-karbon' - 'calligra-libs' - 'calligra-plan' - 'calligra-plugins' - 'calligra-sheets' - 'calligra-stage' - 'calligra-words') -pkgver=3.0.0 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.calligra-suite.org/' -license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('extra-cmake-modules' 'kcmutils' 'kdoctools' 'python' 'kdelibs4support' 'knotifyconfig' - 'kdesignerplugin' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'khtml' 'boost' - 'libwpg' 'poppler-qt5' 'kdiagram' 'kreport' 'eigen' 'marble' 'openjpeg' 'pstoedit' 'libspnav' - 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'gsl' 'openexr' 'akonadi-contacts' 'kcalcore' - 'vc' 'qca-qt5' 'git') -groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.gz") -md5sums=('d658ed72aa7d5f2b0ebd8844007d4ac6') - -prepare() { - mkdir -p build -} - -build() { - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTING=OFF - make -} - -package_calligra-filters() { - pkgdesc="Filters for the Calligra office suite" - depends=('calligra-sheets' 'calligra-words' 'calligra-karbon' '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' - 'pstoedit: EPS to SVG filter' - 'poppler: PDF to SVG filter' - 'khtml: HTML to ODS filter' - 'openjpeg: PDF to SVG filer') - cd build/filters - make DESTDIR="$pkgdir" install -} - -package_calligra-libs() { - pkgdesc="Libraries for the Calligra office suite" - depends=('akonadi-contacts' 'ilmbase' 'kactivities' 'qca-qt5') - - 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-filters' 'libspnav' 'kdiagram') - - cd build/plugins - make DESTDIR="$pkgdir" install -} - -package_calligra-karbon() { - pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'hicolor-icon-theme') - optdepends=('calligra-filters: import/export filters' - 'calligra-extras: extra calligra tools') - - cd build/karbon - make DESTDIR="$pkgdir" install -} - -package_calligra-plan() { - pkgdesc="Calligra Project Management Component" - depends=('calligra-words' 'kreport' 'kcalcore' 'khtml' 'kdiagram') - - cd build/plan - make DESTDIR="$pkgdir" install -} - -package_calligra-stage() { - pkgdesc="Write presentation documents" - depends=('calligra-libs' 'qt5-webkit' 'hicolor-icon-theme') - - cd build/stage - make DESTDIR="$pkgdir" install -} - -package_calligra-sheets() { - pkgdesc="Write spreadsheet documents" - depends=('calligra-libs' 'gsl' 'kdelibs4support' 'kcmutils' 'knotifyconfig' 'hicolor-icon-theme') - optdepends=('calligra-filters: import/export filters' - 'calligra-plugins: extra calligra plugins' - 'calligra-extras: extra calligra tools') - - cd build/sheets - make DESTDIR="$pkgdir" install -} - -package_calligra-words() { - pkgdesc="Word Processor" - depends=('calligra-libs' 'hicolor-icon-theme') - optdepends=('calligra-extras: extra calligra tools') - - 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-extras() { - pkgdesc="Calligra suite extras" - depends=('calligra-libs') - - cd build/extras - make DESTDIR="$pkgdir" install - - cd ../data - make DESTDIR="$pkgdir" install -} - -package_calligra-devtools() { - pkgdesc="Calligra developer tools" - depends=('calligra-sheets' 'calligra-words' 'poppler-qt5') - - cd build/devtools - make DESTDIR="$pkgdir" install -} Copied: calligra/repos/testing-x86_64/PKGBUILD (from rev 282852, calligra/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-12-05 21:15:43 UTC (rev 282853) @@ -0,0 +1,165 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Ronald van Haren <ronald.archlinux.org> + +pkgbase=calligra +pkgname=('braindump' + 'calligra-devtools' + 'calligra-extras' + 'calligra-filters' + 'calligra-handbook' + 'karbon' + 'calligra-libs' + 'calligra-plan' + 'calligra-plugins' + 'calligra-sheets' + 'calligra-stage' + 'calligra-words') +pkgver=3.0.0 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://www.calligra-suite.org/' +license=('FDL1.2' 'GPL2' 'LGPL') +makedepends=('extra-cmake-modules' 'kcmutils' 'kdoctools' 'python' 'kdelibs4support' 'knotifyconfig' + 'kdesignerplugin' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'khtml' 'boost' + 'libwpg' 'poppler-qt5' 'kdiagram' 'kreport' 'eigen' 'marble' 'openjpeg' 'pstoedit' 'libspnav' + 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'gsl' 'openexr' 'akonadi-contacts' 'kcalcore' + 'vc' 'qca-qt5' 'git') +groups=('calligra') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.gz") +md5sums=('d658ed72aa7d5f2b0ebd8844007d4ac6') + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDE_INSTALL_LIBDIR=lib \ + -DBUILD_TESTING=OFF \ + -DBUILD_UNMAINTAINED=ON + make +} + +package_calligra-filters() { + pkgdesc="Filters for the Calligra office suite" + depends=('calligra-sheets' 'calligra-words' 'calligra-karbon' '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' + 'pstoedit: EPS to SVG filter' + 'poppler: PDF to SVG filter' + 'khtml: HTML to ODS filter' + 'openjpeg: PDF to SVG filer') + cd build/filters + make DESTDIR="$pkgdir" install +} + +package_braindump() { + pkgdesc="Notes and idea gathering" + depends=('qt5-webkit' 'hicolor-icon-theme' 'calligra-libs') + conflicts=('calligra-braindump') + replaces=('calligra-braindump') + + cd build/braindump + make DESTDIR="$pkgdir" install +} + +package_calligra-libs() { + pkgdesc="Libraries for the Calligra office suite" + depends=('akonadi-contacts' 'ilmbase' 'kactivities' 'qca-qt5') + + 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-filters' 'libspnav' 'kdiagram') + + cd build/plugins + make DESTDIR="$pkgdir" install +} + +package_karbon() { + pkgdesc="Create scalable vector drawings" + depends=('calligra-libs' 'hicolor-icon-theme') + optdepends=('calligra-filters: import/export filters' + 'calligra-extras: extra calligra tools') + conflicts=('calligra-karbon') + replaces=('calligra-karbon') + + cd build/karbon + make DESTDIR="$pkgdir" install +} + +package_calligra-plan() { + pkgdesc="Calligra Project Management Component" + depends=('calligra-words' 'kreport' 'kcalcore' 'khtml' 'kdiagram') + + cd build/plan + make DESTDIR="$pkgdir" install +} + +package_calligra-stage() { + pkgdesc="Write presentation documents" + depends=('calligra-libs' 'qt5-webkit' 'hicolor-icon-theme') + + cd build/stage + make DESTDIR="$pkgdir" install +} + +package_calligra-sheets() { + pkgdesc="Write spreadsheet documents" + depends=('calligra-libs' 'gsl' 'kdelibs4support' 'kcmutils' 'knotifyconfig' 'hicolor-icon-theme') + optdepends=('calligra-filters: import/export filters' + 'calligra-plugins: extra calligra plugins' + 'calligra-extras: extra calligra tools') + + cd build/sheets + make DESTDIR="$pkgdir" install +} + +package_calligra-words() { + pkgdesc="Word Processor" + depends=('calligra-libs' 'hicolor-icon-theme') + optdepends=('calligra-extras: extra calligra tools') + + 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-extras() { + pkgdesc="Calligra suite extras" + depends=('calligra-libs') + + cd build/extras + make DESTDIR="$pkgdir" install + + cd ../data + make DESTDIR="$pkgdir" install +} + +package_calligra-devtools() { + pkgdesc="Calligra developer tools" + depends=('calligra-sheets' 'calligra-words' 'poppler-qt5') + + cd build/devtools + make DESTDIR="$pkgdir" install +} Deleted: testing-x86_64/libwps-0.4.patch =================================================================== --- testing-x86_64/libwps-0.4.patch 2016-12-05 21:15:09 UTC (rev 282852) +++ testing-x86_64/libwps-0.4.patch 2016-12-05 21:15:43 UTC (rev 282853) @@ -1,51 +0,0 @@ -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