gcompris, bump to version 26.0 (#13708)

games-kids/gcompris/gcompris-26.0.recipe

@@ -17,17 +17,19 @@ COPYRIGHT="2014-2016 Bruno Coudoin
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-$portVersion.tar.xz"
-CHECKSUM_SHA256="dda4e486c7ec4d080744a05a6b89dbafe0dfe07041fbf245f08982716375acb5"
+CHECKSUM_SHA256="7d3df8be96dd6e883990abe14f9137900030d508d3a30e2b38e39d0eb31ef333"
 SOURCE_DIR="gcompris-qt-$portVersion"
 PATCHES="gcompris-$portVersion.patchset"
-ADDITIONAL_FILES="gcompris.rdef.in"
+ADDITIONAL_FILES="gcompris.rdef.in
+	gcompris-teachers.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	gcompris$secondaryArchSuffix
-	app:GCompris
+	gcompris$secondaryArchSuffix = $portVersion
+	app:GCompris = $portVersion
+	cmd:gcompris = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -37,17 +39,36 @@ REQUIRES="
 	lib:libQt6Charts$secondaryArchSuffix
 	lib:libQt6Core$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Graphs$secondaryArchSuffix
 	lib:libQt6Multimedia$secondaryArchSuffix
 	lib:libQt6Network$secondaryArchSuffix
 	lib:libQt6OpenGL$secondaryArchSuffix
 	lib:libQt6Qml$secondaryArchSuffix
 	lib:libQt6Quick$secondaryArchSuffix
+	lib:libQt6Quick3D$secondaryArchSuffix
 	lib:libQt6Sensors$secondaryArchSuffix
+	lib:libQt6ShaderTools$secondaryArchSuffix
 	lib:libQt6Svg$secondaryArchSuffix
 	lib:libQt6Widgets$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	"
 
+SUMMARY_teachers="Teachers tool to follow up on students progress"
+PROVIDES_teachers="
+	gcompris${secondaryArchSuffix}_teachers
+	app:GCompris_Teachers = $portVersion
+	"
+REQUIRES_teachers="
+	gcompris$secondaryArchSuffix == $portVersion base
+	$REQUIRES
+	"
+
+# developer tool
+#SUMMARY_inkscape_extention="Inkscape export extension"
+#PROVIDES_inkscape_extention="
+#	gcompris${secondaryArchSuffix}_inkscape_extention
+#	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	extra_cmake_modules$secondaryArchSuffix
@@ -58,6 +79,7 @@ BUILD_REQUIRES="
 	devel:libQt6Charts$secondaryArchSuffix
 	devel:libQt6Core$secondaryArchSuffix
 	devel:libQt6Gui$secondaryArchSuffix
+	devel:libQt6Graphs$secondaryArchSuffix
 	devel:libQt6Multimedia$secondaryArchSuffix
 	devel:libQt6Network$secondaryArchSuffix
 	devel:libQt6Qml$secondaryArchSuffix
@@ -88,7 +110,8 @@ BUILD()
 		-DCMAKE_INSTALL_BINDIR=$appsDir \
 		-DGRAPHICAL_RENDERER=software \
 		-DQML_BOX2D_LIBRARY="`finddir B_SYSTEM_DATA_DIRECTORY`/Qt6/qml/Box2D" \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
+		-DPACKAGE_SERVER=ON \
+		-DCMAKE_SKIP_RPATH=YES \
 		-DBUILD_TESTING=OFF
 
 	make -C build $jobArgs
@@ -98,6 +121,17 @@ INSTALL()
 {
 	make -C build install
 
+	# cleanup
+	rm -rf $dataDir/{applications,icons,metainfo}
+
+	# Inkscape extension
+	mkdir -p $dataDir/inkscape/extensions
+	cp tools/inkscape/{export_layers_gcompris.inx,export_layers_gcompris.py,README} \
+		$dataDir/inkscape/extensions
+
+	mkdir $prefix/bin
+	ln -s $appsDir/GCompris $prefix/bin/gcompris
+
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	sed \
@@ -106,6 +140,22 @@ INSTALL()
 		$portDir/additional-files/gcompris.rdef.in > gcompris.rdef
 	addResourcesToBinaries gcompris.rdef $appsDir/GCompris
 	addAppDeskbarSymlink $appsDir/GCompris
+
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	sed \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		$portDir/additional-files/gcompris-teachers.rdef.in > gcompris-teachers.rdef
+	addResourcesToBinaries gcompris-teachers.rdef $appsDir/GCompris-Teachers
+	addAppDeskbarSymlink $appsDir/GCompris-Teachers
+
+	packageEntries teachers \
+		$appsDir/GCompris-Teachers \
+		$dataDir/deskbar/menu/Applications/GCompris-Teachers
+
+#	packageEntries inkscape_extention \
+#		$dataDir/inkscape
 }
 
 TEST()

games-kids/gcompris/patches/gcompris-25.1.patchset

@@ -1,47 +0,0 @@
-From 46ef75771ea1c74198847657e31dde30878f3fd6 Mon Sep 17 00:00:00 2001
-From: Luc Schrijvers <begasus@gmail.com>
-Date: Wed, 21 May 2025 18:36:35 +0200
-Subject: Rename GCompris binary on Haiku too
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 07d64c7..7e48ff7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -64,9 +64,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Android)
- endif()
- 
- # Set executable filename
--if(ANDROID)
--  set(GCOMPRIS_EXECUTABLE_NAME GCompris)
--elseif(WIN32)
-+if(ANDROID OR HAIKU OR WIN32)
-   set(GCOMPRIS_EXECUTABLE_NAME GCompris)
- else()
-   set(GCOMPRIS_EXECUTABLE_NAME gcompris-qt)
--- 
-2.48.1
-
-
-From e871be9a337397b4384d15c3ea739b773721afc9 Mon Sep 17 00:00:00 2001
-From: Luc Schrijvers <begasus@gmail.com>
-Date: Wed, 21 May 2025 18:58:34 +0200
-Subject: Disable, CodeQualityUtils, build fails with Qt6.9.0
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7e48ff7..48ea4e0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@ add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060500)
- 
- # add tools (cppcheck, clang-tidy...) if build on testing mode only
- # (slower compilation)
--if(BUILD_TESTING)
-+if(BUILD_TESTING AND NOT HAIKU)
-   include(CodeQualityUtils)
- endif()
- 
--- 
-2.48.1
-

games-kids/gcompris/patches/gcompris-26.0.patchset

@@ -0,0 +1,24 @@
+From 54e6fc6cd9976ddf0e1e86f1b22a80bad758f447 Mon Sep 17 00:00:00 2001
+From: Luc Schrijvers <begasus@gmail.com>
+Date: Wed, 4 Feb 2026 12:45:16 +0100
+Subject: Disable, CodeQualityUtils, building tests fails with
+
+error: 'stddef.h' file not found [clang-diagnostic-error]
+https://github.com/haikuports/haikuports/issues/10708
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4e14c5b..9721333 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,7 +49,7 @@ add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060500)
+ 
+ # add tools (cppcheck, clang-tidy...) if build on testing mode only
+ # (slower compilation)
+-if(BUILD_TESTING)
++if(BUILD_TESTING AND NOT HAIKU)
+   include(CodeQualityUtils)
+ endif()
+ 
+-- 
+2.52.0
+