From 2d0bf520bce818f4bebe082737a7121574d0de19 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 5 Dec 2024 12:11:21 +0100
Subject: [PATCH] gcompris, bump version (#11411)

---
 ...compris-4.2.recipe => gcompris-4.3.recipe} | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)
 rename games-kids/gcompris/{gcompris-4.2.recipe => gcompris-4.3.recipe} (90%)

diff --git a/games-kids/gcompris/gcompris-4.2.recipe b/games-kids/gcompris/gcompris-4.3.recipe
similarity index 90%
rename from games-kids/gcompris/gcompris-4.2.recipe
rename to games-kids/gcompris/gcompris-4.3.recipe
index 39f35af2e..c20cf981d 100644
--- a/games-kids/gcompris/gcompris-4.2.recipe
+++ b/games-kids/gcompris/gcompris-4.3.recipe
@@ -17,7 +17,7 @@ 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="668726abc949c49e5348b55e8b1e7d7005584208432bb95424979f7f08f2256c"
+CHECKSUM_SHA256="c7ea1387436eecc9c29ca191daf9002c37251b9f79efabbff873dd7edb03b5c7"
 SOURCE_DIR="gcompris-qt-$portVersion"
 ADDITIONAL_FILES="gcompris.rdef.in"
 
@@ -69,14 +69,14 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:lrelease$secondaryArchSuffix
 	cmd:make
-	cmd:msgattrib
+	cmd:msgattrib$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	cmake -S . -B build \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=$prefix \
+	cmake -S . -B build -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
 		-DQML_BOX2D_LIBRARY=$dataDir/Qt5/qml/Box2D.2.0 \
 		-DGRAPHICAL_RENDERER=software
 	make -C build $jobArgs
@@ -86,19 +86,16 @@ INSTALL()
 {
 	make -C build install
 
+	mkdir -p $appsDir
+	mv $prefix/bin/gcompris-qt $appsDir/GCompris
+	rm -r $prefix/bin
+
 	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.rdef.in > gcompris.rdef
-
-	mkdir -p $appsDir
-	mv $prefix/bin/gcompris-qt $appsDir/GCompris
-	rm -r $prefix/bin
-
-	addResourcesToBinaries gcompris.rdef \
-		$appsDir/GCompris
-
+	addResourcesToBinaries gcompris.rdef $appsDir/GCompris
 	addAppDeskbarSymlink $appsDir/GCompris
 }