diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /app-office/calligra | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'app-office/calligra')
| -rw-r--r-- | app-office/calligra/Manifest | 2 | ||||
| -rw-r--r-- | app-office/calligra/calligra-3.2.1-r1.ebuild (renamed from app-office/calligra/calligra-3.2.1.ebuild) | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index b27d2d002d68..31663d0472bf 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -1,4 +1,4 @@ AUX calligra-3.1.89-no-arch-detection.patch 404 BLAKE2B ef2ea38d3fdabedd98eafd4b9526a3dd5a7c02f4af8109301f3535969475034795483cfb0fa1f1ddad9fa41ef81409d39bf3a06fb781016217355be646d1affd SHA512 d97d2a26622f43987446ac87b14952b9e46f3b919c84c6ada4b18ebde5aa94e6f69b931ec5d61ab391f9a4811e81eb11f2136f0a3384f644679c0db87943102a DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f -EBUILD calligra-3.2.1.ebuild 5298 BLAKE2B cfcd589ff42cabd21a8f475d08fb3bf9d8bd7626998da55493b01992c3c5621864c1ddb910dc73f8f43bd4fcc7afaf4a6daca8c82bffac730864d86ea83e25fd SHA512 28eb4aa8ffdee09267802cea1911284b50a94c638f6d437825068fce8d228a07f634f71f86360826980a99a2e1bd4eb8963ae62d44406c80d5ccf45e464d62e7 +EBUILD calligra-3.2.1-r1.ebuild 5181 BLAKE2B 03809362aa6711ce9fe713e29be6d4f668927fb414f4780a0340a5e322d6a4647b323743dafd62d66e4fcac7a06dab58414445fb73a3d83e9b13770376ee5e68 SHA512 33c6b71d017c7770aecc3a8fffd71d4796b93f4ba8c958a12705dcd7854e8e543cb9ba552d003cf111f56a4eb6d6313759b11ce9464f227f66512b76fa5c57db MISC metadata.xml 1149 BLAKE2B e5461ec7fe1747ce0f4f1b68e3573bcad14183e9a6522f4e2a47fc14cb2a2c968f1bee6d6bf91304d23b981df8c2bdf086222f823ccc6abbe44ff3fcd630ceb0 SHA512 2c6b8ac3f48fa278faf079cfc42b6bdc8ecba994222adfe735489088e1fbb26c60f5f6ef4ff773a64e9a6e5026ef4dff368ec3c2c3c96cd6b0a38b6711b2d7a9 diff --git a/app-office/calligra/calligra-3.2.1.ebuild b/app-office/calligra/calligra-3.2.1-r1.ebuild index df46c7181c60..ac8c65551999 100644 --- a/app-office/calligra/calligra-3.2.1.ebuild +++ b/app-office/calligra/calligra-3.2.1-r1.ebuild @@ -6,8 +6,8 @@ EAPI=7 CHECKREQS_DISK_BUILD="4G" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 +KFMIN=5.74.0 +QTMIN=5.15.1 inherit check-reqs ecm kde.org DESCRIPTION="KDE Office Suite" @@ -73,7 +73,7 @@ COMMON_DEPEND=" virtual/libiconv activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) charts? ( dev-libs/kdiagram:5 ) - crypt? ( app-crypt/qca:2[qt5(+)] ) + crypt? ( >=app-crypt/qca-2.3.0:2 ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] ) gsl? ( sci-libs/gsl ) @@ -84,7 +84,6 @@ COMMON_DEPEND=" app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge - >=kde-frameworks/khtml-${KFMIN}:5 media-libs/libvisio ) lcms? ( @@ -94,7 +93,7 @@ COMMON_DEPEND=" okular? ( kde-apps/okular:5 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler:=[qt5] ) - phonon? ( media-libs/phonon[qt5(+)] ) + phonon? ( >=media-libs/phonon-4.11.0 ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( @@ -132,11 +131,6 @@ pkg_setup() { src_prepare() { ecm_src_prepare - if ! use test; then - sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \ - -i libs/pigment/CMakeLists.txt || die - fi - # Unconditionally disable deprecated deps (required by QtQuick1) ecm_punt_bogus_dep Qt5 Declarative ecm_punt_bogus_dep Qt5 OpenGL @@ -158,6 +152,8 @@ src_configure() { -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) @@ -174,7 +170,6 @@ src_configure() { -DWITH_LibWpg=$(usex import-filter) -DWITH_LibWps=$(usex import-filter) $(cmake_use_find_package phonon Phonon4Qt5) - -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON -DWITH_LCMS2=$(usex lcms) -DWITH_Okular5=$(usex okular) -DWITH_OpenEXR=$(usex openexr) |