diff --git a/srcpkgs/gcompris-qt/patches/01-qt6.10.patch b/srcpkgs/gcompris-qt/patches/01-qt6.10.patch new file mode 100644 index 00000000000000..705b9054e7f13a --- /dev/null +++ b/srcpkgs/gcompris-qt/patches/01-qt6.10.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -85,7 +85,7 @@ + + set(QT_MAJOR Qt6) + +-set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript) ++set(QT_COMPONENTS Qml Quick Gui Multimedia CorePrivate Svg Network LinguistTools Sensors QuickControls2BasicPrivate QuickTemplates2 Charts Widgets QmlWorkerScript) + + find_package(${QT_MAJOR} ${QT_REQUIRED_VERSION} COMPONENTS + ${QT_COMPONENTS}) +@@ -114,7 +114,7 @@ + ) + + if(UNIX AND NOT APPLE AND NOT ANDROID) +- find_package(${QT_MAJOR} ${QT_REQUIRED_VERSION} OPTIONAL_COMPONENTS WaylandClient) ++ find_package(${QT_MAJOR} ${QT_REQUIRED_VERSION} OPTIONAL_COMPONENTS WaylandClientPrivate) + endif() + + # For systems where ICU is not packaged with Qt installer + diff --git a/srcpkgs/gcompris-qt/template b/srcpkgs/gcompris-qt/template index 335742bfd90d3e..fb17e510a0beec 100644 --- a/srcpkgs/gcompris-qt/template +++ b/srcpkgs/gcompris-qt/template @@ -5,27 +5,21 @@ # Otherwise, they may remove it at a random time. # pkgname=gcompris-qt -version=4.2 +version=25.1.1 revision=1 build_style=cmake -configure_args="-DQML_BOX2D_LIBRARY=/usr/lib/qt5/qml/Box2D.2.0" -hostmakedepends="extra-cmake-modules kdoctools-devel gettext - qt5-host-tools qt5-qmake" -makedepends="qml-box2d qt5-declarative-devel - qt5-multimedia-devel qt5-sensors-devel qt5-svg-devel - qt5-tools-devel qt5-xmlpatterns-devel qt5-quickcontrols2-devel qt5-charts-devel" -depends="desktop-file-utils hicolor-icon-theme - qt5-graphicaleffects qt5-multimedia qt5-quickcontrols2 qt5-svg qt5-sensors qt5-imageformats qt5 qt5-declarative qt5-charts" +configure_args="-DQT_NO_PRIVATE_MODULE_WARNING=ON" +hostmakedepends="pkg-config extra-cmake-modules qt6-base qt6-tools gettext" +makedepends="qml-box2d qt6-base-private-devel qt6-multimedia-devel qt6-svg-devel + qt6-sensors-devel qt6-declarative-private-devel qt6-charts-devel qt6-wayland-private-devel" short_desc="High quality educational software suite for children aged 2 to 10" maintainer="zenobit " -license="GPL-3.0-or-later" +license="AGPL-3.0-only" homepage="https://gcompris.net/index-en.html" changelog="https://www.gcompris.net/news-en.html" distfiles="https://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz" -checksum=668726abc949c49e5348b55e8b1e7d7005584208432bb95424979f7f08f2256c +checksum=636de9168bf5fd628faf061845f188f2c385d2da7f92c4b0449139ce6c6da12a -post_extract() { - if [ "$CROSS_BUILD" ]; then - vsed -i "/set(CMAKE_PREFIX_PATH/d" CMakeLists.txt - fi +post_install() { + vlicense LICENSES/AGPL-3.0-only.txt }