diff --git a/app-emulation/86Box/86Box-5.3.ebuild b/app-emulation/86Box/86Box-6.0.ebuild similarity index 95% rename from app-emulation/86Box/86Box-5.3.ebuild rename to app-emulation/86Box/86Box-6.0.ebuild index 5c9495e0ba937..7342ca18e79bd 100644 --- a/app-emulation/86Box/86Box-5.3.ebuild +++ b/app-emulation/86Box/86Box-6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -47,8 +47,6 @@ BDEPEND=" qt6? ( kde-frameworks/extra-cmake-modules ) " -PATCHES=( "${FILESDIR}/${PN}-5.3-fallthrough-define-available-in-C-code.patch" ) - src_configure() { # LTO needs to be filtered # See https://bugs.gentoo.org/854507 diff --git a/app-emulation/86Box/Manifest b/app-emulation/86Box/Manifest index 70e22d3b6637d..8f2999d071cf5 100644 --- a/app-emulation/86Box/Manifest +++ b/app-emulation/86Box/Manifest @@ -1 +1 @@ -DIST 86Box-5.3.tar.gz 14001417 BLAKE2B a70679787fc7a601afa7ac3b69f4bb58afa2939d7a876048c6b944bdcb3affbc58ac8bfbe1e95088eaa93bf872172068bc0421602465d2a352d9674fcc255c41 SHA512 120fbf7544cc91dd9f7b75027cd6219084aa71e97e8ef2ad105ac8ccc7bea2a9290c2d124461da0192c3000c0459fe65c1fd361342de33b06c80616592f52f84 +DIST 86Box-6.0.tar.gz 17170254 BLAKE2B 68eca4509c09de991977eb1305b38c897e3cb2dca148fae231909d5cad0726f7bd56f697d95bdba931b63afda3a2817d8756238adeada4bebbf20c6c5238f7f3 SHA512 7c85d3713b73e818b89252474400a6470890648c2b89e8a03309dd2b654b0b25e02664776bc0ccfe821539ee832f0816ec8b222df7a8d137c4f44692aa3b4ca0 diff --git a/app-emulation/86Box/files/86Box-5.3-fallthrough-define-available-in-C-code.patch b/app-emulation/86Box/files/86Box-5.3-fallthrough-define-available-in-C-code.patch deleted file mode 100644 index c08c028824184..0000000000000 --- a/app-emulation/86Box/files/86Box-5.3-fallthrough-define-available-in-C-code.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0092ce15de3efac108b961882f870a8c05e8c38f Mon Sep 17 00:00:00 2001 -From: OBattler -Date: Mon, 22 Dec 2025 22:56:10 +0100 -Subject: [PATCH] Only make the fallthrough define available in C code, fixes - #6607. - ---- - src/include/86box/plat.h | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/include/86box/plat.h b/src/include/86box/plat.h -index dcf7e4d5306..cbc348709ec 100644 ---- a/src/include/86box/plat.h -+++ b/src/include/86box/plat.h -@@ -90,16 +90,12 @@ extern int strnicmp(const char *s1, const char *s2, size_t n); - # include - # define atomic_flag_t std::atomic_flag - # define atomic_bool_t std::atomic_bool -+ - extern "C" { - #else - # include - # define atomic_flag_t atomic_flag - # define atomic_bool_t atomic_bool --#endif -- --#if defined(_MSC_VER) --# define ssize_t intptr_t --#endif - - #ifdef _MSC_VER - # define fallthrough do {} while (0) /* fallthrough */ -@@ -114,6 +110,12 @@ extern "C" { - # endif - #endif - -+#endif -+ -+#if defined(_MSC_VER) -+# define ssize_t intptr_t -+#endif -+ - /* Global variables residing in the platform module. */ - extern int dopause; /* system is paused */ - extern int mouse_capture; /* mouse is captured in app */