diff --git a/games-kids/gcompris/gcompris-2.4.recipe b/games-kids/gcompris/gcompris-2.4.recipe index d178909bf..aec529b43 100644 --- a/games-kids/gcompris/gcompris-2.4.recipe +++ b/games-kids/gcompris/gcompris-2.4.recipe @@ -17,12 +17,17 @@ COPYRIGHT=" 2015 Siddhesh suthar " LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-$portVersion.tar.xz" CHECKSUM_SHA256="fd066e6f8f2b6ab547703d0f80e3dce8d4e538aaec13354afea8c76f90a3592d" SOURCE_DIR="gcompris-qt-$portVersion" -PATCHES="gcompris-$portVersion.patchset" 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" @@ -77,17 +82,17 @@ BUILD_PREREQUIRES=" BUILD() { - mkdir -p build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release \ + cmake -S . -B build \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$prefix \ -DQML_BOX2D_LIBRARY=$dataDir/Qt5/qml/Box2D.2.0 - make $jobArgs + + make -C build $jobArgs } INSTALL() { - cd build - make install + make -C build install local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" @@ -96,11 +101,12 @@ INSTALL() -e "s|@MIDDLE@|$MIDDLE|" \ $portDir/additional-files/gcompris.rdef.in > gcompris.rdef - addResourcesToBinaries gcompris.rdef \ - $binDir/gcompris-qt - mkdir -p $appsDir - mv $binDir/gcompris-qt $appsDir/GCompris - rm -r $binDir + mv $prefix/bin/gcompris-qt $appsDir/GCompris + rm -r $prefix/bin + + addResourcesToBinaries gcompris.rdef \ + $appsDir/GCompris + addAppDeskbarSymlink $appsDir/GCompris } diff --git a/games-kids/gcompris/patches/disable-translations-on-32-bit.patch b/games-kids/gcompris/patches/disable-translations-on-32-bit.patch new file mode 100644 index 000000000..2d89f00ee --- /dev/null +++ b/games-kids/gcompris/patches/disable-translations-on-32-bit.patch @@ -0,0 +1,25 @@ +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 +