diff --git a/common/shlibs b/common/shlibs index 3290b32cef..dfd10b6e1d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2212,50 +2212,37 @@ libcollectdclient.so.1 libcollectdclient-5.5.0_1 libpinktrace_0.9.so.9 pinktrace-0.9.1_1 libsyd_1.0.so.0 sydbox-1.0.2_1 libcsync.so.0 csync-0.50.0_1 -libcalligrasheetsodf.so.14 calligra-sheets-2.9.7_1 -libkotext.so.14 calligra-libs-2.9.7_1 -libkoodf.so.14 calligra-libs-2.9.7_1 -libkarbonui.so.14 calligra-karbon-2.9.7_1 -libkomain.so.14 calligra-libs-2.9.7_1 -libkowidgets.so.14 calligra-libs-2.9.7_1 -libflake.so.14 calligra-libs-2.9.7_1 -libcalligrasheetscommon.so.14 calligra-sheets-2.9.7_1 -libkovectorimage.so.14 calligra-libs-2.9.7_1 -libwordsprivate.so.14 calligra-words-2.9.7_1 -libkotextlayout.so.14 calligra-libs-2.9.7_1 -libkowidgetutils.so.14 calligra-libs-2.9.7_1 -libkundo2.so.14 calligra-libs-2.9.7_1 -libkeximigrate.so.14 calligra-kexi-2.9.7_1 -libkexiutils.so.14 calligra-kexi-2.9.7_1 -libcalligradb.so.14 calligra-libs-2.9.7_1 -libkoreport.so.14 calligra-libs-2.9.7_1 -libpigmentcms.so.14 calligra-libs-2.9.7_1 -libkoproperty.so.14 calligra-libs-2.9.7_1 -libbasicflakes.so.14 calligra-libs-2.9.7_1 +libcalligrasheetsodf.so.16 calligra-sheets-3.1.0_1 +libkotext.so.16 calligra-libs-3.1.0_1 +libkoodf.so.16 calligra-libs-3.1.0_1 +libkarbonui.so.16 calligra-karbon-3.1.0_1 +libkomain.so.16 calligra-libs-3.1.0_1 +libkowidgets.so.16 calligra-libs-3.1.0_1 +libflake.so.16 calligra-libs-3.1.0_1 +libcalligrasheetscommon.so.16 calligra-sheets-3.1.0_1 +libkovectorimage.so.16 calligra-libs-3.1.0_1 +libwordsprivate.so.16 calligra-words-3.1.0_1 +libkotextlayout.so.16 calligra-libs-3.1.0_1 +libkowidgetutils.so.16 calligra-libs-3.1.0_1 +libkundo2.so.16 calligra-libs-3.1.0_1 +libpigmentcms.so.16 calligra-libs-3.1.0_1 +libbasicflakes.so.16 calligra-libs-3.1.0_1 libarpack.so.2 arpack-ng-3.3.0_2 -libkoplugin.so.14 calligra-libs-2.9.7_1 -libkoversion.so.14 calligra-libs-2.9.7_1 -libkopageapp.so.14 calligra-libs-2.9.7_1 -libkokross.so.14 calligra-libs-2.9.7_1 -libkomsooxml.so.14 calligra-filters-2.9.7_1 -libkoodf2.so.14 calligra-filters-2.9.7_1 +libkoplugin.so.16 calligra-libs-3.1.0_1 +libkoversion.so.16 calligra-libs-3.1.0_1 +libkopageapp.so.16 calligra-libs-3.1.0_1 +libkostore.so.16 calligra-libs-3.1.0_1 +libkomsooxml.so.16 calligra-filters-3.1.0_1 +libkoodf2.so.16 calligra-filters-3.1.0_1 libkowv2.so.9 calligra-filters-2.9.7_1 -libRtfReader.so.14 calligra-filters-2.9.7_1 -libkoodfreader.so.14 calligra-filters-2.9.7_1 -libkformula.so.14 calligra-plugins-2.9.7_1 -libcalligrakdchart.so.14 calligra-plugins-2.9.7_1 -libkarboncommon.so.14 calligra-karbon-2.9.7_1 -libkformdesigner.so.14 calligra-kexi-2.9.7_1 -libkexiguiutils.so.14 calligra-kexi-2.9.7_1 -libkexidatatable.so.14 calligra-kexi-2.9.7_1 -libkexidataviewcommon.so.14 calligra-kexi-2.9.7_1 -libkexiformutils.so.14 calligra-kexi-2.9.7_1 -libkexidb.so.14 calligra-kexi-2.9.7_1 -libkexirelationsview.so.14 calligra-kexi-2.9.7_1 -libkexiextendedwidgets.so.14 calligra-kexi-2.9.7_1 -libkexicore.so.14 calligra-kexi-2.9.7_1 -libkeximain.so.14 calligra-kexi-2.9.7_1 -libcalligrastageprivate.so.14 calligra-stage-2.9.7_1 +libRtfReader.so.16 calligra-filters-3.1.0_1 +libkoodfreader.so.16 calligra-filters-3.1.0_1 +libkoformula.so.16 calligra-plugins-3.1.0_1 +libkarboncommon.so.16 calligra-karbon-3.1.0_1 +libcalligrastageprivate.so.16 calligra-stage-3.1.0_1 +libkookularGenerator_odt.so.16 calligra-extras-3.1.0_1 +libkookularGenerator_odp.so.16 calligra-extras-3.1.0_1 +libgemini.so.16 calligra-gemini-3.1.0_1 libfts.so.0 musl-fts-1.2_2 libgavl.so.1 gavl-1.40_1 libmxml.so.1 mxml-2.9_1 diff --git a/srcpkgs/calligra-braindump b/srcpkgs/calligra-braindump deleted file mode 120000 index 789c6b2f9b..0000000000 --- a/srcpkgs/calligra-braindump +++ /dev/null @@ -1 +0,0 @@ -calligra \ No newline at end of file diff --git a/srcpkgs/calligra-flow b/srcpkgs/calligra-flow deleted file mode 120000 index 789c6b2f9b..0000000000 --- a/srcpkgs/calligra-flow +++ /dev/null @@ -1 +0,0 @@ -calligra \ No newline at end of file diff --git a/srcpkgs/calligra-plan b/srcpkgs/calligra-plan deleted file mode 120000 index 789c6b2f9b..0000000000 --- a/srcpkgs/calligra-plan +++ /dev/null @@ -1 +0,0 @@ -calligra \ No newline at end of file diff --git a/srcpkgs/calligra/patches/0001-adapt-to-libwps-0.4.patch b/srcpkgs/calligra/patches/0001-adapt-to-libwps-0.4.patch deleted file mode 100644 index 6c2828c199..0000000000 --- a/srcpkgs/calligra/patches/0001-adapt-to-libwps-0.4.patch +++ /dev/null @@ -1,52 +0,0 @@ -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/patches/boost-1.65.1.patch b/srcpkgs/calligra/patches/boost-1.65.1.patch deleted file mode 100644 index b25b2152b4..0000000000 --- a/srcpkgs/calligra/patches/boost-1.65.1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gemini/desktopviewproxy.cpp.orig 2016-02-02 19:53:13.000000000 +0000 -+++ gemini/desktopviewproxy.cpp 2017-09-24 23:12:38.399797914 +0000 -@@ -31,7 +31,7 @@ - #include - #include - --#include -+#include - #include - - #include diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index 94e3847c4e..23f0f41c4b 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,34 +1,44 @@ # Template file for 'calligra' pkgname=calligra -version=2.9.11 -revision=17 +version=3.1.0 +revision=1 build_style=cmake -configure_args="-Wno-dev -DBUILD_active=OFF -DWITH_Soprano=OFF -DBUILD_krita=OFF" -hostmakedepends="automoc4 perl pkg-config eigen3.2" +configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON" +hostmakedepends="automoc4 perl pkg-config extra-cmake-modules" short_desc="Illustration application" maintainer="Juan RP " -makedepends="phonon-devel libpng-devel sqlite-devel boost-devel exiv2-devel - qt-webkit-devel kdelibs-devel libressl-devel lcms2-devel libwpd-devel - libwpg-devel libwps-devel libodfgen-devel libvisio-devel libetonyek-devel - fontconfig-devel poppler-qt4-devel glew-devel fftw-devel libspnav-devel - gsl-devel libokular-devel qca-devel kactivities-devel kdepimlibs-devel - marble-devel libmysqlclient-devel postgresql-libs-devel freetds-devel" -license="GPL-2" +makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2 + exiv2-devel kactivities5-devel gsl-devel + kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel + kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel + libetonyek-devel libgit2-devel libodfgen-devel libokular-devel + libopenexr-devel libspnav-devel libvisio-devel libwpg-devel libwps-devel + poppler-qt5-devel qca-qt5-devel threadweaver-devel marble5-devel" +license="GPL-2.0-or-later LGPL-2.0-or-later GFDL-1.2-or-later" homepage="http://www.calligra-suite.org/" -distfiles="https://download.kde.org/Attic/calligra-2.9.11/calligra-2.9.11.tar.xz" -checksum=b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 +distfiles="http://download.kde.org/stable/calligra/${version}/calligra-${version}.tar.xz" +checksum=6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870 + +replaces="calligra-braindump>=0 calligra-flow>=0" subpackages="calligra-filters calligra-libs calligra-plugins calligra-karbon - calligra-kexi calligra-plan calligra-stage calligra-krita calligra-sheets - calligra-words calligra-handbook calligra-braindump calligra-flow - calligra-extras calligra-devtools calligra-gemini" -depends="${subpackages}" + calligra-kexi calligra-stage calligra-krita calligra-sheets calligra-extras + calligra-words calligra-handbook calligra-gemini calligra-devtools" +depends="${subpackages/calligra-devtools/} calligra-plan" -CXXFLAGS="-D_DEFAULT_SOURCE" -nocross=yes -case "$XBPS_TARGET_MACHINE" in - x86_64-musl) broken="not yet supported";; -esac +CXXFLAGS="-DKDE_NO_DEBUG_OUTPUT" + +# 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 + ;; + esac +} do_install() { vdoc README @@ -36,6 +46,7 @@ do_install() { calligra-filters_package() { short_desc+=" - filters" + depends="pstoedit" pkg_install() { cd ${wrksrc}/build/filters make DESTDIR=$PKGDESTDIR install @@ -55,8 +66,6 @@ calligra-plugins_package() { pkg_install() { cd ${wrksrc}/build/plugins make DESTDIR=$PKGDESTDIR install - cd ../3rdparty/kdchart - make DESTDIR=$PKGDESTDIR install } } calligra-karbon_package() { @@ -67,31 +76,17 @@ calligra-karbon_package() { } } calligra-kexi_package() { - short_desc+=" - Develop desktop db apps" - pkg_install() { - cd ${wrksrc}/build/kexi - make DESTDIR=$PKGDESTDIR install - cd ../doc/kexi - make DESTDIR=$PKGDESTDIR install - } -} -calligra-plan_package() { - short_desc+=" - Project Management Component" - depends="calligra-words-${version}_${revision}" - pkg_install() { - cd ${wrksrc}/build/plan - make DESTDIR=$PKGDESTDIR install - cd ../3rdparty/kdgantt - make DESTDIR=$PKGDESTDIR install - } + build_style=meta + depends="kexi>=${version}_${revision}" + short_desc+=" - Develop desktop db apps (transitional dummy package)" } calligra-stage_package() { short_desc+=" - Write presentation documents" pkg_install() { cd ${wrksrc}/build/stage make DESTDIR=$PKGDESTDIR install - cd ../doc/stage - make DESTDIR=$PKGDESTDIR install + #cd ../doc/stage + #make DESTDIR=$PKGDESTDIR install } } calligra-krita_package() { @@ -104,8 +99,8 @@ calligra-sheets_package() { pkg_install() { cd ${wrksrc}/build/sheets make DESTDIR=$PKGDESTDIR install - cd ../doc/sheets - make DESTDIR=$PKGDESTDIR install + #cd ../doc/sheets + #make DESTDIR=$PKGDESTDIR install } } calligra-words_package() { @@ -116,34 +111,20 @@ calligra-words_package() { } } calligra-handbook_package() { + build_style=meta noarch=yes - short_desc+=" - Documentation" - pkg_install() { - cd ${wrksrc}/build/doc/calligra - make DESTDIR=$PKGDESTDIR install - } -} -calligra-braindump_package() { - short_desc+=" - Notes & idea gathering" - pkg_install() { - cd ${wrksrc}/build/braindump - make DESTDIR=$PKGDESTDIR install - } -} -calligra-flow_package() { - depends="calligra-plugins" - short_desc+=" - Flowchart & Diagram Editing" - pkg_install() { - cd ${wrksrc}/build/flow - make DESTDIR=$PKGDESTDIR install - } + short_desc+=" - Documentation (removed temporarily)" + #pkg_install() { + # cd ${wrksrc}/build/doc/calligra + # make DESTDIR=$PKGDESTDIR install + #} } calligra-extras_package() { short_desc+=" - Extras" pkg_install() { cd ${wrksrc}/build/extras make DESTDIR=$PKGDESTDIR install - cd ../data + cd ${wrksrc}/build/data make DESTDIR=$PKGDESTDIR install } } @@ -156,8 +137,9 @@ calligra-devtools_package() { } calligra-gemini_package() { short_desc+=" - QML interface for Calligra Words and Stage" + depends="qt5-quickcontrols kirigami2 qt5-webengine" pkg_install() { - cd ${wrksrc}/build/qtquick + cd ${wrksrc}/build/components make DESTDIR=$PKGDESTDIR install cd ${wrksrc}/build/gemini make DESTDIR=$PKGDESTDIR install diff --git a/srcpkgs/calligra/update b/srcpkgs/calligra/update index 64a2b8aea4..83dfa5346d 100644 --- a/srcpkgs/calligra/update +++ b/srcpkgs/calligra/update @@ -1 +1 @@ -site="https://download.kde.org/stable/calligra-latest/" +site="https://download.kde.org/stable/calligra/"