* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/
@ 2017-10-22 16:55 Patrice Clement
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement @ 2017-10-22 16:55 UTC (permalink / raw
To: gentoo-commits
commit: 9f93ee632f0a851deddaa347bc933278a48f7f8d
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Oct 14 13:43:32 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 16:55:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f93ee63
www-client/elinks-0.12_pre6-r2: fix compilation with libressl.
Closes: https://bugs.gentoo.org/584766
Closes: https://bugs.gentoo.org/609006
www-client/elinks/elinks-0.12_pre6-r2.ebuild | 2 ++
.../elinks/files/elinks-0.12_pre5-libressl.patch | 29 ++++++++++++++++++++++
.../elinks/files/elinks-0.12_pre5-rand-egd.patch | 20 +++++++++++++++
3 files changed, 51 insertions(+)
diff --git a/www-client/elinks/elinks-0.12_pre6-r2.ebuild b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
index ed3f69831bd..e9e8625888a 100644
--- a/www-client/elinks/elinks-0.12_pre6-r2.ebuild
+++ b/www-client/elinks/elinks-0.12_pre6-r2.ebuild
@@ -56,6 +56,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-9999-parallel-make.patch
epatch "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
+ epatch "${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
+ epatch "${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
if use javascript ; then
if has_version ">=dev-lang/spidermonkey-1.8"; then
diff --git a/www-client/elinks/files/elinks-0.12_pre5-libressl.patch b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
new file mode 100644
index 00000000000..d41ab689e9f
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
@@ -0,0 +1,29 @@
+Adapted from upstream
+commit 54ebe365b752f8969a67279d0d29552ab638e025
+Author: Witold Filipczyk <witekfl@poczta.onet.pl>
+Date: Mon Mar 6 17:39:36 2017 +0100
+
+ Compilation fix for OpenSSL-1.1
+
+--- a/src/network/ssl/socket.c
++++ b/src/network/ssl/socket.c
+@@ -67,7 +67,9 @@
+ ssl_set_no_tls(struct socket *socket)
+ {
+ #ifdef CONFIG_OPENSSL
+- ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
++#ifdef SSL_OP_NO_TLSv1
++ SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1);
++#endif
+ #elif defined(CONFIG_GNUTLS)
+ {
+ /* GnuTLS does not support SSLv2 because it is "insecure".
+@@ -145,7 +147,7 @@
+ }
+
+ if (client_cert) {
+- SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
++ SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl);
+
+ SSL_CTX_use_certificate_chain_file(ctx, client_cert);
+ SSL_CTX_use_PrivateKey_file(ctx, client_cert,
diff --git a/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
new file mode 100644
index 00000000000..6c5679a95bb
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
@@ -0,0 +1,20 @@
+--- a/src/network/ssl/ssl.c
++++ b/src/network/ssl/ssl.c
+@@ -84,11 +84,16 @@ init_openssl(struct module *module)
+ * cannot initialize the PRNG and so every attempt to use SSL fails.
+ * It's actually an OpenSSL FAQ, and according to them, it's up to the
+ * application coders to seed the RNG. -- William Yodlowsky */
+- if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
++ RAND_file_name(f_randfile, sizeof(f_randfile));
++#ifdef HAVE_RAND_EGD
++ if (RAND_egd(f_randfile) < 0) {
+ /* Not an EGD, so read and write to it */
++#endif
+ if (RAND_load_file(f_randfile, -1))
+ RAND_write_file(f_randfile);
++#ifdef HAVE_RAND_EGD
+ }
++#endif
+
+ SSLeay_add_ssl_algorithms();
+ context = SSL_CTX_new(SSLv23_client_method());
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/
@ 2018-03-26 18:07 Jeroen Roovers
0 siblings, 0 replies; 7+ messages in thread
From: Jeroen Roovers @ 2018-03-26 18:07 UTC (permalink / raw
To: gentoo-commits
commit: 951209198db135ba00611ae2b54e300e022fbd10
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 18:02:33 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 18:07:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95120919
www-client/elinks: Fix ruby check/compat by Felix Janda (bug #649948).
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../elinks/elinks-0.13_pre_pre20180225.ebuild | 3 +-
www-client/elinks/files/elinks-0.13-ruby.patch | 183 +++++++++++++++++++++
2 files changed, 185 insertions(+), 1 deletion(-)
diff --git a/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild b/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
index a0b8366f121..9a4f291cc06 100644
--- a/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
+++ b/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
@@ -43,7 +43,8 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-9999-parallel-make.patch
- )
+ "${FILESDIR}"/${PN}-0.13-ruby.patch
+)
src_prepare() {
default
diff --git a/www-client/elinks/files/elinks-0.13-ruby.patch b/www-client/elinks/files/elinks-0.13-ruby.patch
new file mode 100644
index 00000000000..a716439b512
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.13-ruby.patch
@@ -0,0 +1,183 @@
+--- a/config/m4/ruby.m4
++++ b/config/m4/ruby.m4
+@@ -32,36 +32,40 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
+ if test "$CONFIG_SCRIPTING_RUBY" != "no"; then
+
+ AC_MSG_CHECKING(Ruby version)
+- if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
++ if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION rescue RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
+ ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}"'`
+ AC_MSG_RESULT($ruby_version)
+
+ AC_MSG_CHECKING(for Ruby header files)
+- rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
++ rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || RbConfig::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
+
+ if test "X$rubyhdrdir" != "X"; then
+ AC_MSG_RESULT($rubyhdrdir)
+ RUBY_CFLAGS="-I$rubyhdrdir"
+- rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
++ rubyarch=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["arch"]]'`
++ if test -d "$rubyhdrdir/$rubyarch"; then
++ RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
++ fi
++ rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LIBS"]]'`
+
+ if test "X$rubylibs" != "X"; then
+ RUBY_LIBS="$rubylibs"
+ fi
+
+- librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
++ librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["LIBRUBYARG"]])'`
+
+ if test -f "$rubyhdrdir/$librubyarg"; then
+ librubyarg="$rubyhdrdir/$librubyarg"
+
+ else
+- rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
++ rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["libdir"]])'`
+ if test -f "$rubylibdir/$librubyarg"; then
+ librubyarg="$rubylibdir/$librubyarg"
+ elif test "$librubyarg" = "libruby.a"; then
+ dnl required on Mac OS 10.3 where libruby.a doesn't exist
+ librubyarg="-lruby"
+ else
+- librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
++ librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{RbConfig.expand(RbConfig::CONFIG[\"libdir\"])}')"`
+ fi
+ fi
+
+@@ -69,7 +73,7 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
+ RUBY_LIBS="$librubyarg $RUBY_LIBS"
+ fi
+
+- rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
++ rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LDFLAGS"]]'`
+ if test "X$rubyldflags" != "X"; then
+ LDFLAGS="$rubyldflags $LDFLAGS"
+ fi
+@@ -86,6 +90,15 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
+ AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
+ fi
+ fi
++ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
++ AC_MSG_CHECKING([for rb_errinfo])
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[rb_errinfo();]])],have_rb_errinfo="yes",have_rb_errinfo="no")
++ AC_MSG_RESULT($have_rb_errinfo)
++ if test "$have_rb_errinfo" = "yes"; then
++ AC_DEFINE([HAVE_RB_ERRINFO], [1],
++ [Define to 1 if you have the `rb_errinfo' function.])
++ fi
++ fi
+ fi
+
+ EL_RESTORE_FLAGS
+--- a/src/scripting/ruby/core.c
++++ b/src/scripting/ruby/core.c
+@@ -76,10 +76,10 @@ erb_report_error(struct session *ses, int error)
+ break;
+ case TAG_RAISE:
+ case TAG_FATAL:
+- eclass = CLASS_OF(ruby_errinfo);
+- einfo = rb_obj_as_string(ruby_errinfo);
++ eclass = CLASS_OF(RB_ERRINFO);
++ einfo = rb_obj_as_string(RB_ERRINFO);
+
+- if (eclass == rb_eRuntimeError && RSTRING(einfo)->len == 0) {
++ if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) {
+ msg = "unhandled exception";
+
+ } else {
+@@ -88,7 +88,7 @@ erb_report_error(struct session *ses, int error)
+
+ epath = rb_class_path(eclass);
+ snprintf(buff, MAX_STR_LEN, "%s: %s",
+- RSTRING(epath)->ptr, RSTRING(einfo)->ptr);
++ RSTRING_PTR(epath), RSTRING_PTR(einfo));
+
+ p = strchr((const char *)buff, '\n');
+ if (p) *p = '\0';
+@@ -116,7 +116,7 @@ erb_module_message(VALUE self, VALUE str)
+ struct terminal *term;
+
+ str = rb_obj_as_string(str);
+- message = memacpy(RSTRING(str)->ptr, RSTRING(str)->len);
++ message = memacpy(RSTRING_PTR(str), RSTRING_PTR(str));
+ if (!message) return Qnil;
+
+ line_end = strchr((const char *)message, '\n');
+@@ -165,8 +165,8 @@ erb_stdout_p(int argc, VALUE *argv, VALUE self)
+ * the inspect() method, which adds quotes to the strings, so
+ * gently ignore them. */
+
+- ptr = RSTRING(substr)->ptr;
+- len = RSTRING(substr)->len;
++ ptr = RSTRING_PTR(substr);
++ len = RSTRING_LEN(substr);
+
+ if (*ptr == '"')
+ ptr++, len--;
+--- a/src/scripting/ruby/core.h
++++ b/src/scripting/ruby/core.h
+@@ -7,6 +7,20 @@ struct session;
+
+ #include <ruby.h> /* for VALUE */
+
++#ifndef RSTRING_LEN
++#define RSTRING_LEN(string) (RSTRING(string)->len)
++#endif
++
++#ifndef RSTRING_PTR
++#define RSTRING_PTR(string) (RSTRING(string)->ptr)
++#endif
++
++#ifdef HAVE_RB_ERRINFO
++#define RB_ERRINFO (rb_errinfo())
++#else
++#define RB_ERRINFO (ruby_errinfo)
++#endif
++
+ VALUE erb_module;
+
+ void alert_ruby_error(struct session *ses, unsigned char *msg);
+--- a/src/scripting/ruby/hooks.c
++++ b/src/scripting/ruby/hooks.c
+@@ -83,7 +83,7 @@ script_hook_goto_url(va_list ap, void *data)
+ {
+ unsigned char *new_url;
+
+- new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
++ new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
+ if (new_url) {
+ mem_free_set(url, new_url);
+ }
+@@ -126,7 +126,7 @@ script_hook_follow_url(va_list ap, void *data)
+ {
+ unsigned char *new_url;
+
+- new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
++ new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
+ if (new_url) {
+ mem_free_set(url, new_url);
+ }
+@@ -170,9 +170,9 @@ script_hook_pre_format_html(va_list ap, void *data)
+ switch (rb_type(result)) {
+ case T_STRING:
+ {
+- int len = RSTRING(result)->len;
++ int len = RSTRING_LEN(result);
+
+- add_fragment(cached, 0, RSTRING(result)->ptr, len);
++ add_fragment(cached, 0, RSTRING_PTR(result), len);
+ normalize_cache_entry(cached, len);
+
+ break;
+@@ -216,7 +216,7 @@ script_hook_get_proxy(va_list ap, void *data)
+ {
+ unsigned char *proxy;
+
+- proxy = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
++ proxy = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
+ if (proxy) {
+ mem_free_set(new_proxy_url, proxy);
+ }
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/
@ 2020-09-13 18:39 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2020-09-13 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 0e591ad37835503bffc0e506f0921616c471da5d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 18:39:51 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 18:39:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e591ad3
www-client/elinks: cleanup old (inc. EAPI 4)
Closes: https://bugs.gentoo.org/648648
Closes: https://bugs.gentoo.org/730658
Closes: https://bugs.gentoo.org/739914
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/elinks/Manifest | 3 -
www-client/elinks/elinks-0.12_pre6-r4.ebuild | 155 -----------------
.../elinks/elinks-0.13_pre_pre20180225.ebuild | 142 ----------------
.../elinks/files/elinks-0.11.2-lua-5.1.patch | 16 --
.../files/elinks-0.12_pre5-compilation-fix.patch | 12 --
.../elinks/files/elinks-0.12_pre5-libressl.patch | 29 ----
.../elinks/files/elinks-0.12_pre5-rand-egd.patch | 20 ---
.../elinks/files/elinks-0.12_pre5-ruby-1.9.patch | 187 ---------------------
.../files/elinks-0.12_pre5-sm185-jsval-fixes.patch | 124 --------------
www-client/elinks/files/elinks-0.13-ruby.patch | 183 --------------------
www-client/elinks/metadata.xml | 1 -
11 files changed, 872 deletions(-)
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 51fa0ee2ac2..8a51cb8261c 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,4 +1 @@
-DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 BLAKE2B b850c66cc74d59c6cfb0c7c6ebaaddfe0706e8cdcc14b1df5232ba2b3c75bf632e3b3e398b200876d7e594b122c6b27227ca92729129ef955174b05e7f0e6a06 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c
-DIST elinks-0.12pre6.tar.bz2 2854500 BLAKE2B 3d91c2a4b03cf77a2a86131cfb5339a40c6e89c8aaab7293d5b7f6861f0b7647b1951f2bc15814e342c926a154707162a7814981cdc729329dfb04627133f3bf SHA512 bff70faafea7c4739695a7fad8f659109894b318588f5a035a5594a6053238789259ce6067c2f5cb97448f138db143adebb23f84bf689bea209ba37573484b7f
DIST elinks-0.13.4.tar.gz 3594672 BLAKE2B 67a44c05a24c200f7b472c6e7c3d0f0966c820ff6d7837ec2cf60e985f5b64cdd63f67103fcc897c293867174cf7162178c2b4af2ec2fdc261b130907cd7f8f7 SHA512 028ed8e6c00de5c65cde80b2e2c42a6568696d277dc8e5645130377d7bb5a3f6adacbea626b6e19ae3e756eb40b4dca5d642839d57943c1a04eb1fe65aa98fe6
-DIST elinks-0.13_pre_pre20180225.tar.gz 3518990 BLAKE2B 89c95b1d6e438975f5711f2e83960c90ced451953f395f3d73eeca40e6187b423b3c7d50b065c11673ee9fe03e8ee99a4c7642ebc01eea888c417645a0e53d7d SHA512 3f817768766e6dd6df042f7512163c5de70766e4d565fc081f4f755f7f7958d5487b9ff2ea29187a5cc813dc0841d75d440087fbdaf99f73d2a269dca70d5725
diff --git a/www-client/elinks/elinks-0.12_pre6-r4.ebuild b/www-client/elinks/elinks-0.12_pre6-r4.ebuild
deleted file mode 100644
index 5d39231f42a..00000000000
--- a/www-client/elinks/elinks-0.12_pre6-r4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils autotools flag-o-matic
-
-MY_P="${P/_/}"
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
- https://dev.gentoo.org/~axs/distfiles/${PN}-0.12_pre5-js185-patches.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bittorrent bzip2 debug finger ftp gc gopher gpm guile idn ipv6
- javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
-RESTRICT="test"
-
-DEPEND="
- bzip2? ( >=app-arch/bzip2-1.0.2 )
- gc? ( dev-libs/boehm-gc )
- gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
- guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
- idn? ( net-dns/libidn )
- javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
- lua? ( >=dev-lang/lua-5:0= )
- perl? ( dev-lang/perl:= )
- ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
- samba? ( net-fs/samba )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- 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 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-parallel-make.patch
- "${FILESDIR}"/${PN}-0.12_pre5-compilation-fix.patch
- "${FILESDIR}"/${PN}-0.12_pre5-libressl.patch
- "${FILESDIR}"/${PN}-0.12_pre5-rand-egd.patch
- "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
- "${FILESDIR}"/${PN}-0.12_pre5-ruby-1.9.patch
- "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-1-heartbeat.patch
- "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-2-up.patch
- "${WORKDIR}"/patches/${PN}-0.12_pre5-js185-3-histback.patch
- "${FILESDIR}"/${PN}-0.12_pre5-sm185-jsval-fixes.patch
- )
-
-src_prepare() {
- default
-
- # fix lib order in configure check
- # (these seds are necessary so that @preserved-libs copies are not used)
- sed -i -e 's:for spidermonkeylib in js .*$:for spidermonkeylib in mozjs185 mozjs js smjs; do:' \
- configure.in || die
- # Regenerate acinclude.m4 - based on autogen.sh.
- cat > acinclude.m4 <<- _EOF || die
- dnl Automatically generated from config/m4/ files.
- dnl Do not modify!
- _EOF
- cat config/m4/*.m4 >> acinclude.m4 || die
- sed -i -e 's/-Werror//' configure* || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
-
- if use debug ; then
- myconf="--enable-debug"
- else
- 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
- myconf="${myconf} --without-openssl --without-gnutls"
- fi
-
- econf \
- --sysconfdir="${EPREFIX}"/etc/elinks \
- --enable-leds \
- --enable-88-colors \
- --enable-256-colors \
- --enable-true-color \
- --enable-html-highlight \
- $(use_with bzip2 bzlib) \
- $(use_with gc) \
- $(use_with gpm) \
- $(use_with guile) \
- $(use_with idn) \
- $(use_with javascript spidermonkey) \
- $(use_with lua) \
- $(use_with perl) \
- $(use_with ruby) \
- $(use_with tre) \
- $(use_with X x) \
- $(use_with zlib) \
- $(use_enable bittorrent) \
- $(use_enable finger) \
- $(use_enable ftp) \
- $(use_enable gopher) \
- $(use_enable ipv6) \
- $(use_enable mouse) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable samba smb) \
- $(use_enable xml xbel) \
- ${myconf}
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- emake V=1 DESTDIR="${D}" 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
- # colliding 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 /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
- elog
- elog "Please have a look at /etc/elinks/keybind-full.sample and"
- elog "/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.13_pre_pre20180225.ebuild b/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
deleted file mode 100644
index cb8f0fdd3d8..00000000000
--- a/www-client/elinks/elinks-0.13_pre_pre20180225.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit autotools python-any-r1
-
-EGIT_COMMIT="0dd3aaabe61fbc5ed0d9a74915678d11d00c2a1c"
-
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="https://github.com/rkd77/felinks/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/felinks-${EGIT_COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm guile idn ipv6
- javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- brotli? ( app-arch/brotli:= )
- bzip2? ( >=app-arch/bzip2-1.0.2 )
- gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
- guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
- idn? ( net-dns/libidn:= )
- javascript? ( >=dev-lang/spidermonkey-1.8.5:0= )
- lua? ( >=dev-lang/lua-5:0= )
- perl? ( dev-lang/perl:= )
- ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
- samba? ( net-fs/samba )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- 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 )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-parallel-make.patch
- "${FILESDIR}"/${PN}-0.13-ruby.patch
-)
-
-src_prepare() {
- default
-
- sed -i -e 's/-Werror//' configure* || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --sysconfdir="${EPREFIX}"/etc/elinks
- --enable-leds
- --enable-88-colors
- --enable-256-colors
- --enable-true-color
- --enable-html-highlight
- $(use_with gpm)
- $(use_with brotli)
- $(use_with bzip2 bzlib)
- $(use_with guile)
- $(use_with idn)
- $(use_with javascript spidermonkey)
- $(use_with lua)
- $(use_with perl)
- $(use_with ruby)
- $(use_with tre)
- $(use_with X x)
- $(use_with zlib)
- $(use_enable bittorrent)
- $(use_enable finger)
- $(use_enable ftp)
- $(use_enable gopher)
- $(use_enable ipv6)
- $(use_enable mouse)
- $(use_enable nls)
- $(use_enable nntp)
- $(use_enable samba smb)
- $(use_enable xml xbel)
- )
-
- if use debug ; then
- myconf+=( --enable-debug )
- else
- 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+=( --with-openssl="${EPREFIX}"/usr )
- else
- myconf+=( --without-openssl --without-gnutls )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- emake V=1 DESTDIR="${D}" 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 /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
- elog
- elog "Please have a look at /etc/elinks/keybind-full.sample and"
- elog "/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.11.2-lua-5.1.patch b/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch
deleted file mode 100644
index 20db8a48459..00000000000
--- a/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naurp elinks-0.11.2/src/scripting/lua/core.c elinks-0.11.2-lua/src/scripting/lua/core.c
---- elinks-0.11.2/src/scripting/lua/core.c 2006-11-19 14:46:37.000000000 +0100
-+++ elinks-0.11.2-lua/src/scripting/lua/core.c 2007-03-10 15:34:47.000000000 +0100
-@@ -646,11 +646,7 @@ init_lua(struct module *module)
- {
- L = lua_open();
-
-- luaopen_base(L);
-- luaopen_table(L);
-- luaopen_io(L);
-- luaopen_string(L);
-- luaopen_math(L);
-+ luaL_openlibs(L);
-
- lua_register(L, LUA_ALERT, l_alert);
- lua_register(L, "current_url", l_current_url);
diff --git a/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch b/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch
deleted file mode 100644
index dee09a67eb4..00000000000
--- a/www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp elinks-0.12pre5-orig//src/intl/charsets.c elinks-0.12pre5/src/intl/charsets.c
---- elinks-0.12pre5-orig//src/intl/charsets.c 2010-04-04 12:19:02.000000000 +0200
-+++ elinks-0.12pre5/src/intl/charsets.c 2010-04-04 12:19:20.000000000 +0200
-@@ -821,7 +821,7 @@ free_utf_table(void)
-
- /* Cast away const. */
- for (i = 128; i < 256; i++)
-- mem_free((unsigned char *) utf_table[i].u.str);
-+ mem_free(utf_table[i].u.str);
- }
-
- static struct conv_table *
diff --git a/www-client/elinks/files/elinks-0.12_pre5-libressl.patch b/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
deleted file mode 100644
index d41ab689e9f..00000000000
--- a/www-client/elinks/files/elinks-0.12_pre5-libressl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Adapted from upstream
-commit 54ebe365b752f8969a67279d0d29552ab638e025
-Author: Witold Filipczyk <witekfl@poczta.onet.pl>
-Date: Mon Mar 6 17:39:36 2017 +0100
-
- Compilation fix for OpenSSL-1.1
-
---- a/src/network/ssl/socket.c
-+++ b/src/network/ssl/socket.c
-@@ -67,7 +67,9 @@
- ssl_set_no_tls(struct socket *socket)
- {
- #ifdef CONFIG_OPENSSL
-- ((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
-+#ifdef SSL_OP_NO_TLSv1
-+ SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1);
-+#endif
- #elif defined(CONFIG_GNUTLS)
- {
- /* GnuTLS does not support SSLv2 because it is "insecure".
-@@ -145,7 +147,7 @@
- }
-
- if (client_cert) {
-- SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
-+ SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl);
-
- SSL_CTX_use_certificate_chain_file(ctx, client_cert);
- SSL_CTX_use_PrivateKey_file(ctx, client_cert,
diff --git a/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch b/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
deleted file mode 100644
index 6c5679a95bb..00000000000
--- a/www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/network/ssl/ssl.c
-+++ b/src/network/ssl/ssl.c
-@@ -84,11 +84,16 @@ init_openssl(struct module *module)
- * cannot initialize the PRNG and so every attempt to use SSL fails.
- * It's actually an OpenSSL FAQ, and according to them, it's up to the
- * application coders to seed the RNG. -- William Yodlowsky */
-- if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
-+ RAND_file_name(f_randfile, sizeof(f_randfile));
-+#ifdef HAVE_RAND_EGD
-+ if (RAND_egd(f_randfile) < 0) {
- /* Not an EGD, so read and write to it */
-+#endif
- if (RAND_load_file(f_randfile, -1))
- RAND_write_file(f_randfile);
-+#ifdef HAVE_RAND_EGD
- }
-+#endif
-
- SSLeay_add_ssl_algorithms();
- context = SSL_CTX_new(SSLv23_client_method());
diff --git a/www-client/elinks/files/elinks-0.12_pre5-ruby-1.9.patch b/www-client/elinks/files/elinks-0.12_pre5-ruby-1.9.patch
deleted file mode 100644
index 1e07bcde190..00000000000
--- a/www-client/elinks/files/elinks-0.12_pre5-ruby-1.9.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -urp a/config/m4/ruby.m4 b/config/m4/ruby.m4
---- a/config/m4/ruby.m4 2009-07-07 13:23:17.000000000 +0100
-+++ b/config/m4/ruby.m4 2012-09-10 18:23:09.000000000 +0100
-@@ -32,36 +32,40 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"
- if test "$CONFIG_SCRIPTING_RUBY" != "no"; then
-
- AC_MSG_CHECKING(Ruby version)
-- if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
-+ if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION rescue RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
- ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}"'`
- AC_MSG_RESULT($ruby_version)
-
- AC_MSG_CHECKING(for Ruby header files)
-- rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
-+ rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || RbConfig::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
-
- if test "X$rubyhdrdir" != "X"; then
- AC_MSG_RESULT($rubyhdrdir)
- RUBY_CFLAGS="-I$rubyhdrdir"
-- rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
-+ rubyarch=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["arch"]]'`
-+ if test -d "$rubyhdrdir/$rubyarch"; then
-+ RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
-+ fi
-+ rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LIBS"]]'`
-
- if test "X$rubylibs" != "X"; then
- RUBY_LIBS="$rubylibs"
- fi
-
-- librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
-+ librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["LIBRUBYARG"]])'`
-
- if test -f "$rubyhdrdir/$librubyarg"; then
- librubyarg="$rubyhdrdir/$librubyarg"
-
- else
-- rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
-+ rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["libdir"]])'`
- if test -f "$rubylibdir/$librubyarg"; then
- librubyarg="$rubylibdir/$librubyarg"
- elif test "$librubyarg" = "libruby.a"; then
- dnl required on Mac OS 10.3 where libruby.a doesn't exist
- librubyarg="-lruby"
- else
-- librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
-+ librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{RbConfig.expand(RbConfig::CONFIG[\"libdir\"])}')"`
- fi
- fi
-
-@@ -69,7 +73,7 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"
- RUBY_LIBS="$librubyarg $RUBY_LIBS"
- fi
-
-- rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
-+ rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LDFLAGS"]]'`
- if test "X$rubyldflags" != "X"; then
- LDFLAGS="$rubyldflags $LDFLAGS"
- fi
-@@ -86,6 +90,15 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"
- AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
- fi
- fi
-+ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
-+ AC_MSG_CHECKING([for rb_errinfo])
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[rb_errinfo();]])],have_rb_errinfo="yes",have_rb_errinfo="no")
-+ AC_MSG_RESULT($have_rb_errinfo)
-+ if test "$have_rb_errinfo" = "yes"; then
-+ AC_DEFINE([HAVE_RB_ERRINFO], [1],
-+ [Define to 1 if you have the `rb_errinfo' function.])
-+ fi
-+ fi
- fi
-
- EL_RESTORE_FLAGS
-diff -urp a/src/scripting/ruby/core.c b/src/scripting/ruby/core.c
---- a/src/scripting/ruby/core.c 2009-07-07 13:23:17.000000000 +0100
-+++ b/src/scripting/ruby/core.c 2012-09-10 18:27:05.000000000 +0100
-@@ -76,10 +76,10 @@ erb_report_error(struct session *ses, in
- break;
- case TAG_RAISE:
- case TAG_FATAL:
-- eclass = CLASS_OF(ruby_errinfo);
-- einfo = rb_obj_as_string(ruby_errinfo);
-+ eclass = CLASS_OF(RB_ERRINFO);
-+ einfo = rb_obj_as_string(RB_ERRINFO);
-
-- if (eclass == rb_eRuntimeError && RSTRING(einfo)->len == 0) {
-+ if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) {
- msg = "unhandled exception";
-
- } else {
-@@ -88,7 +88,7 @@ erb_report_error(struct session *ses, in
-
- epath = rb_class_path(eclass);
- snprintf(buff, MAX_STR_LEN, "%s: %s",
-- RSTRING(epath)->ptr, RSTRING(einfo)->ptr);
-+ RSTRING_PTR(epath), RSTRING_PTR(einfo));
-
- p = strchr(buff, '\n');
- if (p) *p = '\0';
-@@ -115,7 +115,7 @@ erb_module_message(VALUE self, VALUE str
- unsigned char *message, *line_end;
-
- str = rb_obj_as_string(str);
-- message = memacpy(RSTRING(str)->ptr, RSTRING(str)->len);
-+ message = memacpy(RSTRING_PTR(str), RSTRING_LEN(str));
- if (!message) return Qnil;
-
- line_end = strchr(message, '\n');
-@@ -162,8 +162,8 @@ erb_stdout_p(int argc, VALUE *argv, VALU
- * the inspect() method, which adds quotes to the strings, so
- * gently ignore them. */
-
-- ptr = RSTRING(substr)->ptr;
-- len = RSTRING(substr)->len;
-+ ptr = RSTRING_PTR(substr);
-+ len = RSTRING_LEN(substr);
-
- if (*ptr == '"')
- ptr++, len--;
-diff -urp a/src/scripting/ruby/core.h b/src/scripting/ruby/core.h
---- a/src/scripting/ruby/core.h 2009-07-07 13:23:17.000000000 +0100
-+++ b/src/scripting/ruby/core.h 2012-09-10 18:26:25.000000000 +0100
-@@ -7,6 +7,20 @@ struct session;
-
- #include <ruby.h> /* for VALUE */
-
-+#ifndef RSTRING_LEN
-+#define RSTRING_LEN(string) (RSTRING(string)->len)
-+#endif
-+
-+#ifndef RSTRING_PTR
-+#define RSTRING_PTR(string) (RSTRING(string)->ptr)
-+#endif
-+
-+#ifdef HAVE_RB_ERRINFO
-+#define RB_ERRINFO (rb_errinfo())
-+#else
-+#define RB_ERRINFO (ruby_errinfo)
-+#endif
-+
- VALUE erb_module;
-
- void alert_ruby_error(struct session *ses, unsigned char *msg);
-diff -urp a/src/scripting/ruby/hooks.c b/src/scripting/ruby/hooks.c
---- a/src/scripting/ruby/hooks.c 2009-07-07 13:23:17.000000000 +0100
-+++ b/src/scripting/ruby/hooks.c 2012-09-10 17:53:48.000000000 +0100
-@@ -83,7 +83,7 @@ script_hook_goto_url(va_list ap, void *d
- {
- unsigned char *new_url;
-
-- new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+ new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- if (new_url) {
- mem_free_set(url, new_url);
- }
-@@ -126,7 +126,7 @@ script_hook_follow_url(va_list ap, void
- {
- unsigned char *new_url;
-
-- new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+ new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- if (new_url) {
- mem_free_set(url, new_url);
- }
-@@ -170,9 +170,9 @@ script_hook_pre_format_html(va_list ap,
- switch (rb_type(result)) {
- case T_STRING:
- {
-- int len = RSTRING(result)->len;
-+ int len = RSTRING_LEN(result);
-
-- add_fragment(cached, 0, RSTRING(result)->ptr, len);
-+ add_fragment(cached, 0, RSTRING_PTR(result), len);
- normalize_cache_entry(cached, len);
-
- break;
-@@ -216,7 +216,7 @@ script_hook_get_proxy(va_list ap, void *
- {
- unsigned char *proxy;
-
-- proxy = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+ proxy = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- if (proxy) {
- mem_free_set(new_proxy_url, proxy);
- }
diff --git a/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch b/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch
deleted file mode 100644
index ee2e5e8d633..00000000000
--- a/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- a/src/scripting/smjs/action_object.c 2012-06-28 11:46:58.000000000 -0400
-+++ b/src/scripting/smjs/action_object.c 2012-06-28 11:52:42.000000000 -0400
-@@ -50,7 +50,7 @@
- assert(smjs_ctx);
- if_assert_failed return JS_FALSE;
-
-- value = JS_FALSE;
-+ value = JSVAL_FALSE;
-
- if (JS_TRUE != JS_ValueToObject(ctx, argv[-2], &fn_obj)) {
- JS_SET_RVAL(ctx, rval, value);
-@@ -76,7 +76,7 @@
-
- do_action(hop->ses, hop->action_id, 1);
-
-- value = JS_TRUE;
-+ value = JSVAL_TRUE;
- JS_SET_RVAL(ctx, rval, value);
-
- return JS_TRUE;
---- a/src/scripting/smjs/bookmarks.c 2012-06-28 11:57:40.000000000 -0400
-+++ b/src/scripting/smjs/bookmarks.c 2012-06-28 12:08:20.000000000 -0400
-@@ -250,11 +250,20 @@
-
- /* @bookmark_folder_class.getProperty */
- static JSBool
-+#if JS_VERSION >= 185
-+bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
-+#else
- bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
-+#endif
- {
- struct bookmark *bookmark;
- struct bookmark *folder;
- unsigned char *title = NULL;
-+#if JS_VERSION >= 185
-+ jsval id;
-+ if (!JS_IdToValue(ctx,iid,&id))
-+ return JS_FALSE;
-+#endif
-
- /* This can be called if @obj if not itself an instance of the
- * appropriate class but has one in its prototype chain. Fail
---- a/src/scripting/smjs/elinks_object.c 2012-06-28 12:11:15.000000000 -0400
-+++ b/src/scripting/smjs/elinks_object.c 2012-06-28 12:14:50.000000000 -0400
-@@ -185,7 +185,7 @@
- method, rval))
- return JS_FALSE;
-
-- if (JSVAL_VOID == *rval)
-+ if (JSVAL_IS_VOID(*rval))
- return JS_FALSE;
-
- return JS_CallFunctionValue(smjs_ctx, smjs_elinks_object,
---- a/src/scripting/smjs/globhist.c 2012-06-28 12:20:25.000000000 -0400
-+++ b/src/scripting/smjs/globhist.c 2012-06-28 12:20:15.000000000 -0400
-@@ -201,11 +201,20 @@
-
- /* @smjs_globhist_class.getProperty */
- static JSBool
--smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
-+#if JS_VERSION >= 185
-+smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
-+#else
-+smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
-+#endif
- {
- JSObject *jsobj;
- unsigned char *uri_string;
- struct global_history_item *history_item;
-+#if JS_VERSION >= 185
-+ jsval id;
-+ if (!JS_IdToValue(ctx,iid,&id))
-+ return JS_FALSE;
-+#endif
-
- uri_string = JS_EncodeString(ctx, JS_ValueToString(ctx, id));
- if (!uri_string) goto ret_null;
---- a/src/scripting/smjs/keybinding.c 2012-06-28 12:21:39.000000000 -0400
-+++ b/src/scripting/smjs/keybinding.c.new 2012-06-28 12:48:00.000000000 -0400
-@@ -17,11 +17,20 @@
-
- /* @keymap_class.getProperty */
- static JSBool
--keymap_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
-+#if JS_VERSION >= 185
-+keymap_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
-+#else
-+keymap_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
-+#endif
- {
- unsigned char *action_str;
- const unsigned char *keystroke_str;
- int *data;
-+#if JS_VERSION >= 185
-+ jsval id;
-+ if (!JS_IdToValue(ctx,iid,&id))
-+ return JS_FALSE;
-+#endif
-
- /* This can be called if @obj if not itself an instance of the
- * appropriate class but has one in its prototype chain. Fail
-@@ -70,11 +79,20 @@
-
- /* @keymap_class.setProperty */
- static JSBool
--keymap_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
-+#if JS_VERSION >= 185
-+keymap_set_property(JSContext *ctx, JSObject *obj, jsid iid, JSBool strict, jsval *vp)
-+#else
-+keymap_set_property(JSContext *ctx, JSObject *obj, jsval id, JSBool strict, jsval *vp)
-+#endif
- {
- int *data;
- unsigned char *keymap_str;
- const unsigned char *keystroke_str;
-+#if JS_VERSION >= 185
-+ jsval id;
-+ if (!JS_IdToValue(ctx,iid,&id))
-+ return JS_FALSE;
-+#endif
-
- /* This can be called if @obj if not itself an instance of the
- * appropriate class but has one in its prototype chain. Fail
diff --git a/www-client/elinks/files/elinks-0.13-ruby.patch b/www-client/elinks/files/elinks-0.13-ruby.patch
deleted file mode 100644
index a716439b512..00000000000
--- a/www-client/elinks/files/elinks-0.13-ruby.patch
+++ /dev/null
@@ -1,183 +0,0 @@
---- a/config/m4/ruby.m4
-+++ b/config/m4/ruby.m4
-@@ -32,36 +32,40 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
- if test "$CONFIG_SCRIPTING_RUBY" != "no"; then
-
- AC_MSG_CHECKING(Ruby version)
-- if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
-+ if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION rescue RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
- ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}"'`
- AC_MSG_RESULT($ruby_version)
-
- AC_MSG_CHECKING(for Ruby header files)
-- rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
-+ rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || RbConfig::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
-
- if test "X$rubyhdrdir" != "X"; then
- AC_MSG_RESULT($rubyhdrdir)
- RUBY_CFLAGS="-I$rubyhdrdir"
-- rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
-+ rubyarch=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["arch"]]'`
-+ if test -d "$rubyhdrdir/$rubyarch"; then
-+ RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
-+ fi
-+ rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LIBS"]]'`
-
- if test "X$rubylibs" != "X"; then
- RUBY_LIBS="$rubylibs"
- fi
-
-- librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
-+ librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["LIBRUBYARG"]])'`
-
- if test -f "$rubyhdrdir/$librubyarg"; then
- librubyarg="$rubyhdrdir/$librubyarg"
-
- else
-- rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
-+ rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig.expand(RbConfig::CONFIG[["libdir"]])'`
- if test -f "$rubylibdir/$librubyarg"; then
- librubyarg="$rubylibdir/$librubyarg"
- elif test "$librubyarg" = "libruby.a"; then
- dnl required on Mac OS 10.3 where libruby.a doesn't exist
- librubyarg="-lruby"
- else
-- librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"`
-+ librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{RbConfig.expand(RbConfig::CONFIG[\"libdir\"])}')"`
- fi
- fi
-
-@@ -69,7 +73,7 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
- RUBY_LIBS="$librubyarg $RUBY_LIBS"
- fi
-
-- rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
-+ rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print RbConfig::CONFIG[["LDFLAGS"]]'`
- if test "X$rubyldflags" != "X"; then
- LDFLAGS="$rubyldflags $LDFLAGS"
- fi
-@@ -86,6 +90,15 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
- AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
- fi
- fi
-+ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
-+ AC_MSG_CHECKING([for rb_errinfo])
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ruby.h>]], [[rb_errinfo();]])],have_rb_errinfo="yes",have_rb_errinfo="no")
-+ AC_MSG_RESULT($have_rb_errinfo)
-+ if test "$have_rb_errinfo" = "yes"; then
-+ AC_DEFINE([HAVE_RB_ERRINFO], [1],
-+ [Define to 1 if you have the `rb_errinfo' function.])
-+ fi
-+ fi
- fi
-
- EL_RESTORE_FLAGS
---- a/src/scripting/ruby/core.c
-+++ b/src/scripting/ruby/core.c
-@@ -76,10 +76,10 @@ erb_report_error(struct session *ses, int error)
- break;
- case TAG_RAISE:
- case TAG_FATAL:
-- eclass = CLASS_OF(ruby_errinfo);
-- einfo = rb_obj_as_string(ruby_errinfo);
-+ eclass = CLASS_OF(RB_ERRINFO);
-+ einfo = rb_obj_as_string(RB_ERRINFO);
-
-- if (eclass == rb_eRuntimeError && RSTRING(einfo)->len == 0) {
-+ if (eclass == rb_eRuntimeError && RSTRING_LEN(einfo) == 0) {
- msg = "unhandled exception";
-
- } else {
-@@ -88,7 +88,7 @@ erb_report_error(struct session *ses, int error)
-
- epath = rb_class_path(eclass);
- snprintf(buff, MAX_STR_LEN, "%s: %s",
-- RSTRING(epath)->ptr, RSTRING(einfo)->ptr);
-+ RSTRING_PTR(epath), RSTRING_PTR(einfo));
-
- p = strchr((const char *)buff, '\n');
- if (p) *p = '\0';
-@@ -116,7 +116,7 @@ erb_module_message(VALUE self, VALUE str)
- struct terminal *term;
-
- str = rb_obj_as_string(str);
-- message = memacpy(RSTRING(str)->ptr, RSTRING(str)->len);
-+ message = memacpy(RSTRING_PTR(str), RSTRING_PTR(str));
- if (!message) return Qnil;
-
- line_end = strchr((const char *)message, '\n');
-@@ -165,8 +165,8 @@ erb_stdout_p(int argc, VALUE *argv, VALUE self)
- * the inspect() method, which adds quotes to the strings, so
- * gently ignore them. */
-
-- ptr = RSTRING(substr)->ptr;
-- len = RSTRING(substr)->len;
-+ ptr = RSTRING_PTR(substr);
-+ len = RSTRING_LEN(substr);
-
- if (*ptr == '"')
- ptr++, len--;
---- a/src/scripting/ruby/core.h
-+++ b/src/scripting/ruby/core.h
-@@ -7,6 +7,20 @@ struct session;
-
- #include <ruby.h> /* for VALUE */
-
-+#ifndef RSTRING_LEN
-+#define RSTRING_LEN(string) (RSTRING(string)->len)
-+#endif
-+
-+#ifndef RSTRING_PTR
-+#define RSTRING_PTR(string) (RSTRING(string)->ptr)
-+#endif
-+
-+#ifdef HAVE_RB_ERRINFO
-+#define RB_ERRINFO (rb_errinfo())
-+#else
-+#define RB_ERRINFO (ruby_errinfo)
-+#endif
-+
- VALUE erb_module;
-
- void alert_ruby_error(struct session *ses, unsigned char *msg);
---- a/src/scripting/ruby/hooks.c
-+++ b/src/scripting/ruby/hooks.c
-@@ -83,7 +83,7 @@ script_hook_goto_url(va_list ap, void *data)
- {
- unsigned char *new_url;
-
-- new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+ new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- if (new_url) {
- mem_free_set(url, new_url);
- }
-@@ -126,7 +126,7 @@ script_hook_follow_url(va_list ap, void *data)
- {
- unsigned char *new_url;
-
-- new_url = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+ new_url = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- if (new_url) {
- mem_free_set(url, new_url);
- }
-@@ -170,9 +170,9 @@ script_hook_pre_format_html(va_list ap, void *data)
- switch (rb_type(result)) {
- case T_STRING:
- {
-- int len = RSTRING(result)->len;
-+ int len = RSTRING_LEN(result);
-
-- add_fragment(cached, 0, RSTRING(result)->ptr, len);
-+ add_fragment(cached, 0, RSTRING_PTR(result), len);
- normalize_cache_entry(cached, len);
-
- break;
-@@ -216,7 +216,7 @@ script_hook_get_proxy(va_list ap, void *data)
- {
- unsigned char *proxy;
-
-- proxy = memacpy(RSTRING(result)->ptr, RSTRING(result)->len);
-+ proxy = memacpy(RSTRING_PTR(result), RSTRING_LEN(result));
- if (proxy) {
- mem_free_set(new_proxy_url, proxy);
- }
diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
index 8dfd5728bec..f3fc1b6822c 100644
--- a/www-client/elinks/metadata.xml
+++ b/www-client/elinks/metadata.xml
@@ -13,7 +13,6 @@
<flag name="bittorrent">Enable support for the BitTorrent protocol</flag>
<flag name="brotli">Enable support for brotli compression</flag>
<flag name="finger">Enable support for the finger protocol</flag>
- <flag name="gc">Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag>
<flag name="gopher">Enable support for the gopher protocol</flag>
<flag name="mouse">Make elinks to grab all mouse events</flag>
<flag name="tre">Enable support for regex searches via <pkg>dev-libs/tre</pkg></flag>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/
@ 2022-10-13 19:56 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-10-13 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 8f806f078a5373d5be0af5a6ad6be23b7a851745
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 19:55:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 19:55:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f806f07
www-client/elinks: rename old parallel-make patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/elinks/elinks-0.13.5-r100.ebuild | 4 ++--
...nks-9999-parallel-make.patch => elinks-0.13.5-parallel-make.patch} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/www-client/elinks/elinks-0.13.5-r100.ebuild b/www-client/elinks/elinks-0.13.5-r100.ebuild
index b4dfb74b0dae..a3b49623550e 100644
--- a/www-client/elinks/elinks-0.13.5-r100.ebuild
+++ b/www-client/elinks/elinks-0.13.5-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}"
PATCHES=(
- "${FILESDIR}"/${PN}-9999-parallel-make.patch
+ "${FILESDIR}"/${P}-parallel-make.patch
)
src_prepare() {
diff --git a/www-client/elinks/files/elinks-9999-parallel-make.patch b/www-client/elinks/files/elinks-0.13.5-parallel-make.patch
similarity index 100%
rename from www-client/elinks/files/elinks-9999-parallel-make.patch
rename to www-client/elinks/files/elinks-0.13.5-parallel-make.patch
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/
@ 2023-07-03 15:16 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-07-03 15:16 UTC (permalink / raw
To: gentoo-commits
commit: 4ac664e7d86ef49367178cfff9a03936e0fd8289
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 3 15:10:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 3 15:10:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac664e7
www-client/elinks: drop 0.13.5-r100, 0.15.1-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/elinks/Manifest | 2 -
www-client/elinks/elinks-0.13.5-r100.ebuild | 147 -------------------
www-client/elinks/elinks-0.15.1-r1.ebuild | 158 ---------------------
.../elinks/files/elinks-0.13.5-parallel-make.patch | 51 -------
.../files/elinks-0.15.1-no-mouse-build.patch | 40 ------
5 files changed, 398 deletions(-)
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 4eb6b44a6972..462b1a150161 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,4 +1,2 @@
-DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
-DIST elinks-0.15.1.tar.xz 1997208 BLAKE2B dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2 SHA512 677eeeeab3fc24dcfe4e7248a9c1a8e07083ebd13bd9923d89702a04dbe1c3e4d4038029c095881183d7f11ae2c5317ff7e5458320644fde0c176378b89068d8
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.13.5-r100.ebuild b/www-client/elinks/elinks-0.13.5-r100.ebuild
deleted file mode 100644
index 2724fdf1d0ab..000000000000
--- a/www-client/elinks/elinks-0.13.5-r100.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-LUA_COMPAT=( lua5-{1,2} )
-
-inherit autotools lua-single python-any-r1
-
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="https://github.com/rkd77/felinks/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/felinks-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
- lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib zstd"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- brotli? ( app-arch/brotli:= )
- bzip2? ( >=app-arch/bzip2-1.0.2 )
- gpm? ( >=sys-libs/ncurses-5.2:0= >=sys-libs/gpm-1.20.0-r5 )
- guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] )
- idn? ( net-dns/libidn:= )
- lua? ( ${LUA_DEPS} )
- perl? ( dev-lang/perl:= )
- ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* )
- samba? ( net-fs/samba )
- ssl? (
- !gnutls? (
- dev-libs/openssl:0=
- )
- 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}
- ${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-parallel-make.patch
-)
-
-src_prepare() {
- default
-
- sed -i -e 's/-Werror//' configure* || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --sysconfdir="${EPREFIX}"/etc/elinks
- --enable-leds
- --enable-88-colors
- --enable-256-colors
- --enable-true-color
- --enable-html-highlight
- --without-spidermonkey
- $(use_with gpm)
- $(use_with brotli)
- $(use_with bzip2 bzlib)
- $(use_with guile)
- $(use_with idn)
- $(use_with lua luapkg lua)
- $(use_with perl)
- $(use_with ruby)
- $(use_with tre)
- $(use_with X x)
- $(use_with zlib)
- $(use_with zstd)
- $(use_enable bittorrent)
- $(use_enable finger)
- $(use_enable ftp)
- $(use_enable gopher)
- $(use_enable ipv6)
- $(use_enable mouse)
- $(use_enable nls)
- $(use_enable nntp)
- $(use_enable samba smb)
- $(use_enable xml xbel)
- )
-
- if use debug ; then
- myconf+=( --enable-debug )
- else
- myconf+=( --enable-fastmem )
- fi
-
- if use ssl ; then
- if use gnutls ; then
- myconf+=( --with-gnutls )
- else
- myconf+=( --with-openssl="${EPREFIX}"/usr )
- fi
- else
- myconf+=( --without-openssl --without-gnutls )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- emake V=1 DESTDIR="${D}" 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 /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
- elog
- elog "Please have a look at /etc/elinks/keybind-full.sample and"
- elog "/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.15.1-r1.ebuild b/www-client/elinks/elinks-0.15.1-r1.ebuild
deleted file mode 100644
index be981f99d36b..000000000000
--- a/www-client/elinks/elinks-0.15.1-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-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
- lua lzma +mouse nls nntp perl samba ssl tre unicode X xml zlib zstd"
-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:= )
- 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}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-mouse-build.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)
- -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 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.13.5-parallel-make.patch b/www-client/elinks/files/elinks-0.13.5-parallel-make.patch
deleted file mode 100644
index 86aea5588a2f..000000000000
--- a/www-client/elinks/files/elinks-0.13.5-parallel-make.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/Makefile.lib 2014-05-30 13:45:11.756422117 -0400
-+++ b/Makefile.lib 2014-05-30 13:47:22.626423230 -0400
-@@ -117,7 +117,7 @@
- $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
- $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
-
--$(LIB_O_NAME): $(LIB_O_DEPS)
-+$(LIB_O_NAME): all-recursive.built $(LIB_O_DEPS)
- $(call cmd,ld_objs)
-
- DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src))
-@@ -260,21 +260,36 @@
- # remaining subdirectories, but return an error at the end.
- $(RULES_REC):
- ifneq (,$(findstring k,$(MAKEFLAGS)))
-- @suberr=0; \
-+ @+suberr=0; \
- $(foreach subdir,$(sort $(SUBDIRS)), \
- $(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || suberr=1;) \
- exit $$suberr
- else
-- @$(foreach subdir,$(sort $(SUBDIRS)), \
-+ @+$(foreach subdir,$(sort $(SUBDIRS)), \
- $(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit 1;)
- endif
-
-+all-recursive.built:
-+ifneq (,$(findstring k,$(MAKEFLAGS)))
-+ @+suberr=0; \
-+ $(foreach subdir,$(sort $(SUBDIRS)), \
-+ $(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || suberr=1;) \
-+ [ $$suberr == 0 ] && touch $@; \
-+ exit $$suberr
-+else
-+ @+$(foreach subdir,$(sort $(SUBDIRS)), \
-+ $(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || exit 1;) \
-+ touch $@
-+endif
-+
-+CLEAN += all-recursive.built
-+
- # Dummy -local rules
- $(RULES_LOCAL):
-
- # Default deps
- rule_deps = $(1)-recursive $(1)-default $(1)-local
--all: $(call rule_deps,all)
-+all: $(subst recursive,recursive.built,$(call rule_deps,all))
- install: $(call rule_deps,install)
- clean: $(call rule_deps,clean)
- cleanall: $(call rule_deps,cleanall)
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
deleted file mode 100644
index cee5bdac4a83..000000000000
--- a/www-client/elinks/files/elinks-0.15.1-no-mouse-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/
@ 2024-07-16 21:28 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2024-07-16 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 2d9fa2ef2f89fb72275dab73204ad2404b22d666
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 21:24:55 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 21:24:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d9fa2ef
www-client/elinks: fix python3.12 support
Closes: https://bugs.gentoo.org/929876
Bug: https://bugs.gentoo.org/919372
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
www-client/elinks/elinks-0.16.1.1-r3.ebuild | 2 ++
...-0.16.1.1-ecmascript-implicit-declaration.patch | 36 ++++++++++++++++++++++
.../elinks/files/elinks-0.16.1.1-python-3.12.patch | 26 ++++++++++++++++
3 files changed, 64 insertions(+)
diff --git a/www-client/elinks/elinks-0.16.1.1-r3.ebuild b/www-client/elinks/elinks-0.16.1.1-r3.ebuild
index bef5b7bb9a45..a56703fb7e56 100644
--- a/www-client/elinks/elinks-0.16.1.1-r3.ebuild
+++ b/www-client/elinks/elinks-0.16.1.1-r3.ebuild
@@ -72,7 +72,9 @@ BDEPEND="
"
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() {
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
new file mode 100644
index 000000000000..58c98cc27da0
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.1.1-ecmascript-implicit-declaration.patch
@@ -0,0 +1,36 @@
+--- 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-python-3.12.patch b/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch
new file mode 100644
index 000000000000..e6ac9f004463
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.16.1.1-python-3.12.patch
@@ -0,0 +1,26 @@
+From 2577da89420ce2a1d58fadd7f2e6809d2ba70dd8 Mon Sep 17 00:00:00 2001
+From: Witold Filipczyk <witekfl@poczta.onet.pl>
+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;
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/
@ 2024-10-28 11:42 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-10-28 11:42 UTC (permalink / raw
To: gentoo-commits
commit: a0994847954dbf35b3933d1ecb2332d1684602e7
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Mon Oct 28 01:40:45 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 11:41:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0994847
www-client/elinks: various bugfixes
Closes: https://bugs.gentoo.org/933407
Closes: https://bugs.gentoo.org/942286
Closes: https://bugs.gentoo.org/942202
Closes: https://bugs.gentoo.org/942293
Signed-off-by: Felix Janda <felix.janda <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/39134
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/elinks/elinks-0.17.1.1.ebuild | 8 ++-
www-client/elinks/elinks-9999.ebuild | 4 +-
www-client/elinks/files/elinks-0.17.1.1-sftp.patch | 63 +++++++++++++---------
3 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/www-client/elinks/elinks-0.17.1.1.ebuild b/www-client/elinks/elinks-0.17.1.1.ebuild
index ba0f3ed2a59c..9b8c200b66dd 100644
--- a/www-client/elinks/elinks-0.17.1.1.ebuild
+++ b/www-client/elinks/elinks-0.17.1.1.ebuild
@@ -29,6 +29,7 @@ IUSE+=" javascript libcss lua lzma +mouse nls nntp perl python samba ssl test tr
RESTRICT="!test? ( test )"
REQUIRED_USE="
guile? ( ${GUILE_REQUIRED_USE} )
+ javascript? ( libcss )
lua? ( ${LUA_REQUIRED_USE} )
python? ( ${PYTHON_REQUIRED_USE} )
"
@@ -86,12 +87,17 @@ PATCHES=(
pkg_setup() {
use guile && guile-single_pkg_setup
use lua && lua-single_pkg_setup
- use python && python-single-r1_pkg_setup
+ python-single-r1_pkg_setup
}
src_prepare() {
default
use guile && guile_bump_sources
+ python_fix_shebang .
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=942286
+ sed -i -e '/find_library/s/, dirs: \[[^]]*\]//' \
+ meson.build || die
}
src_configure() {
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild
index 385322847846..daa906d436ce 100644
--- a/www-client/elinks/elinks-9999.ebuild
+++ b/www-client/elinks/elinks-9999.ebuild
@@ -29,6 +29,7 @@ IUSE+=" javascript libcss lua lzma +mouse nls nntp perl python samba ssl test tr
RESTRICT="!test? ( test )"
REQUIRED_USE="
guile? ( ${GUILE_REQUIRED_USE} )
+ javascript? ( libcss )
lua? ( ${LUA_REQUIRED_USE} )
python? ( ${PYTHON_REQUIRED_USE} )
"
@@ -81,12 +82,13 @@ BDEPEND="
pkg_setup() {
use guile && guile-single_pkg_setup
use lua && lua-single_pkg_setup
- use python && python-single-r1_pkg_setup
+ python-single-r1_pkg_setup
}
src_prepare() {
default
use guile && guile_bump_sources
+ python_fix_shebang .
}
src_configure() {
diff --git a/www-client/elinks/files/elinks-0.17.1.1-sftp.patch b/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
index 2607c90b4fbd..f8f1d5092bff 100644
--- a/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
+++ b/www-client/elinks/files/elinks-0.17.1.1-sftp.patch
@@ -1,18 +1,7 @@
-From 1f0ee66aecbb52f8c423128aa7e0dd35822e989c Mon Sep 17 00:00:00 2001
-From: Witold Filipczyk <witekfl@poczta.onet.pl>
-Date: Mon, 27 May 2024 10:23:46 +0200
-Subject: [PATCH] [protolcols] Do not compile-in SFTP when ftp was disabled.
- Refs #304
+Combination of upstream commits:
+1f0ee66aecbb52f8c423128aa7e0dd35822e989c
+a198d2da3cf958d7c1de3bc02a2ea49c25a3f785
----
- src/protocol/curl/ftp.c | 42 +++-------------------------------------
- src/protocol/curl/http.c | 42 ++++++++++++++++++++++++++++++++++++++++
- src/protocol/curl/sftp.h | 2 +-
- src/protocol/protocol.c | 2 +-
- 4 files changed, 47 insertions(+), 41 deletions(-)
-
-diff --git a/src/protocol/curl/ftp.c b/src/protocol/curl/ftp.c
-index 5f3d462ac..73120a67d 100644
--- a/src/protocol/curl/ftp.c
+++ b/src/protocol/curl/ftp.c
@@ -55,6 +55,8 @@
@@ -24,7 +13,16 @@ index 5f3d462ac..73120a67d 100644
static char el_curlversion[256];
static void
-@@ -641,45 +643,6 @@ ftp_curl_handle_error(struct connection *conn, CURLcode res)
+@@ -616,7 +618,7 @@
+ abort_connection(conn, connection_state(S_OK));
+ }
+
+-static void
++void
+ ftp_curl_handle_error(struct connection *conn, CURLcode res)
+ {
+ if (res == CURLE_OK) {
+@@ -635,45 +637,6 @@
abort_connection(conn, connection_state(S_CURL_ERROR - res));
}
@@ -70,17 +68,36 @@ index 5f3d462ac..73120a67d 100644
void
ftpes_protocol_handler(struct connection *conn)
{
-@@ -695,3 +658,4 @@ sftp_protocol_handler(struct connection *conn)
+@@ -689,3 +652,4 @@
do_ftpes(conn);
}
}
+#endif
\ No newline at end of file
-diff --git a/src/protocol/curl/http.c b/src/protocol/curl/http.c
-index e2349489a..25d0eb36d 100644
+--- a/src/protocol/curl/ftpes.h
++++ b/src/protocol/curl/ftpes.h
+@@ -1,6 +1,10 @@
+ #ifndef EL__PROTOCOL_CURL_FTPES_H
+ #define EL__PROTOCOL_CURL_FTPES_H
+
++#ifdef CONFIG_LIBCURL
++#include <curl/curl.h>
++#endif
++
+ #include "main/module.h"
+ #include "protocol/protocol.h"
+
+@@ -12,6 +16,7 @@
+
+ #if defined(CONFIG_FTP) && defined(CONFIG_LIBCURL)
+ extern protocol_handler_T ftpes_protocol_handler;
++void ftp_curl_handle_error(struct connection *conn, CURLcode res);
+ #else
+ #define ftpes_protocol_handler NULL
+ #endif
--- a/src/protocol/curl/http.c
+++ b/src/protocol/curl/http.c
-@@ -505,3 +505,45 @@ http_curl_protocol_handler(struct connection *conn)
+@@ -461,3 +461,45 @@
do_http(conn);
}
}
@@ -126,11 +143,9 @@ index e2349489a..25d0eb36d 100644
+ }
+#endif
+}
-diff --git a/src/protocol/curl/sftp.h b/src/protocol/curl/sftp.h
-index f9167c3fa..cdcafd572 100644
--- a/src/protocol/curl/sftp.h
+++ b/src/protocol/curl/sftp.h
-@@ -10,7 +10,7 @@ extern "C" {
+@@ -10,7 +10,7 @@
extern struct module sftp_protocol_module;
@@ -139,11 +154,9 @@ index f9167c3fa..cdcafd572 100644
extern protocol_handler_T sftp_protocol_handler;
#else
#define sftp_protocol_handler NULL
-diff --git a/src/protocol/protocol.c b/src/protocol/protocol.c
-index 930a4f86b..d3fae896c 100644
--- a/src/protocol/protocol.c
+++ b/src/protocol/protocol.c
-@@ -336,7 +336,7 @@ static struct module *protocol_submodules[] = {
+@@ -336,7 +336,7 @@
#ifdef CONFIG_NNTP
&nntp_protocol_module,
#endif
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-10-28 11:42 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-28 11:42 [gentoo-commits] repo/gentoo:master commit in: www-client/elinks/, www-client/elinks/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-07-16 21:28 Conrad Kostecki
2023-07-03 15:16 Sam James
2022-10-13 19:56 Sam James
2020-09-13 18:39 Sam James
2018-03-26 18:07 Jeroen Roovers
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