diff options
Diffstat (limited to 'app-office/calligra')
-rw-r--r-- | app-office/calligra/Manifest | 4 | ||||
-rw-r--r-- | app-office/calligra/calligra-3.2.1-r3.ebuild | 187 | ||||
-rw-r--r-- | app-office/calligra/calligra-3.2.1-r5.ebuild | 3 | ||||
-rw-r--r-- | app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch | 51 |
4 files changed, 55 insertions, 190 deletions
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index d88937b96d03..de300275a081 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -5,7 +5,7 @@ AUX calligra-3.2.1-cxx17-for-poppler-22.patch 857 BLAKE2B f4ce16863c99be4681e6a2 AUX calligra-3.2.1-imath-1.patch 971 BLAKE2B 10686e8aa72d7a6953393863123ca42f3cfaa3bad50e3a38876418d564f917a7f9b1009f972330a6e1abe4ef0e2e40ddeb02a62dc05c52ecbb94718beb468e51 SHA512 3ed2f1e92519baec97f110bb07c8a47fad14779c6dcc30ad4fa2bd13b18867258b9bf08a2e99ae732cdc4372dd462b0872abaebb5eef0e093934a70140c46591 AUX calligra-3.2.1-imath-2.patch 688 BLAKE2B a991405acd4f9bc1b496cac0cfd969764e6145dec5bd682a2bdafc245c3ea21e369a8b595b6c60991a1c082bc65cf3681de5bcd66953fd4480e5895b45a9ae71 SHA512 08cc502599136db86b501be4793cdbc2aa0debced9dce0ac3a470b977595241b1d4eb32252095d644cf13661f04e9bd1f33fef43f506e567eed67f69d2548213 AUX calligra-3.2.1-openexr-3.patch 3188 BLAKE2B 221e8925f86418ef491a2e43c0e2981be4962b2afcb74465a93f3af22ad6cedfd36119006831d89af8b05dfd5b833f3a5ba0f4593559377b5e20d0479c981e22 SHA512 4ad40876e68317fab59dfc7f5672ef850e40edf636dd6ed996a8239850fd4705825e18db86f132d4d0f06540e804c66d86b1954702187f57b90fd811d2c59bf5 +AUX calligra-3.2.1-poppler-22.03.0.patch 2311 BLAKE2B 403c5564a0e51dd3493363aacd4423b7fa78c7d86acfa6ee8b68b0385898558c6d3867a978973362d84a8033c03aeceadf489979d316b4a5a44825be1612ace0 SHA512 6937d985409cf8a69cf0cb59e64a4f8ebacfad3ba79b021d7a74c8a5275e2c3c43bc5a7ac7d66354107cfe039ea5b523564744d2647715244da7347daa2e84ff DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f -EBUILD calligra-3.2.1-r3.ebuild 5252 BLAKE2B 4d281a3ef6890825a4cb19b15f6ba718d73c872084c793438709fc91fe8a50bf439906b2ddbfe42f0497bce6495765da7733452938aebfe11a26635cd76c79ed SHA512 9f7f0da34a639688d73a3a4a1175fce3fab321ea67917869c7009e50a0ad4025647497955006851e8ad555823f1984eef0be0c2267522427be14ebe2b0554327 -EBUILD calligra-3.2.1-r5.ebuild 5420 BLAKE2B 4ab13ca3f386e6db75542bff989c8c6eaaebd3fab2582bd64fc6e992f009ce8e3b83b29dd60d066f8c0a7c5492302d43285e04511e537c02ffef8c0d7d38bd3c SHA512 10f465c581e7d9aa688c0d23c6bc5e79d16e932290a0f7645e73d7314177b5d4369ace927f057217db6f27b4beac46e8f3d5a75b3e76e458df1bc61255857bb2 +EBUILD calligra-3.2.1-r5.ebuild 5490 BLAKE2B f34de7cb1ad8f9bdfffa8ec61e49608a54de36468cedadb4de15d45cb098827e58ce8c2362312f5607d9b0f1721478d5cd34983c3fdef540e5aca96d3586d59e SHA512 25bea7dbe0edf40829d6fc6370b68a52a01f120a581b041644fd094bcfc0993c22bde88e360e32c9b8ed173809d7dc57d7357523fbe17697b8fd9dc7fc9253bc MISC metadata.xml 1218 BLAKE2B 0989022a6025992ca04069a3f1e77e626df5a37c51bb1f6889e81360a6dd7a11311d319ba874e9dbadcb98ec53e6c1436563ecc6baf047218bd23adc726499b2 SHA512 b8b0e4cc426a2ff43211ef9f5b9d72db6ceefb26f22c49c32805bdfa7716920e54d09e19836e5da7293d9ac264364568119a64ee458f3f51f85dafe4e050f835 diff --git a/app-office/calligra/calligra-3.2.1-r3.ebuild b/app-office/calligra/calligra-3.2.1-r3.ebuild deleted file mode 100644 index c47da0b88466..000000000000 --- a/app-office/calligra/calligra-3.2.1-r3.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CHECKREQS_DISK_BUILD="4G" -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.74.0 -QTMIN=5.15.1 -inherit check-reqs ecm kde.org - -DESCRIPTION="KDE Office Suite" -HOMEPAGE="https://calligra.org/" - -if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~ppc64 x86" -fi - -CAL_FTS=( karbon sheets stage words ) - -LICENSE="GPL-2" -SLOT="5" -IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr - +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" - -# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) -# Required for the matlab/octave formula tool -BDEPEND=" - sys-devel/gettext -" -COMMON_DEPEND=" - dev-lang/perl - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtscript-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kemoticons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kross-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - sys-libs/zlib - virtual/libiconv - activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) - charts? ( dev-libs/kdiagram:5 ) - crypt? ( >=app-crypt/qca-2.3.0:2 ) - fontconfig? ( media-libs/fontconfig ) - gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] ) - gsl? ( sci-libs/gsl:= ) - import-filter? ( - app-text/libetonyek - app-text/libodfgen - app-text/libwpd:* - app-text/libwpg:* - >=app-text/libwps-0.4 - dev-libs/librevenge - media-libs/libvisio - ) - lcms? ( - media-libs/ilmbase:= - media-libs/lcms:2 - ) - okular? ( kde-apps/okular:5 ) - openexr? ( <media-libs/openexr-3.0.0:0= ) - pdf? ( app-text/poppler:=[qt5] ) - phonon? ( >=media-libs/phonon-4.11.0 ) - spacenav? ( dev-libs/libspnav ) - truetype? ( media-libs/freetype:2 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) - calligra_features_sheets? ( dev-cpp/eigen:3 ) - calligra_features_words? ( dev-libs/libxslt ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) -" -RDEPEND="${COMMON_DEPEND} - calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) - gemini? ( - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - ) -" - -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch - "${FILESDIR}"/${P}-cmake-3.16.patch # bug 796224 -) - -pkg_pretend() { - check-reqs_pkg_pretend -} - -pkg_setup() { - ecm_pkg_setup - check-reqs_pkg_setup -} - -src_prepare() { - ecm_src_prepare - - # Unconditionally disable deprecated deps (required by QtQuick1) - ecm_punt_bogus_dep Qt5 Declarative - ecm_punt_bogus_dep Qt5 OpenGL -} - -src_configure() { - local cal_ft myproducts - - # applications - for cal_ft in ${CAL_FTS[@]}; do - use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) - done - - use lcms && myproducts+=( PLUGIN_COLORENGINES ) - use okular && myproducts+=( OKULAR ) - use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) - - local mycmakeargs=( - -DPACKAGERS_BUILD=OFF - -DRELEASE_BUILD=ON - -DWITH_Iconv=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON - -DPRODUCTSET="${myproducts[*]}" - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package charts KChart) - -DWITH_Qca-qt5=$(usex crypt) - -DWITH_Fontconfig=$(usex fontconfig) - $(cmake_use_find_package gemini Libgit2) - $(cmake_use_find_package gemini Qt5QuickWidgets) - -DWITH_GSL=$(usex gsl) - -DWITH_LibEtonyek=$(usex import-filter) - -DWITH_LibOdfGen=$(usex import-filter) - -DWITH_LibRevenge=$(usex import-filter) - -DWITH_LibVisio=$(usex import-filter) - -DWITH_LibWpd=$(usex import-filter) - -DWITH_LibWpg=$(usex import-filter) - -DWITH_LibWps=$(usex import-filter) - $(cmake_use_find_package phonon Phonon4Qt5) - -DWITH_LCMS2=$(usex lcms) - -DWITH_Okular5=$(usex okular) - -DWITH_OpenEXR=$(usex openexr) - -DWITH_Poppler=$(usex pdf) - -DWITH_Eigen3=$(usex calligra_features_sheets) - -DBUILD_UNMAINTAINED=$(usex calligra_features_stage) - -DENABLE_CSTESTER_TESTING=$(usex test) - -DWITH_Freetype=$(usex truetype) - ) - - ecm_src_configure -} diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r5.ebuild index efe49eaa6a28..d80568af53ec 100644 --- a/app-office/calligra/calligra-3.2.1-r5.ebuild +++ b/app-office/calligra/calligra-3.2.1-r5.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/" if [[ ${KDE_BUILD_TYPE} == release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~ppc64 ~riscv x86" fi CAL_FTS=( karbon sheets stage words ) @@ -120,6 +120,7 @@ PATCHES=( "${FILESDIR}"/${P}-{openexr-3,imath-{1,2}}.patch "${FILESDIR}"/${P}-cxx17-for-poppler-22.patch "${FILESDIR}"/${P}-cxx17-fixes.patch + "${FILESDIR}"/${P}-poppler-22.03.0.patch # by Archlinux, TODO upstream ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch new file mode 100644 index 000000000000..c704d7896e1f --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch @@ -0,0 +1,51 @@ +From 8f328bef497a9e3bc628e4e294c1a70b0c8b0eab Mon Sep 17 00:00:00 2001 +From: foutrelis <foutrelis@eb2447ed-0c53-47e4-bac8-5bc4a241df78> +Date: Wed, 2 Mar 2022 10:28:24 +0000 +Subject: [PATCH] Fix build with poppler 22.03.0 + +diff -uprw a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt +--- a/filters/karbon/pdf/CMakeLists.txt 2020-05-14 09:51:30.000000000 +0300 ++++ b/filters/karbon/pdf/CMakeLists.txt 2022-03-02 12:19:08.039939530 +0200 +@@ -14,6 +14,10 @@ if(Poppler_VERSION VERSION_LESS "0.83.0" + add_definitions("-DHAVE_POPPLER_PRE_0_83") + endif() + ++if(Poppler_VERSION VERSION_LESS "22.3.0") ++ add_definitions("-DHAVE_POPPLER_PRE_22_3") ++endif() ++ + set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) + + add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) +diff -uprw a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp +--- a/filters/karbon/pdf/Pdf2OdgImport.cpp 2020-05-14 09:51:30.000000000 +0300 ++++ b/filters/karbon/pdf/Pdf2OdgImport.cpp 2022-03-02 12:20:35.125605950 +0200 +@@ -86,8 +86,12 @@ KoFilter::ConversionStatus Pdf2OdgImport + if (! globalParams) + return KoFilter::NotImplemented; + ++#ifdef HAVE_POPPLER_PRE_22_3 + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); ++#else ++ PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data())); ++#endif + if (! pdfDoc) { + #ifdef HAVE_POPPLER_PRE_0_83 + delete globalParams; +diff -uprw a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +--- a/filters/karbon/pdf/PdfImport.cpp 2020-05-14 09:51:30.000000000 +0300 ++++ b/filters/karbon/pdf/PdfImport.cpp 2022-03-02 12:21:46.197510028 +0200 +@@ -73,8 +73,12 @@ KoFilter::ConversionStatus PdfImport::co + if (! globalParams) + return KoFilter::NotImplemented; + ++#ifdef HAVE_POPPLER_PRE_22_3 + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); ++#else ++ PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data())); ++#endif + if (! pdfDoc) { + #ifdef HAVE_POPPLER_PRE_0_83 + delete globalParams; |