From c31823259b93e7455d116b823733f66c770ba936 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 26 Sep 2020 17:41:37 -0400 Subject: [PATCH] calligra: revbump for libpoppler --- srcpkgs/calligra/template | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index d5255ff73b..abed8c2f34 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" @@ -15,6 +15,9 @@ makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2 poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel kauth-devel kparts-devel kcmutils-devel kdelibs4support-devel ktextwidgets-devel kross-devel kservice-devel kcrash-devel" +depends="calligra-filters calligra-libs calligra-plugins calligra-karbon + calligra-kexi calligra-stage calligra-sheets calligra-extras + calligra-words calligra-handbook calligra-gemini calligra-plan" short_desc="Illustration application" maintainer="John " license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later" @@ -24,13 +27,6 @@ checksum=b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147 replaces="calligra-braindump>=0 calligra-flow>=0" -subpackages="calligra-filters calligra-libs calligra-plugins calligra-karbon - calligra-kexi calligra-stage calligra-krita calligra-sheets calligra-extras - calligra-words calligra-handbook calligra-gemini calligra-devtools" -depends="calligra-filters calligra-libs calligra-plugins calligra-karbon - calligra-kexi calligra-stage calligra-sheets calligra-extras - calligra-words calligra-handbook calligra-gemini calligra-plan" - build_options="webengine" desc_option_webengine="Use Qt5 WebEngine for Calligra Gemini" @@ -58,11 +54,11 @@ post_patch() { # cmake doesn't detect the functions correctly pre_build() { case $XBPS_TARGET_MACHINE in - *-musl) cat >> build/filters/words/msword-odf/wv2/src/config.h <<_EOF -#define HAVE_FUNC_ISNAN 1 -#define HAVE_FUNC_ISINF 1 -#define HAVE_FUNC_ISFINITE 1 -_EOF + *-musl) cat >> build/filters/words/msword-odf/wv2/src/config.h <<-EOF + #define HAVE_FUNC_ISNAN 1 + #define HAVE_FUNC_ISINF 1 + #define HAVE_FUNC_ISFINITE 1 + EOF ;; esac } @@ -112,8 +108,6 @@ calligra-stage_package() { pkg_install() { cd ${wrksrc}/build/stage make DESTDIR=$PKGDESTDIR install - #cd ../doc/stage - #make DESTDIR=$PKGDESTDIR install } } calligra-krita_package() { @@ -126,8 +120,6 @@ calligra-sheets_package() { pkg_install() { cd ${wrksrc}/build/sheets make DESTDIR=$PKGDESTDIR install - #cd ../doc/sheets - #make DESTDIR=$PKGDESTDIR install } } calligra-words_package() { @@ -140,7 +132,6 @@ calligra-words_package() { } calligra-handbook_package() { build_style=meta - archs=noarch short_desc+=" - Documentation (removed temporarily)" #pkg_install() { # cd ${wrksrc}/build/doc/calligra