diff --git a/games-kids/gcompris/gcompris-2.4.recipe b/games-kids/gcompris/gcompris-3.3.recipe similarity index 88% rename from games-kids/gcompris/gcompris-2.4.recipe rename to games-kids/gcompris/gcompris-3.3.recipe index 26ce7d49d..e432f3747 100644 --- a/games-kids/gcompris/gcompris-2.4.recipe +++ b/games-kids/gcompris/gcompris-3.3.recipe @@ -3,8 +3,7 @@ DESCRIPTION="GCompris is a high quality educational software suite comprising \ of numerous activities for children aged 2 to 10. Some of the activities are game orientated, but nonetheless still educational." HOMEPAGE="https://gcompris.net/" -COPYRIGHT=" - 2014-2016 Bruno Coudoin +COPYRIGHT="2014-2016 Bruno Coudoin 2014-2016 Johnny Jazeix 2016 Stefan Toncu 2014-2015 Stephane Mankowski @@ -14,20 +13,14 @@ COPYRIGHT=" 2014 Pulkit Gupta 2010-2011 Alessandro Portale 2014 Aruna Sankaranarayanan - 2015 Siddhesh suthar - " + 2015 Siddhesh suthar" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-$portVersion.tar.xz" -CHECKSUM_SHA256="fd066e6f8f2b6ab547703d0f80e3dce8d4e538aaec13354afea8c76f90a3592d" +CHECKSUM_SHA256="f21aa2ab5c18c388ab6ce5c2af0709a9332e2c84b34a64aa3eec36467f17cd00" SOURCE_DIR="gcompris-qt-$portVersion" ADDITIONAL_FILES="gcompris.rdef.in" PATCHES="gcompris-$portVersion.patchset" -if [ "$targetArchitecture" = x86_gcc2 ]; then - # lconvert crashes while generating translations - PATCHES="$PATCHES - disable-translations-on-32-bit.patch" -fi ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -85,8 +78,8 @@ BUILD() cmake -S . -B build \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$prefix \ - -DQML_BOX2D_LIBRARY=$dataDir/Qt5/qml/Box2D.2.0 - + -DQML_BOX2D_LIBRARY=$dataDir/Qt5/qml/Box2D.2.0 \ + -DGRAPHICAL_RENDERER=software make -C build $jobArgs } diff --git a/games-kids/gcompris/patches/disable-translations-on-32-bit.patch b/games-kids/gcompris/patches/disable-translations-on-32-bit.patch deleted file mode 100644 index 2d89f00ee..000000000 --- a/games-kids/gcompris/patches/disable-translations-on-32-bit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 157ebccb093d91ac1cb46f764241b435bbea829e Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Thu, 12 May 2022 17:55:51 -0600 -Subject: [PATCH] disable translations on 32 bit - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 288e3ba..7cbc6ff 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -241,7 +241,7 @@ if(WIN32) - DEPENDS ${QM_FILES} - COMMENT "If you don't have the .po, you need to run make getSvnTranslations first then re-run cmake" - ) --else() -+elseif(NOT HAIKU) - add_custom_target(BuildTranslations ALL - DEPENDS ${QM_FILES} - COMMENT "If you don't have the .po, you need to run make getSvnTranslations first then re-run cmake" --- -2.30.2 - diff --git a/games-kids/gcompris/patches/gcompris-2.4.patchset b/games-kids/gcompris/patches/gcompris-2.4.patchset deleted file mode 100644 index 70fb35419..000000000 --- a/games-kids/gcompris/patches/gcompris-2.4.patchset +++ /dev/null @@ -1,34 +0,0 @@ -From 6778909b16c804044adc5bec7ad54b609460be89 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 22 Apr 2017 14:24:24 +0200 -Subject: Haiku patch - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fabdfc..19e2347 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -158,6 +158,8 @@ set(GRAPHICAL_RENDERER "auto" CACHE STRING "Policy for choosing the renderer bac - if(CMAKE_HOST_APPLE) - set(_bundle_bin gcompris-qt.app/Contents/MacOS) - set(_data_dest_dir bin/${_bundle_bin}/../Resources) -+elseif(HAIKU) -+ set(_data_dest_dir data/${GCOMPRIS_EXECUTABLE_NAME}) - else() - set(_data_dest_dir share/${GCOMPRIS_EXECUTABLE_NAME}) - endif() -diff --git a/cmake/rcc.cmake b/cmake/rcc.cmake -index 633bc35..5e589cf 100644 ---- a/cmake/rcc.cmake -+++ b/cmake/rcc.cmake -@@ -51,7 +51,7 @@ function(GCOMPRIS_ADD_RCC resource_path) - if(CMAKE_HOST_APPLE) - install(FILES ${CREATED_RCC} DESTINATION ${GCOMPRIS_EXECUTABLE_NAME}.app/Contents/MacOS/rcc) - else() -- install(FILES ${CREATED_RCC} DESTINATION share/${GCOMPRIS_EXECUTABLE_NAME}/rcc) -+ install(FILES ${CREATED_RCC} DESTINATION ${_data_dest_dir}/rcc) - endif() - - add_custom_target( --- -2.30.2 - diff --git a/games-kids/gcompris/patches/gcompris-3.3.patchset b/games-kids/gcompris/patches/gcompris-3.3.patchset new file mode 100644 index 000000000..87704c5b3 --- /dev/null +++ b/games-kids/gcompris/patches/gcompris-3.3.patchset @@ -0,0 +1,58 @@ +From e5b3c6620db4f7a8acb8473227cc9178af7ae4f9 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Fri, 24 Nov 2023 11:23:02 +0100 +Subject: Set data path + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7fc5a7c..87403f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -157,6 +157,8 @@ set(GRAPHICAL_RENDERER "auto" CACHE STRING "Policy for choosing the renderer bac + if(CMAKE_HOST_APPLE) + set(_bundle_bin gcompris-qt.app/Contents/MacOS) + set(_data_dest_dir bin/${_bundle_bin}/../Resources) ++elseif(HAIKU) ++ set(_data_dest_dir data/Qt5/${GCOMPRIS_EXECUTABLE_NAME}) + else() + set(_data_dest_dir share/${GCOMPRIS_EXECUTABLE_NAME}) + endif() +diff --git a/cmake/rcc.cmake b/cmake/rcc.cmake +index 633bc35..b022fbc 100644 +--- a/cmake/rcc.cmake ++++ b/cmake/rcc.cmake +@@ -50,6 +50,8 @@ function(GCOMPRIS_ADD_RCC resource_path) + + if(CMAKE_HOST_APPLE) + install(FILES ${CREATED_RCC} DESTINATION ${GCOMPRIS_EXECUTABLE_NAME}.app/Contents/MacOS/rcc) ++ elseif(HAIKU) ++ install(FILES ${CREATED_RCC} DESTINATION ${_data_dest_dir}/rcc) + else() + install(FILES ${CREATED_RCC} DESTINATION share/${GCOMPRIS_EXECUTABLE_NAME}/rcc) + endif() +-- +2.42.1 + + +From 15d01cf75fe99a9fb6b7b9d3918ed029174b150e Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Fri, 24 Nov 2023 11:35:04 +0100 +Subject: Disable fullscreen on first launch + + +diff --git a/src/core/main.cpp b/src/core/main.cpp +index 4ee0243..5617d19 100644 +--- a/src/core/main.cpp ++++ b/src/core/main.cpp +@@ -231,7 +231,7 @@ int main(int argc, char *argv[]) + ApplicationInfo::getInstance()->checkPermissions(); + + // Disable default fullscreen launch on Mac as it's a bit broken, window is behind desktop bars +-#if defined(Q_OS_MAC) ++#if defined(Q_OS_MAC) || defined(Q_OS_HAIKU) + bool isFullscreen = false; + #else + // for other platforms, fullscreen is the default value +-- +2.42.1 +