From 810d51c0898a7a1ffb1db4892aeec9e7c344d82a Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 21 Mar 2025 10:37:49 +0000 Subject: [PATCH] media-libs/libxmi: replace the patch with the good one Closes: https://bugs.gentoo.org/951707 Signed-off-by: Alexey Sokolov Closes: https://github.com/gentoo/gentoo/pull/41208 Signed-off-by: Sam James --- .../libxmi/files/libxmi-1.3-gcc15.patch | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/media-libs/libxmi/files/libxmi-1.3-gcc15.patch b/media-libs/libxmi/files/libxmi-1.3-gcc15.patch index f4d63a1391967..44074fd0370bb 100644 --- a/media-libs/libxmi/files/libxmi-1.3-gcc15.patch +++ b/media-libs/libxmi/files/libxmi-1.3-gcc15.patch @@ -1,12 +1,23 @@ -https://bugs.gentoo.org/944450 (and https://bugs.gentoo.org/951707) +https://bugs.gentoo.org/944450 + --- a/sys-defines.h +++ b/sys-defines.h -@@ -169,7 +169,7 @@ extern __C_LINKAGE void free (void * ptr); - #ifndef __cplusplus - #ifndef HAVE_BOOL_IN_CC - #ifdef __STDC__ +@@ -166,17 +166,7 @@ extern __C_LINKAGE void free (void * ptr); + /* Support the `bool' datatype, which our code uses extensively. */ + /**************************************************************************/ + +-#ifndef __cplusplus +-#ifndef HAVE_BOOL_IN_CC +-#ifdef __STDC__ -typedef enum { false = 0, true = 1 } bool; +-#else /* not __STDC__, do things the old-fashioned way */ +-typedef int bool; +-#define false 0 +-#define true 1 +-#endif +-#endif /* not HAVE_BOOL_IN_CC */ +-#endif /* not __cplusplus */ +#include - #else /* not __STDC__, do things the old-fashioned way */ - typedef int bool; - #define false 0 + + /**************************************************************************/ + /* Define numerical constants (unofficial, so may not be in math.h). */