commit: ed60c0fa2725fc138cd845b1008c6aa345f0bf37
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 21:43:43 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 21:43:43 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed60c0fa
kde-apps/cantor: Port to KF6
Upstream commits:
40768f3ce28f87c81099506b1b5ebcf8f55310d8
a12dce35af91039eb60a6c56f9c176822311ec5e
ed2f39d28182b2b84cd39ca4130d146afef21e84
ea375498b1c9379eac7caf2ae5eb14560157f843
db7cf81eaa6fb322575490f926d9746264c676a6
7f50adca9cc37854821d98c69364e3ed231fadff
e3e00ff2a9290b7b43fb87ec81f59e2dc08993d0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/gear.kde.org.eclass | 1 +
kde-apps/cantor/cantor-9999.ebuild | 70 +++++++++++++++++++-------------------
kde-apps/cantor/metadata.xml | 3 +-
3 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index b62497e69b..18013955c2 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -289,6 +289,7 @@ fi
# (option to build with KF6 in master, but default remains KF5)
if $(ver_test -gt 24.10.75); then
case ${PN} in
+ cantor | \
kalzium | \
kwave | \
marble | \
diff --git a/kde-apps/cantor/cantor-9999.ebuild
b/kde-apps/cantor/cantor-9999.ebuild
index 63063c5ffc..32bddb05f2 100644
--- a/kde-apps/cantor/cantor-9999.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -9,50 +9,45 @@ ECM_TEST="forceoptional"
LUA_COMPAT=( luajit )
PYTHON_COMPAT=( python3_{10..12} )
PVCUT=$(ver_cut 1-3)
-KFMIN=5.115.0
-QTMIN=5.15.12
+KFMIN=6.5.0
+QTMIN=6.7.2
inherit ecm gear.kde.org lua-single optfeature python-single-r1
DESCRIPTION="Interface for doing mathematics and scientific computing"
HOMEPAGE="https://apps.kde.org/cantor/";
LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="6"
KEYWORDS=""
-# TODO: restore +analitza once cantor is ported to Qt6
-IUSE="julia lua postscript python qalculate R"
+IUSE="+analitza julia lua postscript python qalculate R webengine"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="test"
# TODO Add Sage Mathematics Software backend (https://www.sagemath.org)
-# analitza? ( >=kde-apps/analitza-23.08.4:5 )
DEPEND="
- app-text/poppler[qt5]
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qthelp-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/syntax-highlighting-${KFMIN}:5
+ >=app-text/poppler-23.12.0[qt6]
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml]
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/ktexteditor-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/syntax-highlighting-${KFMIN}:6
+ analitza? ( >=kde-apps/analitza-${PVCUT}:6 )
julia? ( dev-lang/julia )
lua? ( ${LUA_DEPS} )
qalculate? (
@@ -62,18 +57,22 @@ DEPEND="
postscript? ( app-text/libspectre )
python? (
${PYTHON_DEPS}
- >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6[dbus]
)
R? ( dev-lang/R )
+ webengine? (
+ >=dev-qt/qttools-${QTMIN}:6[assistant]
+ >=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+ )
"
# !analitza?
RDEPEND="${DEPEND}
- !julia? ( !lua? ( !python? ( !qalculate? ( !R? (
+ !analitza? ( !julia? ( !lua? ( !python? ( !qalculate? ( !R? (
|| (
sci-mathematics/maxima
sci-mathematics/octave
)
- ) ) ) ) )
+ ) ) ) ) ) )
"
BDEPEND="x11-misc/shared-mime-info"
@@ -87,13 +86,14 @@ src_configure() {
use julia && addpredict /proc/self/mem # bug 602894
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Analitza5=ON
+ $(cmake_use_find_package analitza Analitza6)
$(cmake_use_find_package julia Julia)
$(cmake_use_find_package lua LuaJIT)
-DUSE_LIBSPECTRE=$(usex postscript)
$(cmake_use_find_package python Python3)
$(cmake_use_find_package qalculate Qalculate)
$(cmake_use_find_package R R)
+ -DENABLE_EMBEDDED_DOCUMENTATION=$(usex webengine)
)
use lua && mycmakeargs+=(
-DLUAJIT_INCLUDEDIR="${EPREFIX}/$(lua_get_include_dir)"
diff --git a/kde-apps/cantor/metadata.xml b/kde-apps/cantor/metadata.xml
index d1af88c0cc..f4657acc45 100644
--- a/kde-apps/cantor/metadata.xml
+++ b/kde-apps/cantor/metadata.xml
@@ -9,9 +9,10 @@
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
<use>
- <!-- <flag name="analitza">Enable <pkg>kde-apps/analitza</pkg>
backend support</flag> -->
+ <flag name="analitza">Enable <pkg>kde-apps/analitza</pkg>
backend support</flag>
<flag name="julia">Enable <pkg>dev-lang/julia</pkg> backend
support</flag>
<flag name="qalculate">Enable <pkg>sci-libs/libqalculate</pkg>
backend support</flag>
<flag name="R">Enable <pkg>dev-lang/R</pkg> backend
support</flag>
+ <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> as
embedded QtHelp documentation browser</flag>
</use>
</pkgmetadata>
