commit: cff4a84b302045212e48be0c56840170226326c1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 4 14:54:33 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 4 14:42:30 2025 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cff4a84b
kde-apps/kig: Port to KF6
Upstream commit 2589ea350005eb4e665939727cfc72c9c6974579 and following...
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/gear.kde.org.eclass | 3 +-
....patch => kig-25.07.70-cmake-boostpython.patch} | 14 +++---
kde-apps/kig/kig-9999.ebuild | 51 ++++++++++------------
kde-apps/kig/metadata.xml | 1 -
4 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index 1e88f07842..d08ccdcb22 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -303,7 +303,8 @@ fi
# list of applications ported to KF6 post-25.04 having to block SLOT=5
if $(ver_test -gt 25.07.75); then
case ${PN} in
- artikulate)
+ artikulate | \
+ kig)
RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
*) ;;
esac
diff --git a/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch
b/kde-apps/kig/files/kig-25.07.70-cmake-boostpython.patch
similarity index 89%
rename from kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch
rename to kde-apps/kig/files/kig-25.07.70-cmake-boostpython.patch
index bd0c13ad37..f0da50cfc3 100644
--- a/kde-apps/kig/files/kig-20.08.70-cmake-boostpython.patch
+++ b/kde-apps/kig/files/kig-25.07.70-cmake-boostpython.patch
@@ -22,8 +22,8 @@ index e65585fb..e07a4dc6 100644
+set(BOOSTPYTHON_VERSION_MAJOR_MINOR python37 CACHE STRING "Version of
BoostPython to feed CMake's FindBoost")
+find_package(Boost 1.70 COMPONENTS ${BOOSTPYTHON_VERSION_MAJOR_MINOR})
- add_subdirectory( doc )
- add_subdirectory( icons )
+ if(KF6DocTools_FOUND)
+ add_subdirectory( doc )
@@ -61,15 +62,15 @@ add_subdirectory( macros )
add_subdirectory( data )
add_subdirectory( pykig )
@@ -74,18 +74,18 @@ index e65585fb..e07a4dc6 100644
add_library(kigpart MODULE ${kigpart_PART_SRCS})
@@ -256,9 +254,9 @@ target_link_libraries(kigpart
- ${KDE5_KUTILS_LIBS}
+ KF6::Archive
)
-if(BoostPython_FOUND)
-- target_link_libraries(kigpart ${BoostPython_LIBRARIES}
${KDE5_KTEXTEDITOR_LIBS})
+- target_link_libraries(kigpart ${BoostPython_LIBRARIES} KF6::TextEditor)
-endif(BoostPython_FOUND)
+if(Boost_FOUND)
-+ target_link_libraries(kigpart Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR}
${PYTHON_LIBRARIES})
++ target_link_libraries(kigpart Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR}
${PYTHON_LIBRARIES} KF6::TextEditor)
+endif()
- if (Qt5XmlPatterns_FOUND)
- target_link_libraries(kigpart Qt5::XmlPatterns)
+ if (Qt${QT_MAJOR_VERSION}XmlPatterns_FOUND)
+ target_link_libraries(kigpart Qt::XmlPatterns)
--
2.27.0
diff --git a/kde-apps/kig/kig-9999.ebuild b/kde-apps/kig/kig-9999.ebuild
index 8cceb5b0ff..dd2fa78065 100644
--- a/kde-apps/kig/kig-9999.ebuild
+++ b/kde-apps/kig/kig-9999.ebuild
@@ -3,42 +3,38 @@
EAPI=8
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
ECM_TEST="true"
-PYTHON_COMPAT=( python3_{10..13} )
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit python-single-r1 ecm gear.kde.org
+PYTHON_COMPAT=( python3_{11..13} )
+KFMIN=6.13.0
+QTMIN=6.8.1
+inherit python-single-r1 ecm gear.kde.org xdg
DESCRIPTION="KDE Interactive Geometry tool"
HOMEPAGE="https://apps.kde.org/kig/";
LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
+SLOT="0"
KEYWORDS=""
-IUSE="geogebra scripting"
+IUSE="scripting"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${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/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
+ >=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/kparts-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
scripting? (
$(python_gen_cond_dep '
>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
@@ -46,10 +42,10 @@ RDEPEND="${PYTHON_DEPS}
)
"
DEPEND="${RDEPEND}
- >=kde-frameworks/ktexteditor-${KFMIN}:5
+ >=kde-frameworks/ktexteditor-${KFMIN}:6
"
-PATCHES=( "${FILESDIR}"/${PN}-20.08.70-cmake-boostpython.patch )
+PATCHES=( "${FILESDIR}"/${PN}-25.07.70-cmake-boostpython.patch )
pkg_setup() {
python-single-r1_pkg_setup
@@ -64,7 +60,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DBOOSTPYTHON_VERSION_MAJOR_MINOR=${EPYTHON}
- $(cmake_use_find_package geogebra Qt5XmlPatterns)
$(cmake_use_find_package scripting Boost)
)
diff --git a/kde-apps/kig/metadata.xml b/kde-apps/kig/metadata.xml
index 521062f1f3..0e53a1dccd 100644
--- a/kde-apps/kig/metadata.xml
+++ b/kde-apps/kig/metadata.xml
@@ -9,7 +9,6 @@
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
<use>
- <flag name="geogebra">Support files created by
<pkg>sci-mathematics/geogebra-bin</pkg></flag>
<flag name="scripting">Support Python scripting</flag>
</use>
</pkgmetadata>
