Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 116b60aa9d8e
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 301c10a7660b
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Dec 23, 2021

  1. edgar, bump version (#6492)

    @Begasus
    Begasus authored Dec 23, 2021
    Copy the full SHA
    301c10a View commit details
Showing with 145 additions and 74 deletions.
  1. +0 −74 games-arcade/edgar/edgar-1.29.recipe
  2. +83 −0 games-arcade/edgar/edgar-1.34.recipe
  3. +62 −0 games-arcade/edgar/patches/edgar-1.34.patchset
74 changes: 0 additions & 74 deletions games-arcade/edgar/edgar-1.29.recipe
View file

This file was deleted.

83 changes: 83 additions & 0 deletions games-arcade/edgar/edgar-1.34.recipe
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
SUMMARY="The Legend of Edgar is a platform game"
DESCRIPTION="Edgar must battle his way across the world, solving puzzles and \
defeating powerful enemies to achieve his quest. When Edgar's father fails \
to return home after venturing out one dark and stormy night, Edgar fears the \
worst: he has been captured by the evil sorceror who lives in a fortress \
beyond the forbidden swamp. Donning his armour, Edgar sets off to rescue him, \
but his quest will not be easy..."
HOMEPAGE="https://www.parallelrealities.co.uk/games/edgar/"
COPYRIGHT="2009-2021 Parallel Realities"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/riksweeney/edgar/releases/download/$portVersion/edgar-$portVersion-1.tar.gz"
CHECKSUM_SHA256="f4793f9a14cc0cddf516fe5dadaa91d87836852668ab1188cee88dc90bce4184"
SOURCE_FILENAME="edgar-$portVersion.tar.gz"
SOURCE_DIR="edgar-$portVersion"
PATCHES="edgar-$portVersion.patchset"
ADDITIONAL_FILES="edgar.rdef.in"

ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"

USER_SETTINGS_FILES="
settings/parallelrealities/Edgar directory
"

PROVIDES="
edgar$secondaryArchSuffix = $portVersion
app:Edgar = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libSDL2_2.0$secondaryArchSuffix
lib:libSDL2_image_2.0$secondaryArchSuffix
lib:libSDL2_mixer_2.0$secondaryArchSuffix
lib:libSDL2_ttf_2.0$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libintl$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libSDL2_2.0$secondaryArchSuffix
devel:libSDL2_image_2.0$secondaryArchSuffix
devel:libSDL2_mixer_2.0$secondaryArchSuffix
devel:libSDL2_ttf_2.0$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:make
"

BUILD()
{
make PREFIX=$prefix BIN_DIR=$appsDir/ \
DATA_DIR=$dataDir/edgar/ DOC_DIR=$docDir/ \
MAN_DIR=$manDir/man6 LOCALE_DIR=$dataDir/locale/ $jobArgs
}

INSTALL()
{
make install PREFIX=$prefix BIN_DIR=$appsDir/ \
DATA_DIR=$dataDir/edgar/ DOC_DIR=$docDir/ \
MAN_DIR=$manDir/man6 LOCALE_DIR=$dataDir/locale/

rm -rf $prefix/share
mv $appsDir/edgar $appsDir/Edgar

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/edgar.rdef.in > edgar.rdef

addResourcesToBinaries edgar.rdef \
$appsDir/Edgar

addAppDeskbarSymlink $appsDir/Edgar
}
62 changes: 62 additions & 0 deletions games-arcade/edgar/patches/edgar-1.34.patchset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
From d5c7d8ff829dcc9953e496e77c695f3e5cfdb3db Mon Sep 17 00:00:00 2001
From: TURX <turx2003@gmail.com>
Date: Tue, 21 Jan 2020 23:14:22 +0800
Subject: [PATCH] fix Haiku support


diff --git a/src/system/load_save.c b/src/system/load_save.c
index 98d2283..4293283 100644
--- a/src/system/load_save.c
+++ b/src/system/load_save.c
@@ -42,6 +42,10 @@ Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
#include "load_save.h"
#include "resources.h"

+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#endif
+
static char gameSavePath[MAX_PATH_LENGTH], tempFile[MAX_PATH_LENGTH], saveFileIndex[MAX_PATH_LENGTH], continueFile[MAX_PATH_LENGTH];
static int temporaryDataExists;

@@ -58,6 +62,7 @@ extern Game game;
{
char *userHome;
char dir[MAX_PATH_LENGTH];
+ char path[MAX_PATH_LENGTH];
struct passwd *pass;

pass = getpwuid(geteuid());
@@ -73,6 +78,9 @@ extern Game game;

#if MACOS == 1
SNPRINTF(dir, sizeof(dir), "%s/Library/Application Support", userHome);
+ #elif defined(__HAIKU__)
+ find_directory(B_USER_SETTINGS_DIRECTORY, 0, true, path, sizeof(path));
+ snprintf(dir, sizeof(dir), "%s/parallelrealities", path);
#else
SNPRINTF(dir, sizeof(dir), "%s/.parallelrealities", userHome);
#endif
@@ -86,6 +94,9 @@ extern Game game;

#if MACOS == 1
SNPRINTF(dir, sizeof(dir), "%s/Library/Application Support/Edgar", userHome);
+ #elif defined(__HAIKU__)
+ find_directory(B_USER_SETTINGS_DIRECTORY, 0, true, path, sizeof(path));
+ snprintf(dir, sizeof(dir), "%s/parallelrealities/Edgar", path);
#else
SNPRINTF(dir, sizeof(dir), "%s/.parallelrealities/edgar", userHome);
#endif
@@ -99,6 +110,9 @@ extern Game game;

#if MACOS == 1
SNPRINTF(gameSavePath, sizeof(gameSavePath), "%s/Library/Application Support/Edgar/", userHome);
+ #elif defined(__HAIKU__)
+ find_directory(B_USER_SETTINGS_DIRECTORY, 0, true, path, sizeof(path));
+ snprintf(gameSavePath, sizeof(gameSavePath), "%s/parallelrealities/Edgar", path);
#else
SNPRINTF(gameSavePath, sizeof(gameSavePath), "%s/.parallelrealities/edgar/", userHome);
#endif
--
2.30.2