Skip to content

Commit 1db2ebf

Browse files
committed
kde-apps/artikulate: Port to Qt6
Upstream commits: 13f44b64a3e16345a88c8bda9ce1786c5b45b638 bebf6138a41f7294be701d4a620c2e0b6ece2d03 2a3be7150b5cca51e142557ba12b63648b9ae371 3c1f3330fa3010d1edf765bf88d7f30f384be07b 27fb25baa29353b7a0bb5fdba877cb4367f0d432 05cb22e0ebaa27d41541394f66ba83491efa89b1 Signed-off-by: Andreas Sturmlechner <[email protected]>
1 parent 0437538 commit 1db2ebf

File tree

2 files changed

+33
-27
lines changed

2 files changed

+33
-27
lines changed

eclass/gear.kde.org.eclass

+13-5
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then
6363
SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz"
6464
fi
6565

66-
# list of applications ported to KF6 in SLOT=6 having to block SLOT=5
66+
# list of applications ported to KF6 having to block SLOT=5
6767
if $(ver_test -gt 24.01.75); then
6868
case ${PN} in
6969
akonadi | \
@@ -248,7 +248,7 @@ if $(ver_test -gt 24.01.75); then
248248
esac
249249
fi
250250

251-
# list of applications ported to KF6 post-24.02 in SLOT=6 having to block SLOT=5
251+
# list of applications ported to KF6 post-24.02 having to block SLOT=5
252252
if $(ver_test -gt 24.04.75); then
253253
case ${PN} in
254254
audex | \
@@ -262,7 +262,7 @@ if $(ver_test -gt 24.04.75); then
262262
esac
263263
fi
264264

265-
# list of applications ported to KF6 post-24.05 in SLOT=6 having to block SLOT=5
265+
# list of applications ported to KF6 post-24.05 having to block SLOT=5
266266
if $(ver_test -gt 24.07.75); then
267267
case ${PN} in
268268
k3b | \
@@ -285,8 +285,7 @@ if $(ver_test -gt 24.07.75); then
285285
esac
286286
fi
287287

288-
# list of applications ported to KF6 post-24.08 in SLOT=6 having to block SLOT=5
289-
# (option to build with KF6 in master, but default remains KF5)
288+
# list of applications ported to KF6 post-24.08 having to block SLOT=5
290289
if $(ver_test -gt 24.11.75); then
291290
case ${PN} in
292291
cantor | \
@@ -301,4 +300,13 @@ if $(ver_test -gt 24.11.75); then
301300
esac
302301
fi
303302

303+
# list of applications ported to KF6 post-25.04 having to block SLOT=5
304+
if $(ver_test -gt 25.07.75); then
305+
case ${PN} in
306+
artikulate)
307+
RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
308+
*) ;;
309+
esac
310+
fi
311+
304312
fi

kde-apps/artikulate/artikulate-9999.ebuild

+20-22
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,36 @@ EAPI=8
55

66
ECM_HANDBOOK="optional"
77
ECM_TEST="forceoptional"
8-
KFMIN=5.115.0
9-
QTMIN=5.15.12
10-
inherit ecm gear.kde.org
8+
KFMIN=6.9.0
9+
QTMIN=6.8.1
10+
inherit ecm gear.kde.org xdg
1111

1212
DESCRIPTION="Language learning application that helps improving pronunciation skills"
1313
HOMEPAGE="https://apps.kde.org/artikulate/"
1414

1515
LICENSE="GPL-2" # TODO: CHECK
16-
SLOT="5"
16+
SLOT="0"
1717
KEYWORDS=""
1818
IUSE=""
1919

2020
DEPEND="
21-
>=dev-qt/qtdeclarative-${QTMIN}:5
22-
>=dev-qt/qtgui-${QTMIN}:5
23-
>=dev-qt/qtmultimedia-${QTMIN}:5
24-
>=dev-qt/qtsql-${QTMIN}:5
25-
>=dev-qt/qtxml-${QTMIN}:5
26-
>=dev-qt/qtxmlpatterns-${QTMIN}:5
27-
>=kde-frameworks/karchive-${KFMIN}:5
28-
>=kde-frameworks/kconfig-${KFMIN}:5
29-
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
30-
>=kde-frameworks/kcoreaddons-${KFMIN}:5
31-
>=kde-frameworks/kcrash-${KFMIN}:5
32-
>=kde-frameworks/ki18n-${KFMIN}:5
33-
>=kde-frameworks/kirigami-${KFMIN}:5
34-
>=kde-frameworks/knewstuff-${KFMIN}:5
35-
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
36-
"
37-
RDEPEND="${DEPEND}
38-
>=dev-qt/qtquickcontrols2-${QTMIN}:5
21+
dev-libs/libxml2
22+
>=dev-qt/qtbase-${QTMIN}:6[gui,sql,xml]
23+
>=dev-qt/qtdeclarative-${QTMIN}:6
24+
>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
25+
>=kde-frameworks/karchive-${KFMIN}:6
26+
>=kde-frameworks/kconfig-${KFMIN}:6
27+
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
28+
>=kde-frameworks/kcoreaddons-${KFMIN}:6
29+
>=kde-frameworks/kcrash-${KFMIN}:6
30+
>=kde-frameworks/ki18n-${KFMIN}:6
31+
>=kde-frameworks/kirigami-${KFMIN}:6
32+
>=kde-frameworks/kitemmodels-${KFMIN}:6
33+
>=kde-frameworks/knewstuff-${KFMIN}:6
34+
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
35+
>=kde-frameworks/kxmlgui-${KFMIN}:6
3936
"
37+
RDEPEND="${DEPEND}"
4038

4139
src_configure() {
4240
local mycmakeargs=(

0 commit comments

Comments
 (0)