From da398c1ea320cbc086e5e9d3e60d5ac63324d451 Mon Sep 17 00:00:00 2001 From: Dexter Reed Date: Sun, 14 Jul 2024 10:10:04 +0100 Subject: [PATCH] (Needs a new release or a patchset, please do not merge!) ClassiCube: bump version (#10229) * ClassiCube: bump version * ClassiCube: reset revision Co-authored-by: OscarL * classicube, use latest commit --------- Co-authored-by: OscarL Co-authored-by: Schrijvers Luc --- .../classicube/additional-files/launcher.sh | 2 +- ...ecipe => classicube-1.3.6~20240714.recipe} | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) rename games-action/classicube/{classicube-1.3.0.recipe => classicube-1.3.6~20240714.recipe} (87%) diff --git a/games-action/classicube/additional-files/launcher.sh b/games-action/classicube/additional-files/launcher.sh index 355a12f75..234400251 100644 --- a/games-action/classicube/additional-files/launcher.sh +++ b/games-action/classicube/additional-files/launcher.sh @@ -2,4 +2,4 @@ APP=`finddir B_APPS_DIRECTORY`/ClassiCube/ClassiCube SETTINGS_DIR=`finddir B_USER_SETTINGS_DIRECTORY`/ClassiCube mkdir -p ${SETTINGS_DIR} -$APP -d${SETTINGS_DIR} +cd ${SETTINGS_DIR} && $APP diff --git a/games-action/classicube/classicube-1.3.0.recipe b/games-action/classicube/classicube-1.3.6~20240714.recipe similarity index 87% rename from games-action/classicube/classicube-1.3.0.recipe rename to games-action/classicube/classicube-1.3.6~20240714.recipe index 9a494bada..190e8538b 100644 --- a/games-action/classicube/classicube-1.3.0.recipe +++ b/games-action/classicube/classicube-1.3.6~20240714.recipe @@ -18,10 +18,11 @@ What ClassiCube isn't: HOMEPAGE="https://www.classicube.net/" COPYRIGHT="2014-2022 UnknownShadow200" LICENSE="BSD (3-clause)" -REVISION="2" -SOURCE_URI="https://github.com/UnknownShadow200/ClassiCube/archive/refs/tags/$portVersion.tar.gz" -CHECKSUM_SHA256="8373605a45d89229520fe03bf8f5a1ada82377651e7330edd65a3f79327f8331" -SOURCE_DIR="ClassiCube-$portVersion" +REVISION="1" +srcGitRev="e8e1a7c0626b35a0fd17ac1d2359675f836e42ae" +SOURCE_URI="https://github.com/ClassiCube/ClassiCube/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="94f9f4c1d40b89d3b5a30f582f3f5a3bfe9d1757f5bfb7e5de43d90a3e5c1ead" +SOURCE_DIR="ClassiCube-$srcGitRev" ADDITIONAL_FILES=" classicube.rdef.in launcher.sh @@ -61,14 +62,8 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCH() -{ - sed -i -e 's|r.me##reg|r.e##reg|g' $sourceDir/src/Logger.c -} - BUILD() { - cd src make $jobArgs } @@ -77,13 +72,13 @@ INSTALL() mkdir -p $appsDir/ClassiCube cp $portDir/additional-files/launcher.sh "$appsDir/ClassiCube/ClassiCube Launcher" - cp src/ClassiCube $appsDir/ClassiCube + cp ClassiCube $appsDir/ClassiCube strip $appsDir/ClassiCube/ClassiCube local APP_SIGNATURE="application/x-vnd.classicube" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" + local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`" local LONG_INFO="$SUMMARY" sed \ -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \