diff --git a/games-kids/gcompris/gcompris-25.0.recipe b/games-kids/gcompris/gcompris-25.1.recipe similarity index 94% rename from games-kids/gcompris/gcompris-25.0.recipe rename to games-kids/gcompris/gcompris-25.1.recipe index 456f6782b..0f02f9ef2 100644 --- a/games-kids/gcompris/gcompris-25.0.recipe +++ b/games-kids/gcompris/gcompris-25.1.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="13797ee65e2bb1aba2765e8893981259ff921a955a0158b95f9d5eb65d43d39c" +CHECKSUM_SHA256="dda4e486c7ec4d080744a05a6b89dbafe0dfe07041fbf245f08982716375acb5" SOURCE_DIR="gcompris-qt-$portVersion" PATCHES="gcompris-$portVersion.patchset" ADDITIONAL_FILES="gcompris.rdef.in" @@ -51,6 +51,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix +# gcc_syslibs${secondaryArchSuffix}_devel qml_box2d_qt6$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel devel:libcrypto$secondaryArchSuffix >= 3 @@ -67,6 +68,8 @@ BUILD_REQUIRES=" devel:libssl$secondaryArchSuffix >= 3 " BUILD_PREREQUIRES=" +# cmd:clang_tidy +# cmd:cppcheck cmd:cmake cmd:gcc$secondaryArchSuffix cmd:make @@ -86,7 +89,7 @@ BUILD() -DGRAPHICAL_RENDERER=software \ -DQML_BOX2D_LIBRARY="`finddir B_SYSTEM_DATA_DIRECTORY`/Qt6/qml/Box2D" \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DBUILD_TESTING=ON + -DBUILD_TESTING=OFF make -C build $jobArgs } @@ -95,10 +98,6 @@ 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 \ diff --git a/games-kids/gcompris/patches/gcompris-25.0.patchset b/games-kids/gcompris/patches/gcompris-25.0.patchset deleted file mode 100644 index ca45a2928..000000000 --- a/games-kids/gcompris/patches/gcompris-25.0.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 54f85e503eea477d3ad59253ccdda967ce8a30ff Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Mon, 3 Feb 2025 11:05:00 +0100 -Subject: Rename GCompris binary on Haiku too - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4693f4..24082ec 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,6 +66,8 @@ endif() - # Set executable filename - if(ANDROID) - set(GCOMPRIS_EXECUTABLE_NAME GCompris) -+elseif(HAIKU) -+ set(GCOMPRIS_EXECUTABLE_NAME GCompris) - elseif(WIN32) - set(GCOMPRIS_EXECUTABLE_NAME GCompris) - else() --- -2.45.2 - diff --git a/games-kids/gcompris/patches/gcompris-25.1.patchset b/games-kids/gcompris/patches/gcompris-25.1.patchset new file mode 100644 index 000000000..2d1bd0b84 --- /dev/null +++ b/games-kids/gcompris/patches/gcompris-25.1.patchset @@ -0,0 +1,47 @@ +From 46ef75771ea1c74198847657e31dde30878f3fd6 Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +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 +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 +