commit: 2d667ee0106e81d5dceabb15bde4e1ec4fd39330
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 9 17:57:37 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 06:20:09 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d667ee0
app-office/calligra: Add IUSE webengine, drop obsolete src_prepare()
Upstream commits:
e876a0402c3f50e9c35cb9ec217bf46273a50c6b
8f124e62623820882fc0dbbcaa3547c06c74eda5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligra/calligra-9999.ebuild | 12 +++---------
app-office/calligra/metadata.xml | 1 +
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/app-office/calligra/calligra-9999.ebuild
b/app-office/calligra/calligra-9999.ebuild
index e07d50bb97..599bc227ca 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -26,7 +26,7 @@ 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 X
+ okular +pdf phonon spacenav +truetype webengine X
$(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
RESTRICT="test"
@@ -84,6 +84,7 @@ COMMON_DEPEND="
phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
spacenav? ( dev-libs/libspnav )
truetype? ( media-libs/freetype:2 )
+ webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
calligra_features_sheets? ( dev-cpp/eigen:3 )
calligra_features_words? ( dev-libs/libxslt )
"
@@ -110,14 +111,6 @@ pkg_setup() {
check-reqs_pkg_setup
}
-src_prepare() {
- ecm_src_prepare
-
- # Unconditionally disable deprecated deps (required by QtQuick1)
- ecm_punt_qt_module Declarative
- ecm_punt_qt_module OpenGL
-}
-
src_configure() {
local cal_ft myproducts
@@ -157,6 +150,7 @@ src_configure() {
-DWITH_Eigen3=$(usex calligra_features_sheets)
-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
-DWITH_Freetype=$(usex truetype)
+ $(cmake_use_find_package webengine Qt6WebEngineWidgets)
)
ecm_src_configure
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index c18f607fe5..d1459fc538 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -21,5 +21,6 @@
<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>
