From 11bbc2ddaff624e3f21eebdeee9f81804bebc757 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Fri, 6 May 2016 13:11:36 +0200 Subject: [PATCH] calligra: update to 2.9.11 Build against poppler-0.43.0. --- .../patches/0001-adapt-to-libwps-0.4.patch | 52 +++++++++++++++++++ srcpkgs/calligra/template | 11 ++-- 2 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/calligra/patches/0001-adapt-to-libwps-0.4.patch diff --git a/srcpkgs/calligra/patches/0001-adapt-to-libwps-0.4.patch b/srcpkgs/calligra/patches/0001-adapt-to-libwps-0.4.patch new file mode 100644 index 0000000000..6c2828c199 --- /dev/null +++ b/srcpkgs/calligra/patches/0001-adapt-to-libwps-0.4.patch @@ -0,0 +1,52 @@ +From e81fe84405bc635dfa93e54fb8a3c8e6065dbf10 Mon Sep 17 00:00:00 2001 +From: David Tardon +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 cmake/modules/FindLibWps.cmake cmake/modules/FindLibWps.cmake +index f8c8225..58ef2b5 100644 +--- cmake/modules/FindLibWps.cmake ++++ 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 filters/words/works/import/WPSImport.cpp filters/words/works/import/WPSImport.cpp +index eea2cc9..94b859d 100644 +--- filters/words/works/import/WPSImport.cpp ++++ 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 + diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 8b7313aa1c..db715cdd46 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra -version=2.9.7 -revision=7 +version=2.9.11 +revision=1 build_style=cmake configure_args="-Wno-dev -DBUILD_active=OFF -DWITH_Soprano=OFF" hostmakedepends="cmake automoc4 perl pkg-config eigen" @@ -17,7 +17,7 @@ makedepends="vc phonon-devel libpng-devel sqlite-devel boost-devel exiv2-devel license="GPL-2" homepage="http://www.calligra-suite.org/" distfiles="http://download.kde.org/stable/${pkgname}-${version}/${pkgname}-${version}.tar.xz" -checksum=7a641a1669739ff55809fd6f2c22d673843ac41f64e82f5ca6cb3e60c7c82781 +checksum=b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 subpackages="calligra-filters calligra-libs calligra-plugins calligra-karbon calligra-kexi calligra-plan calligra-stage calligra-krita calligra-sheets @@ -25,6 +25,11 @@ subpackages="calligra-filters calligra-libs calligra-plugins calligra-karbon calligra-extras calligra-devtools calligra-gemini" depends="${subpackages}" +CXXFLAGS="-D_DEFAULT_SOURCE" +case "$XBPS_TARGET_MACHINE" in + *-musl) broken="not yet supported";; +esac + do_install() { vdoc README }