summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2025-01-05 18:47:14 -0500
committerMichael Orlitzky <mjo@gentoo.org>2025-01-05 18:47:44 -0500
commit4cde18d639173c4123212aefe0fb7d367e576755 (patch)
tree44cb4bc253e6666a35ab3d476b29dfa08053e13e /dev-gap
parentmedia-libs/gstreamer: actually control ptp w/ USE=ptp (diff)
downloadgentoo-4cde18d639173c4123212aefe0fb7d367e576755.tar.gz
gentoo-4cde18d639173c4123212aefe0fb7d367e576755.tar.bz2
gentoo-4cde18d639173c4123212aefe0fb7d367e576755.zip
dev-gap/guava: bool patch for C23
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
Diffstat (limited to 'dev-gap')
-rw-r--r--dev-gap/guava/files/guava-3.19-C23.patch25
-rw-r--r--dev-gap/guava/guava-3.19-r2.ebuild (renamed from dev-gap/guava/guava-3.19-r1.ebuild)7
2 files changed, 30 insertions, 2 deletions
diff --git a/dev-gap/guava/files/guava-3.19-C23.patch b/dev-gap/guava/files/guava-3.19-C23.patch
new file mode 100644
index 000000000000..e9e6520d70aa
--- /dev/null
+++ b/dev-gap/guava/files/guava-3.19-C23.patch
@@ -0,0 +1,25 @@
+From 3dc3b1a2e1f5935fa105531ad9f4cf604aeefcb1 Mon Sep 17 00:00:00 2001
+From: Joe Fields <fieldsj1@southernct.edu>
+Date: Sat, 4 Jan 2025 15:45:01 -0500
+Subject: [PATCH] Put def of bool type in #ifdef for C23 compatability
+
+---
+ src/ctjhai/types.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/ctjhai/types.h b/src/ctjhai/types.h
+index d805dae..c295752 100644
+--- a/src/ctjhai/types.h
++++ b/src/ctjhai/types.h
+@@ -24,7 +24,10 @@ typedef struct {
+ unsigned int **m;
+ } MATRIX;
+
+-typedef enum { false = 0, true = 1 } bool;
++#if __STDC_VERSION__ <= 201710L
++ typedef enum { false = 0, true = 1 } bool;
++#endif
++
+ typedef enum { C_0MOD2 = 1, C_1MOD2, C_3MOD4, C_0MOD4, C_0MOD3 } mod_t;
+
+ typedef struct {
diff --git a/dev-gap/guava/guava-3.19-r1.ebuild b/dev-gap/guava/guava-3.19-r2.ebuild
index 9084820391cc..9320927bd826 100644
--- a/dev-gap/guava/guava-3.19-r1.ebuild
+++ b/dev-gap/guava/guava-3.19-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,10 @@ KEYWORDS="~amd64 ~riscv"
DEPEND="sci-mathematics/gap"
-PATCHES=( "${FILESDIR}/${PN}-3.15-makefile.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-3.15-makefile.patch"
+ "${FILESDIR}/${PN}-3.19-C23.patch"
+)
GAP_PKG_EXTRA_INSTALL=( tbl )
gap-pkg_enable_tests