commit: fae82372d3a69bf1013c5799cb8708b34764fdf1 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Sun Jun 22 08:30:08 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jul 4 20:01:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae82372
app-text/yodl: add 4.05.00, drop 4.03.00 Closes: https://bugs.gentoo.org/944159 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Part-of: https://github.com/gentoo/gentoo/pull/42687 Closes: https://github.com/gentoo/gentoo/pull/42687 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/yodl/Manifest | 2 +- app-text/yodl/files/yodl-4.05.00-echo.patch | 15 ++++++++++++ app-text/yodl/files/yodl-4.05.00-man.patch | 16 +++++++++++++ app-text/yodl/files/yodl-4.05.00-stdbool.patch | 28 ++++++++++++++++++++++ .../{yodl-4.03.00.ebuild => yodl-4.05.00.ebuild} | 23 +++++++++++------- 5 files changed, 74 insertions(+), 10 deletions(-) diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest index dd9c75cf172d..f930230bb6f1 100644 --- a/app-text/yodl/Manifest +++ b/app-text/yodl/Manifest @@ -1 +1 @@ -DIST yodl-4.03.00.tar.gz 309212 BLAKE2B 9a89dfda5f4138f466bc2f871724087ff2c0084d06d81c32e1e865744e1c133b1073becac30e817f2f997c351b8f8192e942616174acb644dcab40d5d64c9d36 SHA512 ec5edaf932d94e9272a08867322e8fbfec65f612447fa412a7c19412569a6d811bbe5badd0af692837086a9ee8cdf8bb8f0c10a3e8333ef6096513b263c8d831 +DIST yodl-4.05.00.tar.gz 321455 BLAKE2B 26f0c8b6c74018a181a73a120805bb49c73b0c7c3e50fbb3a761c41f483c5771b7d586ed8df2b9da9d54a77474a693cfbbdc11f3f50613f80cf97f72f533656b SHA512 20741079eb4b8b0a0d7e7e17de21c29c5005f7ec4757fccade9d9ace8390dc15797d7ded613d021f58b24566e4200f05cc3f1919568c1519477861637fd0ff02 diff --git a/app-text/yodl/files/yodl-4.05.00-echo.patch b/app-text/yodl/files/yodl-4.05.00-echo.patch new file mode 100644 index 000000000000..2ec163c1f1a8 --- /dev/null +++ b/app-text/yodl/files/yodl-4.05.00-echo.patch @@ -0,0 +1,15 @@ +Output build commands to tun. Incidentally, also fixes build + +diff --git a/build b/build +index 3409ad7..43320ab 100755 +--- a/build ++++ b/build +@@ -12,7 +12,7 @@ + #define ECHO_REQUEST 1 + + // uncomment to show the full gcc commands when compiling +-// #define ECHO_COMPILE ++#define ECHO_COMPILE + + string CLASSES; + string g_lopt; diff --git a/app-text/yodl/files/yodl-4.05.00-man.patch b/app-text/yodl/files/yodl-4.05.00-man.patch new file mode 100644 index 000000000000..0f83b1bfe7ce --- /dev/null +++ b/app-text/yodl/files/yodl-4.05.00-man.patch @@ -0,0 +1,16 @@ +Avoid linking to non-existing file +https://gitlab.com/fbb-git/yodl/-/issues/5 + +diff --git a/icmake/install b/icmake/install +index c90f774..2c8095d 100644 +--- a/icmake/install ++++ b/icmake/install +@@ -27,7 +27,7 @@ void _installYodlConverters(string where, int debian) + gzipped = ".1 "; + + for (idx = listlen(conversions); idx--; ) +- run("ln -sf yodlconverters" + gzipped + ++ run("cp " + where + MAN + "/man7/yodlconverters.7 " + + where + MAN + "/man1/yodl2" + conversions[idx] + gzipped); + } + diff --git a/app-text/yodl/files/yodl-4.05.00-stdbool.patch b/app-text/yodl/files/yodl-4.05.00-stdbool.patch new file mode 100644 index 000000000000..ee346dd811d5 --- /dev/null +++ b/app-text/yodl/files/yodl-4.05.00-stdbool.patch @@ -0,0 +1,28 @@ +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.03.00.ebuild b/app-text/yodl/yodl-4.05.00.ebuild similarity index 78% rename from app-text/yodl/yodl-4.03.00.ebuild rename to app-text/yodl/yodl-4.05.00.ebuild index 2ff151fc083a..38244969fa95 100644 --- a/app-text/yodl/yodl-4.03.00.ebuild +++ b/app-text/yodl/yodl-4.05.00.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=7 +EAPI=8 -inherit toolchain-funcs flag-o-matic +inherit toolchain-funcs flag-o-matic 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"; @@ -16,23 +16,25 @@ KEYWORDS="~amd64 ~x86" IUSE="doc" BDEPEND=" - >=dev-build/icmake-8.00.00 + >=dev-build/icmake-9.03.01-r1 doc? ( dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric ) " +PATCHES=( + "${FILESDIR}/${P}"-stdbool.patch + "${FILESDIR}/${P}"-echo.patch + "${FILESDIR}/${P}"-man.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/g++/$(tc-getCXX)/" \ - -e "s:#define CLS://\0:" \ - -i verbinsert/icmconf || die - sed -e "s/ar r /$(tc-getAR) r /" \ -e "s/ranlib/$(tc-getRANLIB)/" \ -i icmake/stdcompile || die @@ -43,13 +45,16 @@ src_prepare() { # required for std::filesystem usage append-cxxflags -std=c++17 + hprefixify build + default } src_compile() { local target for target in programs macros man $(usex doc manual ''); do - ./build ${target} || die "${target} failed" + AR=$(tc-getAR) RANLIB=$(tc-getRANLIB) ./build ${target} || + die "${target} failed" done }
