diff --git a/games-engines/scummvm/patches/scummvm-2.9.1.patchset b/games-engines/scummvm/patches/scummvm-2.9.1.patchset index 3c7defa7d..dfd655050 100644 --- a/games-engines/scummvm/patches/scummvm-2.9.1.patchset +++ b/games-engines/scummvm/patches/scummvm-2.9.1.patchset @@ -1,4 +1,4 @@ -From 126506f1365c483ab3bffaf13b2524028067b7fb Mon Sep 17 00:00:00 2001 +From 8e3c9607a983f6c07577f88e8e87dd7956e1307b Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 25 Jan 2025 10:12:50 +0100 Subject: Haiku patch @@ -97,3 +97,30 @@ index a9b2525..8abda06 100755 -- 2.48.1 + +From 5dee27721596cd087c42db55099ed7812a334ce9 Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Tue, 13 May 2025 10:40:18 +0200 +Subject: Fix conflicting int types + + +diff --git a/common/scummsys.h b/common/scummsys.h +index 397e46d..ce3a169 100644 +--- a/common/scummsys.h ++++ b/common/scummsys.h +@@ -505,6 +505,12 @@ + */ + typedef unsigned long uint32; + typedef signed long int32; ++#elif defined(__HAIKU__) ++ /** ++ * Without this, we get conflicting declaration errors on Haiku 32bit ++ * For 64bit this doesn't change much ++ */ ++ #include + #else + typedef uint32_t uint32; + typedef int32_t int32; +-- +2.48.1 + diff --git a/games-engines/scummvm/scummvm-2.9.1.recipe b/games-engines/scummvm/scummvm-2.9.1.recipe index 35b765c70..ab843e93b 100644 --- a/games-engines/scummvm/scummvm-2.9.1.recipe +++ b/games-engines/scummvm/scummvm-2.9.1.recipe @@ -102,7 +102,7 @@ INSTALL() make install mv $appsDir/scummvm $appsDir/ScummVM - #we are not linux + # cleanup rm -r $dataDir/{applications,icons,pixmaps} local MAJOR="`echo "$portVersion" | cut -d. -f1`"