From 0f0878ffa4f4c5d0c866103945604bb81cec5f98 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Wed, 1 Jun 2016 01:01:16 +0000 Subject: [PATCH] added extra/calligra --- extra/calligra/PKGBUILD | 236 ++++++++++++++++++++++++++++++++ extra/calligra/libwps-0.4.patch | 51 +++++++ 2 files changed, 287 insertions(+) create mode 100644 extra/calligra/PKGBUILD create mode 100644 extra/calligra/libwps-0.4.patch diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD new file mode 100644 index 000000000..5b12fc29b --- /dev/null +++ b/extra/calligra/PKGBUILD @@ -0,0 +1,236 @@ +# $Id$ +# Maintainer: Felix Yan +# Maintainer: Antonio Rojas +# Contributor: Andrea Scarpino +# Contributor: Ronald van Haren + +# ALARM: Kevin Mihelich +# - upstream patch for signed char on ARM + +pkgbase=calligra +pkgname=('calligra-braindump' + 'calligra-devtools' + 'calligra-extras' + 'calligra-filters' + 'calligra-flow' + 'calligra-gemini' + 'calligra-handbook' + 'calligra-karbon' + 'calligra-kexi' + 'calligra-libs' + 'calligra-plan' + 'calligra-plugins' + 'calligra-sheets' + 'calligra-stage' + 'calligra-words') +pkgver=2.9.11 +pkgrel=4 +arch=('i686' 'x86_64') +url='http://www.calligra-suite.org/' +license=('FDL1.2' 'GPL2' 'LGPL') +makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' 'libmarble4' + 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' + 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen' + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'libvisio' + 'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2' +groups=('calligra') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz" 'libwps-0.4.patch' + 'https://github.com/KDE/calligra/commit/956bb80db4f300e4f8edeaf19d24fd61eb1932b2.patch') +md5sums=('a1a4935debae64724cd4c0d17d61ae4e' + '6ea15f8b3938838d89ea0aa08921afd1' + '47305e6e25a076d5761e7b22a65b777e') + +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 +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