* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/files/, www-client/elinks/
@ 2017-10-22 16:55 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2017-10-22 16:55 UTC (permalink / raw
To: gentoo-commits
commit: f6c9ef19a22b679ef1b1a503b73631ca0d26e0ba
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sun Oct 15 00:53:29 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 16:55:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c9ef19
www-client/elinks: bump live ebuild to EAPI 6.
www-client/elinks/elinks-9999.ebuild | 47 +++++++++++-----------
.../files/elinks-0.10.4.conf-syscharset.diff | 4 +-
2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index ca4b6b2466c..0cd77903130 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads"
-inherit autotools eutils git-r3 flag-o-matic python-any-r1
+inherit autotools git-r3 python-any-r1
EGIT_REPO_URI="git://repo.or.cz/elinks.git"
@@ -42,36 +42,39 @@ DEPEND="
javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-parallel-make.patch
+ )
+
src_unpack() {
default
git-r3_src_unpack
}
src_prepare() {
- mv "${WORKDIR}/${PN}-0.10.4.conf" "${WORKDIR}/${PN}.conf"
+ default
+
+ cd "${WORKDIR}" || die
+ eapply "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
+ mv ${PN}-0.10.4.conf ${PN}.conf || die
if ! use ftp ; then
- sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' "${WORKDIR}"/${PN}.conf
+ sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf || die
fi
- sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' "${WORKDIR}"/${PN}.conf
- epatch "${FILESDIR}"/${P}-parallel-make.patch
-
- epatch_user
+ sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf || die
+ cd "${S}" || die
# Regenerate acinclude.m4 - based on autogen.sh.
- cat > acinclude.m4 <<- _EOF
+ cat > acinclude.m4 <<- _EOF || die
dnl Automatically generated from config/m4/ files.
dnl Do not modify!
_EOF
- cat config/m4/*.m4 >> acinclude.m4
- sed -i -e 's/-Werror//' configure*
+ cat config/m4/*.m4 >> acinclude.m4 || die
+ sed -i -e 's/-Werror//' configure* || die
eautoreconf
}
src_configure() {
- # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
- # As GNUTLS is not yet 100% stable and its support in ELinks is not so well
- # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
local myconf=""
if use debug ; then
@@ -80,6 +83,9 @@ src_configure() {
myconf="--enable-fastmem"
fi
+ # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
+ # As GNUTLS is not yet 100% stable and its support in ELinks is not so well
+ # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
if use ssl ; then
myconf="${myconf} --with-openssl=${EPREFIX}/usr"
else
@@ -125,20 +131,16 @@ src_compile() {
src_install() {
emake V=1 DESTDIR="${D}" install
- insopts -m 644 ; insinto /etc/elinks
+ insinto /etc/elinks
doins "${WORKDIR}"/elinks.conf
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*}
- insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
- insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
- insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
-
- # Remove some conflicting files on OSX. The files provided by OSX 10.4
- # are more or less the same. -- Fabian Groffen (2005-06-30)
- rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias || die
+ docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
+ docinto contrib/conv ; dodoc contrib/conv/*.*
+ docinto contrib/guile ; dodoc contrib/guile/*.scm
}
pkg_postinst() {
@@ -154,5 +156,4 @@ pkg_postinst() {
einfo
einfo "You will have to set your TERM variable to 'xterm-256color'"
einfo "to be able to use 256 colors in elinks."
- echo
}
diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
index dc64712b29a..83accf4c2d9 100644
--- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
+++ b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
@@ -1,5 +1,5 @@
---- elinks-0.10.4.conf 2005-04-08 15:29:49.000000000 -0700
-+++ elinks-0.10.4-syscharset.conf 2006-11-04 00:26:26.000000000 -0800
+--- a/elinks-0.10.4.conf 2005-04-08 15:29:49.000000000 -0700
++++ b/elinks-0.10.4-syscharset.conf 2006-11-04 00:26:26.000000000 -0800
@@ -12,8 +12,6 @@
# obsolete config.saving_style. You shouldn't touch it.
set config.saving_style_w = 1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/files/, www-client/elinks/
@ 2020-08-07 17:58 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-08-07 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 977cfe6dac1a14198581c281213d8cff4be1e9b5
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sun Aug 2 21:27:57 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 17:57:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=977cfe6d
www-client/elinks: fix compilation with -fno-common/gcc10
Bug: https://bugs.gentoo.org/730658
Signed-off-by: Felix Janda <felix.janda <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/elinks/elinks-0.13.4.ebuild | 1 +
www-client/elinks/elinks-9999.ebuild | 1 +
www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch | 13 +++++++++++++
3 files changed, 15 insertions(+)
diff --git a/www-client/elinks/elinks-0.13.4.ebuild b/www-client/elinks/elinks-0.13.4.ebuild
index 82731e98cab..c4b601e544b 100644
--- a/www-client/elinks/elinks-0.13.4.ebuild
+++ b/www-client/elinks/elinks-0.13.4.ebuild
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-9999-parallel-make.patch
+ "${FILESDIR}"/${P}-ruby-gcc10.patch
)
src_prepare() {
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 16eb304d3e7..ce228d3832a 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-parallel-make.patch
+ "${FILESDIR}"/${PN}-0.13.4-ruby-gcc10.patch
)
src_unpack() {
diff --git a/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch b/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch
new file mode 100644
index 00000000000..380dce51f0d
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch
@@ -0,0 +1,13 @@
+https://github.com/rkd77/felinks/pull/61
+
+--- a/src/scripting/ruby/core.h
++++ b/src/scripting/ruby/core.h
+@@ -21,7 +21,7 @@
+ #define RB_ERRINFO (ruby_errinfo)
+ #endif
+
+-VALUE erb_module;
++extern VALUE erb_module;
+
+ void alert_ruby_error(struct session *ses, unsigned char *msg);
+ void erb_report_error(struct session *ses, int state);
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/files/, www-client/elinks/
@ 2022-10-13 19:56 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-10-13 19:56 UTC (permalink / raw
To: gentoo-commits
commit: c668a56d7831a5fd719670df83ac86b5ae44b718
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 19:54:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 19:54:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c668a56d
www-client/elinks: fix build w/ USE=-mouse
Closes: https://bugs.gentoo.org/876953
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/elinks/elinks-0.15.1-r1.ebuild | 4 +++
.../files/elinks-0.15.1-no-mouse-build.patch | 40 ++++++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/www-client/elinks/elinks-0.15.1-r1.ebuild b/www-client/elinks/elinks-0.15.1-r1.ebuild
index 20caa1f92b40..655204af0f0f 100644
--- a/www-client/elinks/elinks-0.15.1-r1.ebuild
+++ b/www-client/elinks/elinks-0.15.1-r1.ebuild
@@ -59,6 +59,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${P}-no-mouse-build.patch
+)
+
pkg_setup() {
use lua && lua-single_pkg_setup
diff --git a/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch b/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch
new file mode 100644
index 000000000000..cee5bdac4a83
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/876953
+https://github.com/rkd77/elinks/issues/189
+https://github.com/rkd77/elinks/commit/d229ebe89cb2a5e08e9d0af98faaa59ba2089fb3
+
+From d229ebe89cb2a5e08e9d0af98faaa59ba2089fb3 Mon Sep 17 00:00:00 2001
+From: Witold Filipczyk <witekfl@poczta.onet.pl>
+Date: Fri, 9 Sep 2022 11:30:21 +0200
+Subject: [PATCH] [options] Do not compile-in mouse related functions when
+ mouse support is disabled. Refs #189
+
+--- a/src/config/options.c
++++ b/src/config/options.c
+@@ -896,6 +896,7 @@ change_hook_ui_double_esc(struct session *ses, struct option *current, struct op
+ return 0;
+ }
+
++#ifdef CONFIG_MOUSE
+ static int
+ change_hook_ui_mouse_disable(struct session *ses, struct option *current, struct option *changed)
+ {
+@@ -911,7 +912,7 @@ change_hook_ui_mouse_disable(struct session *ses, struct option *current, struct
+ }
+ return 0;
+ }
+-
++#endif
+
+ /** Make option templates visible or invisible in the option manager.
+ * This is called once on startup, and then each time the value of the
+@@ -988,7 +989,9 @@ static const struct change_hook_info change_hooks[] = {
+ { "ui.colors", change_hook_ui_colors },
+ { "ui.double_esc", change_hook_ui_double_esc },
+ { "ui.language", change_hook_language },
++#ifdef CONFIG_MOUSE
+ { "ui.mouse_disable", change_hook_ui_mouse_disable },
++#endif
+ { "ui", change_hook_ui },
+ { NULL, NULL },
+ };
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/files/, www-client/elinks/
@ 2023-07-03 15:16 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-07-03 15:16 UTC (permalink / raw
To: gentoo-commits
commit: dfefaa456bd69bc14e3a1c2c6c1b0cc19c6b0869
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 3 15:15:11 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 3 15:15:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfefaa45
www-client/elinks: fix build w/ perl-5.38
Closes: https://bugs.gentoo.org/909042
Thanks-to: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/elinks/elinks-0.16.1.1-r2.ebuild | 172 +++++++++++++++++++++
.../elinks/files/elinks-0.16.1.1-perl-5.38.patch | 62 ++++++++
2 files changed, 234 insertions(+)
diff --git a/www-client/elinks/elinks-0.16.1.1-r2.ebuild b/www-client/elinks/elinks-0.16.1.1-r2.ebuild
new file mode 100644
index 000000000000..16b07eae2f9b
--- /dev/null
+++ b/www-client/elinks/elinks-0.16.1.1-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+LUA_COMPAT=( lua5-{1,2,3,4} luajit )
+
+inherit meson lua-single python-any-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 ~ia64 ~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 samba ssl test tre unicode X xml zlib zstd"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="lua? ( ${LUA_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? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
+ 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:= )
+ 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="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? (
+ net-dns/libidn
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.16.1.1-perl-5.38.patch
+)
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+ -Dhtmldoc=false
+ -Dpdfdoc=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)
+ -Dpython=false
+ -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
+}
+
+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-perl-5.38.patch b/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch
new file mode 100644
index 000000000000..08808a8eaf51
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch
@@ -0,0 +1,62 @@
+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" <azamat.hackimov@gmail.com>
+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 {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/files/, www-client/elinks/
@ 2023-12-28 2:19 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-12-28 2:19 UTC (permalink / raw
To: gentoo-commits
commit: bd5471bfd6e7c14facf9052c6bcf11835c8b1ff2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 02:03:32 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 02:03:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5471bf
www-client/elinks: drop 0.16.0, 0.16.1.1-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/elinks/Manifest | 1 -
www-client/elinks/elinks-0.16.0.ebuild | 169 ---------------------
www-client/elinks/elinks-0.16.1.1-r1.ebuild | 168 --------------------
.../files/elinks-0.16.0-fix-build-mujs.patch | 47 ------
.../elinks/files/elinks-0.16.0-fix-tests.patch | 19 ---
5 files changed, 404 deletions(-)
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 462b1a150161..2ce6f1c7bd14 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,2 +1 @@
-DIST elinks-0.16.0.tar.xz 2029708 BLAKE2B b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8 SHA512 b1d6040b691610d596e0d1eae26bfe52d702272c71a2e5100ab7d6b05b24a0b88524d4fc7be3f6371e0bada1e6f0992da7505a72419ca642dec778424629a522
DIST elinks-0.16.1.1.tar.xz 2037292 BLAKE2B 05578eaa7a88f0abe4472b876a1f72645d32119ce807a61962f8d24a5b444240d3b94189bf25142c0e51e2d404d5992ace07ecc23ef1316d5f3942736b265267 SHA512 49e03ff4766e29b6fd4324d226e415ca1329a84d4a44fac40ecd72186dd104de88c3e541810a008dc6f1d1ed889a45edbef159cbc6ac3860756ca21261ffec8a
diff --git a/www-client/elinks/elinks-0.16.0.ebuild b/www-client/elinks/elinks-0.16.0.ebuild
deleted file mode 100644
index 2ee2176e4676..000000000000
--- a/www-client/elinks/elinks-0.16.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-LUA_COMPAT=( lua5-{1,2,3,4} luajit )
-
-inherit meson lua-single python-any-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 ~ia64 ~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 samba ssl test tre unicode X xml zlib zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="lua? ( ${LUA_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? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
- 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:= )
- 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}"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? (
- net-dns/libidn
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-tests.patch
- "${FILESDIR}"/${PN}-0.16.0-fix-build-mujs.patch
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- local emesonargs=(
- -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
- -Dgettext=true
- $(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)
- -Dpython=false
- -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
-}
-
-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/elinks-0.16.1.1-r1.ebuild b/www-client/elinks/elinks-0.16.1.1-r1.ebuild
deleted file mode 100644
index c3e902bb281e..000000000000
--- a/www-client/elinks/elinks-0.16.1.1-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-LUA_COMPAT=( lua5-{1,2,3,4} luajit )
-
-inherit meson lua-single python-any-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 ~ia64 ~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 samba ssl test tre unicode X xml zlib zstd"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="lua? ( ${LUA_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? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
- 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:= )
- 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="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? (
- net-dns/libidn
- )
-"
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- local emesonargs=(
- -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
- -Dhtmldoc=false
- -Dpdfdoc=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)
- -Dpython=false
- -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
-}
-
-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.0-fix-build-mujs.patch b/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch
deleted file mode 100644
index 030280c61f1e..000000000000
--- a/www-client/elinks/files/elinks-0.16.0-fix-build-mujs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://github.com/rkd77/elinks/issues/204
-https://github.com/rkd77/elinks/pull/205
-
-From 5cb602191830737531f8c715f47f7429959b2471 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 31 Dec 2022 21:06:57 +0000
-Subject: [PATCH] Fix build failures with mujs
-
-Closes: https://github.com/rkd77/elinks/issues/204
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/document/html/parser/general.c
-+++ b/src/document/html/parser/general.c
-@@ -41,6 +41,9 @@
- /* Unsafe macros */
- #include "document/html/internal.h"
-
-+#if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS)
-+#include "ecmascript/ecmascript.h"
-+#endif
-
- void
- html_span(struct html_context *html_context, char *a,
---- a/src/document/html/parser/stack.c
-+++ b/src/document/html/parser/stack.c
-@@ -27,6 +27,10 @@
- /* Unsafe macros */
- #include "document/html/internal.h"
-
-+#if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS)
-+#include "ecmascript/ecmascript.h"
-+#endif
-+
- #if 0 //def CONFIG_XML
- #include <libxml++/libxml++.h>
- #endif
---- a/src/ecmascript/ecmascript.h
-+++ b/src/ecmascript/ecmascript.h
-@@ -5,6 +5,8 @@
- /* In the future you will get DOM, a complete ECMAScript interface and free
- * plasm displays for everyone. */
-
-+#include <stdbool.h>
-+
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-
diff --git a/www-client/elinks/files/elinks-0.16.0-fix-tests.patch b/www-client/elinks/files/elinks-0.16.0-fix-tests.patch
deleted file mode 100644
index 6b46b63afcdd..000000000000
--- a/www-client/elinks/files/elinks-0.16.0-fix-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/rkd77/elinks/issues/203
-https://github.com/rkd77/elinks/commit/aa8d7989815d48b6afdc3e321bd859f4453bacf2
-
-From aa8d7989815d48b6afdc3e321bd859f4453bacf2 Mon Sep 17 00:00:00 2001
-From: Witold Filipczyk <witekfl@poczta.onet.pl>
-Date: Fri, 30 Dec 2022 09:35:41 +0100
-Subject: [PATCH] [test] Strange endif . Refs #203
-
---- a/src/dom/test/meson.build
-+++ b/src/dom/test/meson.build
-@@ -28,7 +28,6 @@ meson.source_root()+'/src/dom/sgml/xbel/xbel.c',
- testdeps,
- c_args:['-DHAVE_CONFIG_H'], cpp_args:['-DHAVE_CONFIG_H'], include_directories:['.', '../..', '../../..'],
- build_by_default:false)
--endif
-
- test_lib = environment({'TEST_LIB': meson.source_root()+'/test/libtest.sh'})
-
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-28 2:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-28 2:19 [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/files/, www-client/elinks/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-07-03 15:16 Sam James
2022-10-13 19:56 Sam James
2020-08-07 17:58 Sam James
2017-10-22 16:55 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox