commit: 6c794ca7d06a21a57bd2c32a61fbe20caa24b74d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jun 4 01:17:41 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jun 4 01:17:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c794ca7
media-libs/plotutils: fix build w/ C23; filter -Wformat-security * Fix build w/ C23 using opensuse patch. * Filter -Wformat-security as I still hit a failure even with the patch from bug #556568 and it seems to be to do w/ the ancient bison-generated grammar, not worth poking at more unless a new upstream release materialises. * Drop unnecessary elibtoolize, given eautoreconf does that for us. Bug: https://bugs.gentoo.org/556568 Closes: https://bugs.gentoo.org/946332 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/plotutils/files/plotutils-2.6-c23.patch | 25 ++++++++++++++++++++++ media-libs/plotutils/plotutils-2.6-r3.ebuild | 11 +++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/media-libs/plotutils/files/plotutils-2.6-c23.patch b/media-libs/plotutils/files/plotutils-2.6-c23.patch new file mode 100644 index 000000000000..eed7663e1373 --- /dev/null +++ b/media-libs/plotutils/files/plotutils-2.6-c23.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/946332 +https://build.opensuse.org/projects/openSUSE:Factory/packages/plotutils/files/plotutils-gcc15.patch?expand=1 +--- a/include/sys-defines.h ++++ b/include/sys-defines.h +@@ -255,7 +255,7 @@ extern __C_LINKAGE void free (void * ptr + + #ifndef __cplusplus + #ifdef __STDC__ +-typedef enum { false = 0, true = 1 } bool; ++# include <stdbool.h> + #else /* not __STDC__, do things the old-fashioned way */ + typedef int bool; + #define false 0 +--- a/libxmi/sys-defines.h ++++ b/libxmi/sys-defines.h +@@ -169,7 +169,7 @@ extern __C_LINKAGE void free (void * ptr + #ifndef __cplusplus + #ifndef HAVE_BOOL_IN_CC + #ifdef __STDC__ +-typedef enum { false = 0, true = 1 } bool; ++# include <stdbool.h> + #else /* not __STDC__, do things the old-fashioned way */ + typedef int bool; + #define false 0 + diff --git a/media-libs/plotutils/plotutils-2.6-r3.ebuild b/media-libs/plotutils/plotutils-2.6-r3.ebuild index 37fc0f56a857..1cc2640fcb44 100644 --- a/media-libs/plotutils/plotutils-2.6-r3.ebuild +++ b/media-libs/plotutils/plotutils-2.6-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit libtool autotools greadme +inherit autotools flag-o-matic greadme DESCRIPTION="Powerful C/C++ function library for exporting 2-D vector graphics" HOMEPAGE="https://www.gnu.org/software/plotutils/"; @@ -36,6 +36,7 @@ PATCHES=( "${FILESDIR}"/${P}-format-security.patch "${FILESDIR}"/${P}-configure-c99.patch "${FILESDIR}"/${P}-cxx17-fix.patch + "${FILESDIR}"/${P}-c23.patch ) src_prepare() { @@ -45,10 +46,12 @@ src_prepare() { sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die eautoreconf - elibtoolize } src_configure() { + # Ancient bison confuses things + append-flags -Wno-format-security + local myeconfargs=( --enable-shared --enable-libplotter @@ -57,11 +60,13 @@ src_configure() { $(use_with png libpng) $(usex X "--with-x --enable-libxmi" "--without-x") ) + econf "${myeconfargs[@]}" } src_install() { default + find "${ED}" -type f -name '*.la' -delete || die if use X ; then
