From 62b4801a763ec653984c1bd058d9ecb72d013d44 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 28 Apr 2023 16:32:03 +0200 Subject: [PATCH] mgba: drop now unneeded workaround --- games-emulation/mgba/mgba-0.9.3.recipe | 3 +- .../mgba/patches/mgba-0.9.3.patchset | 35 ------------------- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 games-emulation/mgba/patches/mgba-0.9.3.patchset diff --git a/games-emulation/mgba/mgba-0.9.3.recipe b/games-emulation/mgba/mgba-0.9.3.recipe index 6ad27a187..07cdb3f2f 100644 --- a/games-emulation/mgba/mgba-0.9.3.recipe +++ b/games-emulation/mgba/mgba-0.9.3.recipe @@ -12,11 +12,10 @@ and a modern feature set for emulators that older emulators may not support." HOMEPAGE="https://mgba.io/" COPYRIGHT="2013-2021 Jeffrey Pfau" LICENSE="MPL v2.0" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/mgba-emu/mgba/archive/$portVersion.tar.gz" CHECKSUM_SHA256="692ff0ac50e18380df0ff3ee83071f9926715200d0dceedd9d16a028a59537a0" ADDITIONAL_FILES="mgba.rdef.in" -PATCHES="mgba-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" diff --git a/games-emulation/mgba/patches/mgba-0.9.3.patchset b/games-emulation/mgba/patches/mgba-0.9.3.patchset deleted file mode 100644 index b846c2c85..000000000 --- a/games-emulation/mgba/patches/mgba-0.9.3.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From c540a757aa411ad99fa28c84878d673eb586fceb Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 29 Mar 2023 20:55:37 +0200 -Subject: Haiku: disable locale support to workaround a crash in uselocale - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5413367..65f8f9c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -400,7 +400,7 @@ if(HAVE_LOCALTIME_R) - list(APPEND FUNCTION_DEFINES HAVE_LOCALTIME_R) - endif() - --if(HAVE_NEWLOCALE AND HAVE_FREELOCALE AND HAVE_USELOCALE OR APPLE) -+if(HAVE_NEWLOCALE AND HAVE_FREELOCALE AND HAVE_USELOCALE OR APPLE AND NOT HAIKU) - list(APPEND FUNCTION_DEFINES HAVE_LOCALE) - if (HAVE_SNPRINTF_L) - list(APPEND FUNCTION_DEFINES HAVE_SNPRINTF_L) -diff --git a/include/mgba-util/formatting.h b/include/mgba-util/formatting.h -index 6eb01ff..1e70836 100644 ---- a/include/mgba-util/formatting.h -+++ b/include/mgba-util/formatting.h -@@ -15,7 +15,7 @@ CXX_GUARD_START - #ifdef HAVE_XLOCALE - #include - #elif !defined(HAVE_LOCALE) --typedef const char* locale_t; -+typedef void* locale_t; - #endif - - int ftostr_l(char* restrict str, size_t size, float f, locale_t locale); --- -2.37.3 -