commit: 947fd83b700df4cec07c2a2c815d89c852562116 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Mon Sep 1 14:06:20 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Sep 2 11:46:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947fd83b
app-text/yodl: fix c23 remove unneeded sed-op for CXX/AR/RANLIB, define vars is sufficient add ghostscript-gpl to build pdf doc remove c++17 for std::filesystem, no longer required with versions in tree fix c23 with a patch Bug: https://bugs.gentoo.org/944159 Closes: https://bugs.gentoo.org/883209 Closes: https://bugs.gentoo.org/929232 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/43638 Closes: https://github.com/gentoo/gentoo/pull/43638 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/yodl/files/yodl-4.05.00-fix_c23.patch | 16 +++++++++++++++ app-text/yodl/files/yodl-4.05.00-stdbool.patch | 28 -------------------------- app-text/yodl/yodl-4.05.00.ebuild | 17 +++++----------- 3 files changed, 21 insertions(+), 40 deletions(-) diff --git a/app-text/yodl/files/yodl-4.05.00-fix_c23.patch b/app-text/yodl/files/yodl-4.05.00-fix_c23.patch new file mode 100644 index 000000000000..829e4b183a4d --- /dev/null +++ b/app-text/yodl/files/yodl-4.05.00-fix_c23.patch @@ -0,0 +1,16 @@ +add missing includes for bool and va_copy +https://gitlab.com/fbb-git/yodl/-/merge_requests/5 (commented) +https://gitlab.com/fbb-git/yodl/-/merge_requests/6 +https://bugs.gentoo.org/929232 +https://bugs.gentoo.org/944159 +--- a/root/root.h ++++ b/root/root.h +@@ -11,6 +11,8 @@ + #define _GNU_SOURCE + #endif + ++#include <stdarg.h> ++#include <stdbool.h> + #include <stddef.h> + + #define MAX_LINE_LENGTH (1000) diff --git a/app-text/yodl/files/yodl-4.05.00-stdbool.patch b/app-text/yodl/files/yodl-4.05.00-stdbool.patch deleted file mode 100644 index ee346dd811d5..000000000000 --- a/app-text/yodl/files/yodl-4.05.00-stdbool.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://gitlab.com/fbb-git/yodl/-/merge_requests/5 -https://bugs.gentoo.org/944159 - -From cb274148430b97828b39884e5590d9d5585b8e79 Mon Sep 17 00:00:00 2001 -From: Xeonacid <[email protected]> -Date: Mon, 26 May 2025 20:09:11 +0800 -Subject: [PATCH] Add missing stdbool.h - -Fix build error with GCC 15 ---- - yodl/media/media.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/yodl/media/media.h b/yodl/media/media.h -index 81bcb38c..ac004e6b 100644 ---- a/media/media.h -+++ b/media/media.h -@@ -2,6 +2,7 @@ - #define INCLUDED_MEDIA_H_ - - #include <stdio.h> -+#include <stdbool.h> - #include "../queue/queue.h" - - /* --- -GitLab - diff --git a/app-text/yodl/yodl-4.05.00.ebuild b/app-text/yodl/yodl-4.05.00.ebuild index 38244969fa95..75d1525fa0e6 100644 --- a/app-text/yodl/yodl-4.05.00.ebuild +++ b/app-text/yodl/yodl-4.05.00.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit toolchain-funcs flag-o-matic prefix +inherit toolchain-funcs prefix DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it" HOMEPAGE="https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl"; @@ -18,33 +18,26 @@ IUSE="doc" BDEPEND=" >=dev-build/icmake-9.03.01-r1 doc? ( + app-text/ghostscript-gpl dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) " PATCHES=( - "${FILESDIR}/${P}"-stdbool.patch "${FILESDIR}/${P}"-echo.patch "${FILESDIR}/${P}"-man.patch + "${FILESDIR}/${P}"-fix_c23.patch ) src_prepare() { sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \ -e "/COMPILER =/s/gcc/$(tc-getCC)/" \ - -e "/CXX =/s/g++/$(tc-getCXX)/" \ -i INSTALL.im || die - sed -e "s/ar r /$(tc-getAR) r /" \ - -e "s/ranlib/$(tc-getRANLIB)/" \ - -i icmake/stdcompile || die - sed -e '/strip/s|"-s"|""|g' \ -i icmake/program || die - # required for std::filesystem usage - append-cxxflags -std=c++17 - hprefixify build default @@ -52,8 +45,8 @@ src_prepare() { src_compile() { local target - for target in programs macros man $(usex doc manual ''); do - AR=$(tc-getAR) RANLIB=$(tc-getRANLIB) ./build ${target} || + for target in programs macros man $(usev doc manual); do + CXX=$(tc-getCXX) AR=$(tc-getAR) RANLIB=$(tc-getRANLIB) ./build ${target} || die "${target} failed" done }
