commit: 61940017be95d54cbf8ef96073883dd0e2249f86 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Fri Jul 25 13:40:41 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jul 26 05:01:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61940017
app-accessibility/edbrowse: add 3.8.12 update SRC_URI (redirect) update license according to LICENSE : > In summary: GPL + MIT public license + CC0 1.0, > + curl license if edbrowse is packaged with curl. deps : remove htmltidy, no longer needed since 3.8.3 remove ed (can't find why it was added with 3.8.2.1 ebuild) add missing openssl (removed with a 'bump' 3.7.4) tools/quickjobfixup is no longer required since 3.8.4 patches : the patch for edbrowse is merged update the patch for quickjs (flags/path) use append-atomic-flags as a workaround for musl docs : add local before vars add README add a basic test Closes: https://bugs.gentoo.org/946062 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/43155 Closes: https://github.com/gentoo/gentoo/pull/43155 Signed-off-by: Sam James <sam <AT> gentoo.org> app-accessibility/edbrowse/Manifest | 2 + app-accessibility/edbrowse/edbrowse-3.8.12.ebuild | 66 ++++++++++++++++++++++ .../files/edbrowse-3.8.12-userflags_quickjs.patch | 31 ++++++++++ app-accessibility/edbrowse/metadata.xml | 2 +- 4 files changed, 100 insertions(+), 1 deletion(-) diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest index d44dfe55ad02..4f7f7b900801 100644 --- a/app-accessibility/edbrowse/Manifest +++ b/app-accessibility/edbrowse/Manifest @@ -1,2 +1,4 @@ +DIST edbrowse-3.8.12.tar.gz 1084438 BLAKE2B f8a2d7fa90b6339dcd820b0fa22ee9ba2c30af6dd58fcd6a6ee72061e190b6397e72cc03b239f123c834a868657652babc7d870600b52352ef817319a66ccf3b SHA512 124dc0a5154837d4e017f6c8f9ce7882ead8e70f22f42a43cfb701133fdc598608dadf6a54434f68fa1e0c647b9f7351aa490a61b99819816bb66ecd832fbad0 DIST edbrowse-3.8.2.1.tar.gz 909574 BLAKE2B e5358861f6747dfe12498403b2d4761ab16dabc513fe94455d88c44e07793fb1128b0c1b7ebdf9ef922e371148182f8127f67f11eb123877e804858cb7e6378b SHA512 b5774a836efe96aae77052b02f6fcc85920b5f86a6ab8436a6dc363d81531b30e7f9c7555aacb20af27e59565042bdd685eed2acd4dfde8b99e2ad0358f19927 +DIST quickjs-1fdc768fdc8571300755cdd3e4654ce99c0255ce.tar.gz 593055 BLAKE2B f06408d0f65be94222023a00a7693af9bc2acb38af1a61688f80630a647d7e2fe5725a4da9fd0aae40455d3085d2c13f372e7ac5ccb59198e529e4463a39a5d5 SHA512 bfe1fc3d7441726227182528f1cb8baf01be835e38d638e25fe499f3b33fe59d6e307f2fb60855583cc84184c73b4c37934221fa2668909293139ccb9c1282e8 DIST quickjs-2788d71.tar.gz 599260 BLAKE2B 67618f491c3efd1aa15a8906557983dd7123a3cfb2584f2f499f005667ccac4ded1c77934d2807cfce9e042572c6c41d63982b3df7afab5b2c67f4ce9f357879 SHA512 4493d11bc60855711955e0159e9f568d7e3db59c9843ef3aae00846f82c5e33f501372f7f5861b431353355f400f77720f3265963ea7bc0e38635ab5b89a27a0 diff --git a/app-accessibility/edbrowse/edbrowse-3.8.12.ebuild b/app-accessibility/edbrowse/edbrowse-3.8.12.ebuild new file mode 100644 index 000000000000..cb14aa4ed245 --- /dev/null +++ b/app-accessibility/edbrowse/edbrowse-3.8.12.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo flag-o-matic toolchain-funcs + +# no release/tag +QUICKJS_HASH=1fdc768fdc8571300755cdd3e4654ce99c0255ce + +DESCRIPTION="Combination editor, browser, and mail client that is 100% text based" +HOMEPAGE="https://edbrowse.org"; +SRC_URI="https://github.com/edbrowse/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/bellard/quickjs/archive/${QUICKJS_HASH}.tar.gz -> quickjs-${QUICKJS_HASH}.tar.gz" + +LICENSE="GPL-2+ curl MIT CC0-1.0" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" + +RDEPEND=" + dev-db/unixODBC + dev-libs/libpcre2:= + dev-libs/openssl:= + net-misc/curl + sys-libs/readline:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + virtual/pkgconfig +" + +src_prepare() { + default + mv "${WORKDIR}"/quickjs-${QUICKJS_HASH} "${WORKDIR}"/quickjs || die + pushd "${WORKDIR}" || die + eapply "${FILESDIR}"/${PN}-3.8.12-userflags_quickjs.patch + popd || die +} + +src_compile() { + tc-export CC AR PKG_CONFIG + + # First build quickjs so we can link to its static library. + # Also, quickjs doesn't appear to tag releases. + emake -C "${WORKDIR}"/quickjs libquickjs.a + + # set QUICKJS_LDFLAGS as upstream does except -ldl and -latomic (added only if available). + append-atomic-flags + emake -C src STRIP= QUICKJS_LDFLAGS="-L../../quickjs -lquickjs" +} + +src_test() { + # create an empty config file + touch "${HOME}"/.ebrc || die + # basic test + echo -e "b ${S}/doc/usersguide.html\n1,3p\nqt" | edo ./src/edbrowse -d3 -e +} + +src_install() { + dobin src/edbrowse + newman doc/man-edbrowse-debian.1 edbrowse.1 + local DOCS=( README doc/sample* ) + local HTML_DOCS=( doc/*.html ) + einstalldocs +} diff --git a/app-accessibility/edbrowse/files/edbrowse-3.8.12-userflags_quickjs.patch b/app-accessibility/edbrowse/files/edbrowse-3.8.12-userflags_quickjs.patch new file mode 100644 index 000000000000..df2ff12f4d4f --- /dev/null +++ b/app-accessibility/edbrowse/files/edbrowse-3.8.12-userflags_quickjs.patch @@ -0,0 +1,31 @@ +Remove -O2 and -g cflags +Remove CC and AR hardcoded +HOST_CC is not used for the object we want +--- a/quickjs/Makefile 2025-07-09 12:39:19.000000000 -0000 ++++ a/quickjs/Makefile 2025-07-25 13:53:30.173279954 -0000 +@@ -126,13 +126,13 @@ + AR=cosmoar + else + HOST_CC=gcc +- CC=$(CROSS_PREFIX)gcc +- CFLAGS+=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d ++ CC ?= $(CROSS_PREFIX)gcc ++ CFLAGS+=-Wall -MMD -MF $(OBJDIR)/$(@F).d + CFLAGS += -Wno-array-bounds -Wno-format-truncation -Wno-infinite-recursion + ifdef CONFIG_LTO + AR=$(CROSS_PREFIX)gcc-ar + else +- AR=$(CROSS_PREFIX)ar ++ AR ?= $(CROSS_PREFIX)ar + endif + endif + STRIP?=$(CROSS_PREFIX)strip +@@ -160,7 +160,7 @@ + CFLAGS+=$(DEFINES) + CFLAGS_DEBUG=$(CFLAGS) -O0 + CFLAGS_SMALL=$(CFLAGS) -Os +-CFLAGS_OPT=$(CFLAGS) -O2 ++CFLAGS_OPT=$(CFLAGS) + CFLAGS_NOLTO:=$(CFLAGS_OPT) + ifdef CONFIG_COSMO + LDFLAGS+=-s # better to strip by default diff --git a/app-accessibility/edbrowse/metadata.xml b/app-accessibility/edbrowse/metadata.xml index 98abcd56c4be..58e44d4ff93f 100644 --- a/app-accessibility/edbrowse/metadata.xml +++ b/app-accessibility/edbrowse/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo Accessibility Project</name> </maintainer> <upstream> - <remote-id type="github">CMB/edbrowse</remote-id> + <remote-id type="github">edbrowse/edbrowse</remote-id> </upstream> </pkgmetadata>
