commit: 9752b36d684e8d2328c78d4346318e4c3ce6e46e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Sep 9 18:03:00 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Sep 9 18:13:14 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9752b36d
app-office/calligra: Update dependencies, drop IUSE gemini, spacenav Upstream commits: d2dd8c3ee5f8ae1acf7f4ca508b9fb7ea74c75ed 722d7a7f5350cc4f07ffbd34c612ab34f1085444 53417334f9b6dcd4b40abbe6d82edb414684e1cf d67f7a7ec613268e3022830eccce8ee1609e327c b0c80f2e1f926d51c72bfe38ab3f703c2f4ab262 3f6b4aaae281005fe0208da7f5a5f0c8e34e44df 9fdd45d60459c01d9a247a884dbf96e214588a47 28ea6598fff6be8dcc4b3e5935d675d057614a02 50d3283f563296af3e6ed5d7589c1a95f15be386 a3f58e92ac9da582fcbda989be4e11dd41d6b845 39f529b98affaabdb1de54b187c96cc03162db96 Bug: https://bugs.gentoo.org/939296 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/calligra/calligra-9999.ebuild | 28 ++++++++++++---------------- app-office/calligra/metadata.xml | 2 -- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild index 599bc227ca..f27d1244b2 100644 --- a/app-office/calligra/calligra-9999.ebuild +++ b/app-office/calligra/calligra-9999.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="KDE Office Suite" HOMEPAGE="https://calligra.org/"; if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" KEYWORDS="~amd64 ~ppc64 ~x86" fi @@ -25,9 +25,8 @@ CAL_FTS=( karbon sheets stage words ) LICENSE="GPL-2" SLOT="0" -IUSE="+charts +crypt +fontconfig gemini gsl +import-filter +lcms - okular +pdf phonon spacenav +truetype webengine X - $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" +IUSE="+charts +crypt +fontconfig gsl +import-filter +lcms okular +pdf phonon + +truetype webengine X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" RESTRICT="test" @@ -35,9 +34,9 @@ RESTRICT="test" # Required for the matlab/octave formula tool COMMON_DEPEND=" dev-lang/perl - >=dev-libs/qtkeychain-0.14.2:=[qt6(+)] + >=dev-libs/qtkeychain-0.14.2:=[qt6(-)] >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] >=dev-qt/qtsvg-${QTMIN}:6 >=dev-qt/qttools-${QTMIN}:6[designer] >=kde-frameworks/karchive-${KFMIN}:6 @@ -52,11 +51,11 @@ COMMON_DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kiconthemes-${KFMIN}:6 >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/kitemviews-${KFMIN}:6 >=kde-frameworks/kjobwidgets-${KFMIN}:6 >=kde-frameworks/knotifications-${KFMIN}:6 >=kde-frameworks/knotifyconfig-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 >=kde-frameworks/ktextwidgets-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 @@ -67,7 +66,6 @@ COMMON_DEPEND=" charts? ( dev-libs/kdiagram:6 ) crypt? ( dev-libs/openssl:= ) fontconfig? ( media-libs/fontconfig ) - gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] ) gsl? ( sci-libs/gsl:= ) import-filter? ( app-text/libetonyek @@ -81,8 +79,7 @@ COMMON_DEPEND=" lcms? ( media-libs/lcms:2 ) okular? ( kde-apps/okular:6 ) pdf? ( app-text/poppler:=[qt6] ) - phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] ) - spacenav? ( dev-libs/libspnav ) + phonon? ( >=media-libs/phonon-4.12.0[qt6(-)] ) truetype? ( media-libs/freetype:2 ) webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] ) calligra_features_sheets? ( dev-cpp/eigen:3 ) @@ -96,9 +93,11 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !${CATEGORY}/${PN}:5 calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) - gemini? ( >=kde-frameworks/kirigami-${KFMIN}:6 ) " -BDEPEND="sys-devel/gettext" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" PATCHES=( "${WORKDIR}"/${PATCHSET}/${PN}-3.1.89-no-arch-detection.patch ) # downstream @@ -121,7 +120,6 @@ src_configure() { use lcms && myproducts+=( PLUGIN_COLORENGINES ) use okular && myproducts+=( OKULAR ) - use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) local mycmakeargs=( -DPACKAGERS_BUILD=OFF @@ -129,12 +127,10 @@ src_configure() { -DWITH_Iconv=ON -DWITH_Imath=ON # w/ LCMS: 16 bit floating point Grayscale colorspace -DCMAKE_DISABLE_FIND_PACKAGE_Cauchy=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF6CalendarCore=ON -DPRODUCTSET="${myproducts[*]}" - $(cmake_use_find_package charts KChartQt6) + $(cmake_use_find_package charts KChart6) $(cmake_use_find_package crypt OpenSSL) -DWITH_Fontconfig=$(usex fontconfig) - $(cmake_use_find_package gemini LibGit2) -DWITH_GSL=$(usex gsl) -DWITH_LibEtonyek=$(usex import-filter) -DWITH_LibOdfGen=$(usex import-filter) diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml index d1459fc538..09de55c3d0 100644 --- a/app-office/calligra/metadata.xml +++ b/app-office/calligra/metadata.xml @@ -15,12 +15,10 @@ </upstream> <use> <flag name="charts">Build chartshape plugin for creating business charts with <pkg>dev-libs/kdiagram</pkg></flag> - <flag name="gemini">Enable tablet and 2:1 devices support</flag> <flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag> <flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag> <flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag> <flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag> - <flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag> <flag name="webengine">Enable Braindump support using <pkg>dev-qt/qtwebengine</pkg></flag> </use> </pkgmetadata>
