commit: 502a517a17e8b3b37c35d09721a27bfa8bdd7945 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Tue Jan 28 21:27:23 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 16 16:35:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502a517a
www-client/elinks: drop 0.16.1.1 Signed-off-by: Felix Janda <felix.janda <AT> posteo.de> Closes: https://github.com/gentoo/gentoo/pull/40354 Signed-off-by: Sam James <sam <AT> gentoo.org> www-client/elinks/Manifest | 1 - www-client/elinks/elinks-0.16.1.1-r100.ebuild | 199 --------------------- ...-0.16.1.1-ecmascript-implicit-declaration.patch | 36 ---- .../elinks/files/elinks-0.16.1.1-perl-5.38.patch | 62 ------- .../elinks/files/elinks-0.16.1.1-python-3.12.patch | 26 --- 5 files changed, 324 deletions(-) diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest index 8069f1174409..e17a01b55f1e 100644 --- a/www-client/elinks/Manifest +++ b/www-client/elinks/Manifest @@ -1,3 +1,2 @@ -DIST elinks-0.16.1.1.tar.xz 2037292 BLAKE2B 05578eaa7a88f0abe4472b876a1f72645d32119ce807a61962f8d24a5b444240d3b94189bf25142c0e51e2d404d5992ace07ecc23ef1316d5f3942736b265267 SHA512 49e03ff4766e29b6fd4324d226e415ca1329a84d4a44fac40ecd72186dd104de88c3e541810a008dc6f1d1ed889a45edbef159cbc6ac3860756ca21261ffec8a DIST elinks-0.17.1.1.tar.xz 2001036 BLAKE2B 2158e7630e64977b5250d544159bff0b90953ef7d51870d5e96ce8e36858596e6341bf774ad1717ed4808859d4be316fe75587552e61a8bbfcb00a0366a85e81 SHA512 7ad78f7d6a43341ae252c29f0c338e466cbedf8b40aefa9fa1939dbc62a9c9307b0a423b17181fce3bce1364fe6b6bdb80509ed90719965de174c9258b90902f DIST elinks-0.18.0.tar.xz 2078656 BLAKE2B 84ad13a1f374d85bb74d57fe905df4f2f1d062acb89a43197e0f0767cce3779749f4cee7ad15655fe35bc6545799b5f8264498f05a47eca6cb571541e3bcef1c SHA512 e0ff737e06d4b591d362257b9a375b938f9d6222cf6ee4df2065c7b47f883a5eacf76dabae8fc7c0b32cf9b7df56267752217d6999b0ae24c2482763b5b0ccb9 diff --git a/www-client/elinks/elinks-0.16.1.1-r100.ebuild b/www-client/elinks/elinks-0.16.1.1-r100.ebuild deleted file mode 100644 index d3602f9c3cfa..000000000000 --- a/www-client/elinks/elinks-0.16.1.1-r100.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -GUILE_REQ_USE="deprecated" -GUILE_COMPAT=( 2-2 3-0 ) -PYTHON_COMPAT=( python3_{10..12} ) -LUA_COMPAT=( lua5-{1,2,3,4} luajit ) - -inherit flag-o-matic guile-single meson lua-single python-single-r1 - -DESCRIPTION="Advanced and well-established text-mode web browser" -HOMEPAGE="http://elinks.or.cz/"; - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/rkd77/felinks"; - inherit git-r3 -else - SRC_URI="https://github.com/rkd77/elinks/releases/download/v${PV}/${P}.tar.xz"; - - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn" -IUSE+=" javascript lua lzma +mouse nls nntp perl python samba ssl test tre unicode X xml zlib zstd" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - guile? ( ${GUILE_REQUIRED_USE} ) - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - >=sys-libs/ncurses-5.2:=[unicode(+)] - brotli? ( app-arch/brotli:= ) - bzip2? ( >=app-arch/bzip2-1.0.2 ) - gpm? ( - >=sys-libs/gpm-1.20.0-r5 - ) - guile? ( ${GUILE_DEPS} ) - idn? ( net-dns/libidn:= ) - javascript? ( - dev-cpp/libxmlpp:5.0 - dev-lang/mujs:= - ) - lua? ( ${LUA_DEPS} ) - lzma? ( app-arch/xz-utils ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - samba? ( net-fs/samba ) - ssl? ( - !gnutls? ( dev-libs/openssl:= ) - gnutls? ( net-libs/gnutls:= ) - ) - tre? ( dev-libs/tre ) - X? ( - x11-libs/libX11 - x11-libs/libXt - ) - xml? ( >=dev-libs/expat-1.95.4 ) - zlib? ( >=sys-libs/zlib-1.1.4 ) - zstd? ( app-arch/zstd:= ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( - net-dns/libidn - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.16.1.1-ecmascript-implicit-declaration.patch - "${FILESDIR}"/${PN}-0.16.1.1-perl-5.38.patch - "${FILESDIR}"/${PN}-0.16.1.1-python-3.12.patch -) - -pkg_setup() { - use guile && guile-single_pkg_setup - use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - use guile && guile_bump_sources -} - -src_configure() { - # This file is severely broken w.r.t. strict-aliasing and upstream acknowledges it: - # https://github.com/rkd77/elinks/blob/d05ce90b35d82109aab320b490e3ca54aa6df057/src/util/lists.h#L14 - # https://github.com/rkd77/elinks/blob/d05ce90b35d82109aab320b490e3ca54aa6df057/src/meson.build#L44 - # - # Although they force fno-strict-aliasing, they do so inconsistently and not for the testsuite (!!!). - # Just add it again. - # - # DO not trust the LTO either. - append-flags -fno-strict-aliasing - filter-lto - - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - -Dhtmldoc=false - -Dpdfdoc=false - -Dapidoc=false - -D88-colors=true - -D256-colors=true - $(meson_use bittorrent) - $(meson_use brotli) - $(meson_use bzip2 bzlib) - $(usex debug '-Ddebug=true' '-Dfastmem=true') - $(meson_use finger) - $(meson_use ftp) - -Dfsp=false - -Dgemini=false - $(meson_use nls gettext) - $(meson_use gopher) - $(meson_use gpm) - $(meson_use guile) - -Dgssapi=false - -Dhtml-highlight=true - $(meson_use idn) - $(meson_use javascript mujs) - -Dipv6=true - -Dleds=true - -Dlibev=false - -Dlibevent=false - -Dluapkg=$(usex lua ${ELUA:-0} '') - $(meson_use lzma) - $(meson_use mouse) - #-Dmujs=false - $(meson_use nls) - $(meson_use nntp) - $(meson_use perl) - $(meson_use python) - -Dquickjs=false - -Druby=false - $(meson_use samba smb) - -Dsm-scripting=false - -Dspidermonkey=false - -Dterminfo=true - $(meson_use test) - $(meson_use tre) - -Dtrue-color=true - $(meson_use xml xbel) - $(meson_use X x) - $(meson_use zlib) - $(meson_use zstd) - ) - - if use ssl ; then - if use gnutls ; then - emesonargs+=( -Dgnutls=true ) - else - emesonargs+=( -Dopenssl=true) - fi - else - emesonargs+=( -Dgnutls=false -Dopenssl=false ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - insinto /etc/elinks - newins contrib/keybind-full.conf keybind-full.sample - newins contrib/keybind.conf keybind.conf.sample - - dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.* - docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*} - docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote} - docinto contrib/conv ; dodoc contrib/conv/*.* - docinto contrib/guile ; dodoc contrib/guile/*.scm - - # elinks uses an internal copy of gettext which ships files that may - # collide with the system's gettext (https://bugs.gentoo.org/635090) - rm -f "${ED}"/usr/{share/locale/locale,lib/charset}.alias || die - - use guile && guile_unstrip_ccache -} - -pkg_postinst() { - elog "You may want to convert your html.cfg and links.cfg of" - elog "Links or older ELinks versions to the new ELinks elinks.conf" - elog "using ${EROOT}/usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl" - elog - elog "Please have a look at ${EROOT}/etc/elinks/keybind-full.sample and" - elog "${EROOT}/etc/elinks/keybind.conf.sample for some bindings examples." - elog - elog "You will have to set your TERM variable to 'xterm-256color'" - elog "to be able to use 256 colors in elinks." -} diff --git a/www-client/elinks/files/elinks-0.16.1.1-ecmascript-implicit-declaration.patch b/www-client/elinks/files/elinks-0.16.1.1-ecmascript-implicit-declaration.patch deleted file mode 100644 index 58c98cc27da0..000000000000 --- a/www-client/elinks/files/elinks-0.16.1.1-ecmascript-implicit-declaration.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- elinks-0.16.1.1/src/document/html/parser/general.c 2024-06-06 07:10:40.163191871 +0200 -+++ elinks-0.16.1.1/src/document/html/parser/general.c 2024-06-06 07:11:45.913711031 +0200 -@@ -38,6 +38,10 @@ - #include "util/memory.h" - #include "util/string.h" - -+#ifdef CONFIG_ECMASCRIPT -+#include "ecmascript/ecmascript.h" -+#endif -+ - /* Unsafe macros */ - #include "document/html/internal.h" - ---- elinks-0.16.1.1/src/document/html/parser/stack.c 2023-05-01 10:45:22.000000000 +0200 -+++ elinks-0.16.1.1/src/document/html/parser/stack.c 2024-06-06 07:11:29.892765184 +0200 -@@ -24,6 +24,10 @@ - #include "util/memory.h" - #include "util/string.h" - -+#ifdef CONFIG_ECMASCRIPT -+#include "ecmascript/ecmascript.h" -+#endif -+ - /* Unsafe macros */ - #include "document/html/internal.h" - ---- elinks-0.16.1.1/src/ecmascript/ecmascript.h.orig 2024-06-06 07:18:53.237018842 +0200 -+++ elinks-0.16.1.1/src/ecmascript/ecmascript.h 2024-06-06 07:20:04.434093077 +0200 -@@ -26,6 +26,7 @@ - #include "main/module.h" - #include "main/timer.h" - #include "util/time.h" -+#include <stdbool.h> - - //#define ECMASCRIPT_DEBUG 1 - diff --git a/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch b/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch deleted file mode 100644 index 08808a8eaf51..000000000000 --- a/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch +++ /dev/null @@ -1,62 +0,0 @@ -https://bugs.gentoo.org/909042 -https://github.com/rkd77/elinks/pull/243 -https://github.com/rkd77/elinks/commit/9b3cbca0fb493dc5be44649991dfdf30b746f153 - -[rebased for 0.16.x] - -From 393bf23a2683971a72217839657bb2945a36ee54 Mon Sep 17 00:00:00 2001 -From: "Azamat H. Hackimov" <[email protected]> -Date: Mon, 3 Jul 2023 14:12:22 +0300 -Subject: [PATCH] Fix compilation with Perl 5.38 - -Perl now includes own `struct object` which clashes with elinks -implementation. Renamed `struct object` to `struct elinks_object` to -avoid it. - -Bug: https://bugs.gentoo.org/909042 ---- a/src/main/object.h -+++ b/src/main/object.h -@@ -11,7 +11,7 @@ extern "C" { - #define DEBUG_REFCOUNT - #endif - --struct object { -+struct elinks_object { - int refcount; - #ifdef CONFIG_DEBUG - char *name; -@@ -20,10 +20,10 @@ struct object { - - #define OBJECT_HEAD(type) \ - LIST_HEAD(type); \ -- struct object object -+ struct elinks_object object - - struct object_head { -- OBJECT_HEAD(struct object *); -+ OBJECT_HEAD(struct elinks_object *); - }; - - #ifdef DEBUG_REFCOUNT ---- a/src/protocol/uri.c -+++ b/src/protocol/uri.c -@@ -1578,7 +1578,7 @@ struct uri_cache_entry { - - struct uri_cache { - struct hash *map; -- struct object object; -+ struct elinks_object object; - }; - - static struct uri_cache uri_cache; ---- a/src/protocol/uri.h -+++ b/src/protocol/uri.h -@@ -89,7 +89,7 @@ struct uri { - unsigned int form:1; /* URI originated from form */ - - /* Usage count object. */ -- struct object object; -+ struct elinks_object object; - }; - - enum uri_errno { diff --git a/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch b/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch deleted file mode 100644 index e6ac9f004463..000000000000 --- a/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2577da89420ce2a1d58fadd7f2e6809d2ba70dd8 Mon Sep 17 00:00:00 2001 -From: Witold Filipczyk <[email protected]> -Date: Mon, 10 Jun 2024 13:07:23 +0200 -Subject: [PATCH] [python] module imp is deprecated. Refs #313 - ---- - src/scripting/python/core.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/scripting/python/core.c b/src/scripting/python/core.c -index 185561108..4a69e4293 100644 ---- a/src/scripting/python/core.c -+++ b/src/scripting/python/core.c -@@ -138,10 +138,10 @@ hooks_module_exists(void) - * indicates that no such module was found; any other exception will - * be reported as an error. - */ -- imp_module = PyImport_ImportModule("imp"); -+ imp_module = PyImport_ImportModule("importlib.util"); - if (!imp_module) goto python_error; - -- result = PyObject_CallMethod(imp_module, "find_module", "s", "hooks"); -+ result = PyObject_CallMethod(imp_module, "find_spec", "s", "hooks"); - if (result) { - found_hooks = 1; - goto end;
