GrafX2: update to version 2.9

This commit is contained in:
PulkoMandy
2024-04-28 12:13:16 +02:00
parent 0ec0d86aeb
commit 56c190c904
2 changed files with 6 additions and 53 deletions

View File

@@ -6,15 +6,13 @@ pixel art, game graphics, and generally any detailed graphics painted with a \
mouse."
HOMEPAGE="http://grafx2.tk"
COPYRIGHT="1995-2001 Sunset Design
2007-2021 GrafX2 project team"
2007-2024 GrafX2 project team"
LICENSE="GNU GPL v2"
REVISION="2"
GITREV="8e2d28b5cfd0e3220ce4c5b38be8d0f3af650c89"
SOURCE_URI="https://gitlab.com/GrafX2/grafX2/-/archive/${GITREV}/grafX2-${GITREV}.tar.bz2"
SOURCE_FILENAME="grafx2-2.8-${GITREV}.tar.gz"
SOURCE_DIR="grafX2-${GITREV}"
CHECKSUM_SHA256="21320e7d82eb3c6881dc2a4e9ae37e579eecd703d31dbb172cc881220a115dd2"
PATCHES="grafx2-$portVersion.patchset"
REVISION="1"
SOURCE_URI="https://pulkomandy.tk/projects/GrafX2/downloads/74"
SOURCE_FILENAME="grafx2-v2.9.tar.gz"
SOURCE_DIR="grafx2-v2.9"
CHECKSUM_SHA256="06ef4e22eb6020bcdc42b189c689642de668af6b4c7c286c4db9dc54f45b6950"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"

View File

@@ -1,45 +0,0 @@
From 9df6715c21c6064153a068f11ff008d71615aefc Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 30 Mar 2021 10:59:41 +0200
Subject: include haiku.h in setup.c
improve haiku_get_app_path()
diff --git a/src/haiku.cpp b/src/haiku.cpp
index 708564c..a13e623 100644
--- a/src/haiku.cpp
+++ b/src/haiku.cpp
@@ -63,12 +63,13 @@ char* haiku_get_clipboard()
const char* haiku_get_app_path()
{
static image_info info;
- static int32 cookie = 0;
+ int32 cookie = 0;
- if (cookie == 0) do {
- get_next_image_info(B_CURRENT_TEAM, &cookie, &info);
- } while (info.type != B_APP_IMAGE);
+ while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) {
+ if (info.type == B_APP_IMAGE)
+ return info.name;
+ }
- return info.name;
+ return NULL;
}
#endif
diff --git a/src/setup.c b/src/setup.c
index 3ecb0f6..1a5844c 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -43,6 +43,7 @@
#include <errno.h>
#elif defined(__HAIKU__)
#include <FindDirectory.h>
+ #include "haiku.h"
#endif
#include "struct.h"
--
2.30.0