Date: Friday, November 25, 2016 @ 20:57:21 Author: arojas Revision: 282012
archrelease: copy trunk to extra-i686, extra-x86_64 Added: calligra/repos/extra-i686/PKGBUILD (from rev 282011, calligra/trunk/PKGBUILD) calligra/repos/extra-i686/libwps-0.4.patch (from rev 282011, calligra/trunk/libwps-0.4.patch) calligra/repos/extra-x86_64/PKGBUILD (from rev 282011, calligra/trunk/PKGBUILD) calligra/repos/extra-x86_64/libwps-0.4.patch (from rev 282011, calligra/trunk/libwps-0.4.patch) Deleted: calligra/repos/extra-i686/PKGBUILD calligra/repos/extra-i686/libwps-0.4.patch calligra/repos/extra-x86_64/PKGBUILD calligra/repos/extra-x86_64/libwps-0.4.patch -------------------------------+ /PKGBUILD | 398 ++++++++++++++++++++++++++++++++++++++++ /libwps-0.4.patch | 102 ++++++++++ extra-i686/PKGBUILD | 200 -------------------- extra-i686/libwps-0.4.patch | 51 ----- extra-x86_64/PKGBUILD | 200 -------------------- extra-x86_64/libwps-0.4.patch | 51 ----- 6 files changed, 500 insertions(+), 502 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-11-25 20:56:27 UTC (rev 282011) +++ extra-i686/PKGBUILD 2016-11-25 20:57:21 UTC (rev 282012) @@ -1,200 +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-braindump' - 'calligra-devtools' - 'calligra-extras' - 'calligra-filters' - 'calligra-flow' - 'calligra-gemini' - 'calligra-handbook' - 'calligra-karbon' - 'calligra-libs' - 'calligra-plan' - 'calligra-plugins' - 'calligra-sheets' - 'calligra-stage' - 'calligra-words') -pkgver=2.9.11 -pkgrel=7 -arch=('i686' 'x86_64') -url='http://www.calligra-suite.org/' -license=('FDL1.2' 'GPL2' 'LGPL') -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') -md5sums=('a1a4935debae64724cd4c0d17d61ae4e' - '6ea15f8b3938838d89ea0aa08921afd1') - -prepare() { - mkdir -p build - -# Fix build against libwps 0.4 - cd $pkgbase-$pkgver - patch -p1 -i "$srcdir"/libwps-0.4.patch -} - -build() { - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_active=OFF \ - -DWITH_Soprano=OFF \ - -DBUILD_krita=OFF \ - -DBUILD_kexi=OFF - 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') - - 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') - - 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') - - cd build/karbon - make DESTDIR="${pkgdir}" install -} - -package_calligra-plan() { - pkgdesc="Calligra Project Management Component" - depends=('calligra-words') - - 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') - - cd build/stage - make DESTDIR="${pkgdir}" install - cd ../doc/stage - 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') - - 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') - - 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') - - 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') - - 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') - - 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') - - cd build/qtquick - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/gemini - make DESTDIR="${pkgdir}" install -} Copied: calligra/repos/extra-i686/PKGBUILD (from rev 282011, calligra/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-11-25 20:57:21 UTC (rev 282012) @@ -0,0 +1,199 @@ +# $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-braindump' + 'calligra-devtools' + 'calligra-extras' + 'calligra-filters' + 'calligra-flow' + 'calligra-gemini' + 'calligra-handbook' + 'calligra-karbon' + 'calligra-libs' + 'calligra-plan' + 'calligra-plugins' + 'calligra-sheets' + 'calligra-stage' + 'calligra-words') +pkgver=2.9.11 +pkgrel=8 +arch=('i686' 'x86_64') +url='http://www.calligra-suite.org/' +license=('FDL1.2' 'GPL2' 'LGPL') +makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' + 'lcms2' 'libwpg' 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen' + 'pstoedit' 'libvisio' 'libetonyek' 'libspnav') +groups=('calligra') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz" 'libwps-0.4.patch') +md5sums=('a1a4935debae64724cd4c0d17d61ae4e' + '6ea15f8b3938838d89ea0aa08921afd1') + +prepare() { + mkdir -p build + +# Fix build against libwps 0.4 + cd $pkgbase-$pkgver + patch -p1 -i "$srcdir"/libwps-0.4.patch +} + +build() { + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_active=OFF \ + -DWITH_Soprano=OFF \ + -DBUILD_krita=OFF \ + -DBUILD_kexi=OFF + 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') + + cd build/filters + make DESTDIR="${pkgdir}" install +} + +package_calligra-libs() { + pkgdesc="Libraries for the Calligra office suite" + depends=('kdepimlibs4') + 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') + + 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') + + cd build/karbon + make DESTDIR="${pkgdir}" install +} + +package_calligra-plan() { + pkgdesc="Calligra Project Management Component" + depends=('calligra-words') + + 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') + + cd build/stage + make DESTDIR="${pkgdir}" install + cd ../doc/stage + 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') + + 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') + + 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') + + 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') + + cd build/flow + make DESTDIR="${pkgdir}" install +} + +package_calligra-extras() { + pkgdesc="Calligra suite extras" + depends=('calligra-libs') + conflicts=('calligra-tools') + replaces=('calligra-tools') + + 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') + + cd build/qtquick + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/gemini + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/libwps-0.4.patch =================================================================== --- extra-i686/libwps-0.4.patch 2016-11-25 20:56:27 UTC (rev 282011) +++ extra-i686/libwps-0.4.patch 2016-11-25 20:57:21 UTC (rev 282012) @@ -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 Copied: calligra/repos/extra-i686/libwps-0.4.patch (from rev 282011, calligra/trunk/libwps-0.4.patch) =================================================================== --- extra-i686/libwps-0.4.patch (rev 0) +++ extra-i686/libwps-0.4.patch 2016-11-25 20:57:21 UTC (rev 282012) @@ -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 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-11-25 20:56:27 UTC (rev 282011) +++ extra-x86_64/PKGBUILD 2016-11-25 20:57:21 UTC (rev 282012) @@ -1,200 +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-braindump' - 'calligra-devtools' - 'calligra-extras' - 'calligra-filters' - 'calligra-flow' - 'calligra-gemini' - 'calligra-handbook' - 'calligra-karbon' - 'calligra-libs' - 'calligra-plan' - 'calligra-plugins' - 'calligra-sheets' - 'calligra-stage' - 'calligra-words') -pkgver=2.9.11 -pkgrel=7 -arch=('i686' 'x86_64') -url='http://www.calligra-suite.org/' -license=('FDL1.2' 'GPL2' 'LGPL') -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') -md5sums=('a1a4935debae64724cd4c0d17d61ae4e' - '6ea15f8b3938838d89ea0aa08921afd1') - -prepare() { - mkdir -p build - -# Fix build against libwps 0.4 - cd $pkgbase-$pkgver - patch -p1 -i "$srcdir"/libwps-0.4.patch -} - -build() { - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_active=OFF \ - -DWITH_Soprano=OFF \ - -DBUILD_krita=OFF \ - -DBUILD_kexi=OFF - 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') - - 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') - - 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') - - cd build/karbon - make DESTDIR="${pkgdir}" install -} - -package_calligra-plan() { - pkgdesc="Calligra Project Management Component" - depends=('calligra-words') - - 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') - - cd build/stage - make DESTDIR="${pkgdir}" install - cd ../doc/stage - 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') - - 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') - - 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') - - 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') - - 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') - - 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') - - cd build/qtquick - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/gemini - make DESTDIR="${pkgdir}" install -} Copied: calligra/repos/extra-x86_64/PKGBUILD (from rev 282011, calligra/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-11-25 20:57:21 UTC (rev 282012) @@ -0,0 +1,199 @@ +# $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-braindump' + 'calligra-devtools' + 'calligra-extras' + 'calligra-filters' + 'calligra-flow' + 'calligra-gemini' + 'calligra-handbook' + 'calligra-karbon' + 'calligra-libs' + 'calligra-plan' + 'calligra-plugins' + 'calligra-sheets' + 'calligra-stage' + 'calligra-words') +pkgver=2.9.11 +pkgrel=8 +arch=('i686' 'x86_64') +url='http://www.calligra-suite.org/' +license=('FDL1.2' 'GPL2' 'LGPL') +makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' + 'lcms2' 'libwpg' 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen' + 'pstoedit' 'libvisio' 'libetonyek' 'libspnav') +groups=('calligra') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz" 'libwps-0.4.patch') +md5sums=('a1a4935debae64724cd4c0d17d61ae4e' + '6ea15f8b3938838d89ea0aa08921afd1') + +prepare() { + mkdir -p build + +# Fix build against libwps 0.4 + cd $pkgbase-$pkgver + patch -p1 -i "$srcdir"/libwps-0.4.patch +} + +build() { + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_active=OFF \ + -DWITH_Soprano=OFF \ + -DBUILD_krita=OFF \ + -DBUILD_kexi=OFF + 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') + + cd build/filters + make DESTDIR="${pkgdir}" install +} + +package_calligra-libs() { + pkgdesc="Libraries for the Calligra office suite" + depends=('kdepimlibs4') + 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') + + 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') + + cd build/karbon + make DESTDIR="${pkgdir}" install +} + +package_calligra-plan() { + pkgdesc="Calligra Project Management Component" + depends=('calligra-words') + + 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') + + cd build/stage + make DESTDIR="${pkgdir}" install + cd ../doc/stage + 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') + + 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') + + 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') + + 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') + + cd build/flow + make DESTDIR="${pkgdir}" install +} + +package_calligra-extras() { + pkgdesc="Calligra suite extras" + depends=('calligra-libs') + conflicts=('calligra-tools') + replaces=('calligra-tools') + + 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') + + cd build/qtquick + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/gemini + make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/libwps-0.4.patch =================================================================== --- extra-x86_64/libwps-0.4.patch 2016-11-25 20:56:27 UTC (rev 282011) +++ extra-x86_64/libwps-0.4.patch 2016-11-25 20:57:21 UTC (rev 282012) @@ -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 Copied: calligra/repos/extra-x86_64/libwps-0.4.patch (from rev 282011, calligra/trunk/libwps-0.4.patch) =================================================================== --- extra-x86_64/libwps-0.4.patch (rev 0) +++ extra-x86_64/libwps-0.4.patch 2016-11-25 20:57:21 UTC (rev 282012) @@ -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