diff --git a/app-office/calligra/calligra-3.2.1.recipe b/app-office/calligra/calligra-3.2.1.recipe index f0d7ef340..2d1411486 100644 --- a/app-office/calligra/calligra-3.2.1.recipe +++ b/app-office/calligra/calligra-3.2.1.recipe @@ -6,10 +6,10 @@ HOMEPAGE="https://www.calligra.org/" COPYRIGHT="2010-2020 KDE Organisation" LICENSE="GNU LGPL v2 GNU GPL v2" -REVISION="9" -SOURCE_URI="https://download.kde.org/stable/calligra/$portVersion/calligra-$portVersion.tar.xz" -CHECKSUM_SHA256="b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147" -SOURCE_FILENAME="calligra-$portVersion.tar.xz" +REVISION="10" +SOURCE_URI="https://invent.kde.org/office/calligra/-/archive/v${portVersion}/calligra-v${portVersion}.tar.bz2" +CHECKSUM_SHA256="69081a0329b550a1363e317fb35f749f8363ecd819432a14337a9125573b38fd" +SOURCE_DIR="calligra-v${portVersion}" PATCHES="calligra-$portVersion.patchset" ADDITIONAL_FILES=" karbon.rdef.in @@ -151,9 +151,9 @@ REQUIRES_okular_plugins=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.93 + extra_cmake_modules$secondaryArchSuffix devel:eigen$secondaryArchSuffix - devel:libboost_system$secondaryArchSuffix >= 1.70.0 + devel:libboost_system$secondaryArchSuffix >= 1.83.0 devel:libetonyek_0.1$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix @@ -216,9 +216,9 @@ BUILD_REQUIRES=" devel:libOpenEXR_3_0$secondaryArchSuffix devel:libOpenEXRUtil_3_0$secondaryArchSuffix devel:libphonon4qt5$secondaryArchSuffix - devel:libpoppler$secondaryArchSuffix >= 117 - devel:libpoppler_qt5$secondaryArchSuffix >= 1.30 - devel:libqca$secondaryArchSuffix >= 2 + devel:libpoppler$secondaryArchSuffix >= 131 + devel:libpoppler_qt5$secondaryArchSuffix >= 1.33 + devel:libqca_qt5$secondaryArchSuffix >= 2 devel:libQt5Core$secondaryArchSuffix devel:libQt5WebKitWidgets$secondaryArchSuffix devel:librevenge_0.0$secondaryArchSuffix diff --git a/app-office/calligra/patches/calligra-3.2.1.patchset b/app-office/calligra/patches/calligra-3.2.1.patchset index b3bd0ab64..6da2b2060 100644 --- a/app-office/calligra/patches/calligra-3.2.1.patchset +++ b/app-office/calligra/patches/calligra-3.2.1.patchset @@ -1,11 +1,11 @@ -From d52c8603b3f71e66f268b6af62376ba10604968c Mon Sep 17 00:00:00 2001 +From 08e8885f6d75922d70b8d61f12af2fa55c640944 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 4 May 2020 15:43:23 +1000 Subject: Fix build for Haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index deca38e..10d3b43 100644 +index 1ce210e..82a0979 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,6 +347,12 @@ add_definitions( @@ -171,39 +171,17 @@ index 3007f91..9a42e4f 100644 #include #include -- -2.30.2 +2.43.2 -From 5c51fdba74e5847fd225579571f5a82f7b4128ea Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 29 Dec 2020 22:44:06 +1000 -Subject: Disable doctools for Haiku - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 10d3b43..23b6370 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1158,6 +1158,6 @@ find_package(KF5I18n CONFIG REQUIRED) - ki18n_install(po) - - find_package(KF5DocTools CONFIG) -- if(KF5DocTools_FOUND) -+ if(KF5DocTools_FOUND AND NOT HAIKU) - kdoctools_install(po) - endif() --- -2.30.2 - - -From cfe3c1090d623067df53ba766e2455725cb4d862 Mon Sep 17 00:00:00 2001 +From 278e36f55a3d6575e45e33d7eb8e8c31984c4e2c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 11 May 2022 14:37:02 +1000 Subject: Disable X11 diff --git a/CMakeLists.txt b/CMakeLists.txt -index 23b6370..639e134 100644 +index 82a0979..02008e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,7 +327,7 @@ if (GHNS) @@ -216,10 +194,10 @@ index 23b6370..639e134 100644 COMPONENTS X11Extras -- -2.30.2 +2.43.2 -From d4ffe633e4e0cb88b88dd18e3fd2464bdaf49d76 Mon Sep 17 00:00:00 2001 +From de7214d6e10c9310bcbd80cac7a47773ae8a2552 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 11 May 2022 14:40:58 +1000 Subject: Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. @@ -227,7 +205,7 @@ Subject: Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. diff --git a/CMakeLists.txt b/CMakeLists.txt -index 639e134..a0fc59c 100644 +index 02008e6..2724c68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -601,10 +601,6 @@ if (BUILD_VC) @@ -242,10 +220,10 @@ index 639e134..a0fc59c 100644 set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) -- -2.30.2 +2.43.2 -From 96888343f28132ad0b6355e138ce1f45b919a3ca Mon Sep 17 00:00:00 2001 +From c4a09a7543cb35adf687bd9538719a9f8e258e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= Date: Tue, 8 Jun 2021 05:13:23 +0000 Subject: Partial update of Commit 62f51070 to make it compileable again @@ -256,7 +234,7 @@ Fix Fontconfig's include_dirs variable Use Correct Target to link FontConfig and Freetype diff --git a/CMakeLists.txt b/CMakeLists.txt -index a0fc59c..0f072d6 100644 +index 2724c68..e43b9bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ @@ -324,10 +302,10 @@ index 16d7e06..429afe7 100644 -- -2.30.2 +2.43.2 -From ac81b55819225f2ec3814d345c750fb8a56102b2 Mon Sep 17 00:00:00 2001 +From 36356e6a68123c6ec2bed82913b04b0d06e6b9b9 Mon Sep 17 00:00:00 2001 From: Pierre Ducroquet Date: Sun, 28 Feb 2021 23:23:02 +0100 Subject: Fix some more warnings @@ -742,10 +720,10 @@ index b3f1e35..6354d79 100644 command->setCopyFormat(false); -- -2.30.2 +2.43.2 -From 2b8b952afad3aa38e53eacaeaf851d0812496cb6 Mon Sep 17 00:00:00 2001 +From eafcca6c3be354e9b67cc29889215eadc648b9a3 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 7 Jan 2022 14:00:05 +0100 Subject: Fix build with >=app-text/poppler-22.01.0 @@ -753,7 +731,7 @@ Subject: Fix build with >=app-text/poppler-22.01.0 Signed-off-by: Andreas Sturmlechner diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0f072d6..1a1502d 100644 +index e43b9bb..318c7f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,12 +104,7 @@ if(NOT DEFINED RELEASE_BUILD) @@ -771,10 +749,10 @@ index 0f072d6..1a1502d 100644 ############ ############# -- -2.30.2 +2.43.2 -From 7753275bb6bd0c24c42220e09a837685cfc5b497 Mon Sep 17 00:00:00 2001 +From 5d0c633a811a9ce5b0889a97b83c9feb307eeace Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sat, 24 Apr 2021 11:19:52 +0200 Subject: Support building with OpenEXR 3 @@ -782,7 +760,7 @@ Subject: Support building with OpenEXR 3 Try to find OpenEXR 3 first using the upstream cmake config, and fall back to using our FindOpenEXR diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1a1502d..f9a8576 100644 +index 318c7f0..c82641d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -388,8 +388,13 @@ endif () @@ -859,10 +837,10 @@ index a46619d..633fbf5 100644 endif() include_directories( ${PIGMENT_INCLUDES} ${LCMS2_INCLUDE_DIR} ) -- -2.30.2 +2.43.2 -From 89223df142e3ed07fdb6acbd373131447c372ff0 Mon Sep 17 00:00:00 2001 +From c19e723a6fabaaa26f1fe7f9d9f81bcc11190aba Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Tue, 3 Aug 2021 10:41:09 +0200 Subject: Only link to Imath when OpenEXR version is >= 3.0 @@ -870,7 +848,7 @@ Subject: Only link to Imath when OpenEXR version is >= 3.0 Since OpenEXR 3.0, Imath is in a separate, independently released library. Since that's the only library that Calligra needs, there's no need to link to the full OpenEXR diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9a8576..a0df920 100644 +index c82641d..12ecf16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -388,9 +388,9 @@ endif () @@ -887,10 +865,10 @@ index f9a8576..a0df920 100644 macro_optional_find_package(OpenEXR) endif() -- -2.30.2 +2.43.2 -From bc3e209c0594674acfe267e11e481df211ce7c2c Mon Sep 17 00:00:00 2001 +From 236dad6bca34e5fd72f967a64c54a5a12374d1a5 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Mon, 20 Dec 2021 18:46:33 +0100 Subject: Fixup Imath 3.0 support @@ -898,7 +876,7 @@ Subject: Fixup Imath 3.0 support OpenEXR_FOUND needs to be set to true in order to compile it. diff --git a/CMakeLists.txt b/CMakeLists.txt -index a0df920..071ea58 100644 +index 12ecf16..2edf9d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -391,6 +391,7 @@ endif () @@ -910,10 +888,10 @@ index a0df920..071ea58 100644 macro_optional_find_package(OpenEXR) endif() -- -2.30.2 +2.43.2 -From e4c60f60538536ef101104ce1ec93e919a1993ca Mon Sep 17 00:00:00 2001 +From 4606fb77f4bcea5f49ba9eae6a90c815fe89f92a Mon Sep 17 00:00:00 2001 From: foutrelis Date: Wed, 2 Mar 2022 10:28:24 +0000 Subject: Fix build with poppler 22.03.0 @@ -969,10 +947,10 @@ index 286f5fa..5a5c7e0 100644 #ifdef HAVE_POPPLER_PRE_0_83 delete globalParams; -- -2.30.2 +2.43.2 -From 36d15b7e975e0f4c86c3d772a2bb26e42d961b3b Mon Sep 17 00:00:00 2001 +From 85abaeca629b838f8cf714c57f2035d2fcf56e41 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 11 May 2022 14:59:48 +1000 Subject: Disable X11 for kowidgets @@ -992,5 +970,28 @@ index dad5d91..9029917 100644 endif() -- -2.30.2 +2.43.2 + + +From 49f676242cb76dfc4e45b1556f5aa30624b6399e Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 10 Mar 2024 14:07:51 +1000 +Subject: Fix for poppler 23 + + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index b980fdf..99490ec 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -410,7 +410,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) + if (s->getLength() == 0) + return; + +- GfxFont * font = state->getFont(); ++ std::shared_ptr font = state->getFont(); + + QString str; + +-- +2.43.2