From 81aff4361adcbdc06904ccd87762147230df10f5 Mon Sep 17 00:00:00 2001 From: "S. Gilles" Date: Sun, 7 May 2023 02:32:25 -0400 Subject: [PATCH] www-client/elinks: remove --- www-client/elinks/Manifest | 11 -- www-client/elinks/elinks-9999.ebuild | 147 ---------------- .../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 -------------------- .../elinks/files/elinks-0.13.4-ruby-gcc10.patch | 13 -- .../elinks/files/elinks-9999-parallel-make.patch | 51 ------ www-client/elinks/metadata.xml | 22 --- 12 files changed, 815 deletions(-) delete mode 100644 www-client/elinks/Manifest delete mode 100644 www-client/elinks/elinks-9999.ebuild delete mode 100644 www-client/elinks/files/elinks-0.11.2-lua-5.1.patch delete mode 100644 www-client/elinks/files/elinks-0.12_pre5-compilation-fix.patch delete mode 100644 www-client/elinks/files/elinks-0.12_pre5-libressl.patch delete mode 100644 www-client/elinks/files/elinks-0.12_pre5-rand-egd.patch delete mode 100644 www-client/elinks/files/elinks-0.12_pre5-ruby-1.9.patch delete mode 100644 www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch delete mode 100644 www-client/elinks/files/elinks-0.13-ruby.patch delete mode 100644 www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch delete mode 100644 www-client/elinks/files/elinks-9999-parallel-make.patch delete mode 100644 www-client/elinks/metadata.xml diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest deleted file mode 100644 index 9eaa842..0000000 --- a/www-client/elinks/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX elinks-0.11.2-lua-5.1.patch 538 BLAKE2B 10650f042c2a074fcd6a6c3c0b481b096b4d23d530f5a7c59bbc1687f83dde1286eaa6aebc37d6a1ea2e93d3d15287e916ef6abe2d1681678a4beba87cfd07d3 SHA512 48aca9662b3d9b43ba027d2328acdafe6363f3e2a69e6f2a6d468718c28f12de6247c629273a11aef0b053010a7b7250c03db39fab1cb4cd6d237bd1c69fccef -AUX elinks-0.12_pre5-compilation-fix.patch 464 BLAKE2B 977e4ce921ab0e8593427d2822d2a209124fc3d2d20e093adc362c6c6b4421f86571625f81690aa7a8383431519264cf195d2cec5efb99f95691518606108204 SHA512 7c1232f4f15579f8073cdea7397e4a34d5bec51268eb61cdff854f221615b027c385b81871e7b5fbefeda1ddf5de3008719724b9853798bc198866a25c8840fe -AUX elinks-0.12_pre5-libressl.patch 845 BLAKE2B 62b77fb6280618a6fc473cdd55a9c74fb2995f1b80d13660141c4be765fbe67838e3a067c833a8eb9f61e30858d1e29245acebc42d378f4fac5fafa659b1ac38 SHA512 7cf844e5f62abc20b9fffd29c82a786504db4e645a794b98238ea7157db1fe8bfc3e4c211c674ff182aa5d540350b2c8cae34a61891dc79afa1e2525448b747a -AUX elinks-0.12_pre5-rand-egd.patch 738 BLAKE2B fb76450867476e21dbad27633d313359dc6d641a4e705d4308faf2d79a9c3fd923b6f9b47701af4d67b7e28b67c0b477d40ead617ff8e3041394b3163315cf5c SHA512 7d23496380658f102d933a1722313d1b0396afb0b349260cb7cf735baec4edd08cb5ad363880d6bb95ef67e46770daa8b4aa57116a53ec36762db05a58ed09ff -AUX elinks-0.12_pre5-ruby-1.9.patch 7131 BLAKE2B 5b65d975982986e85ae2f9f8a1a6ac96a49bbdbaaba23bc9bfb93c8b9a5ef3bf380a0752dd1c36b76772d7abd8cf0b37de4731ad4bd77d256749030bd22b8b0e SHA512 41f8b34f9666740fbadffc4e47467670c7766f3b8612933a08cc6febe975f9453c21c393a43927c11ffe7ef6e0875ef09e125c80e84caa9f0917f864cb1d35e6 -AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 BLAKE2B 133785ebccfcdcebf8f3ada684786f0b55109e46332115238b12aff92404f587186e7c1a434d004ae43df434f8cfb283c4746d6bf91d1b00556b06ebfd4ceab7 SHA512 62a96d53b529c409d81094899c75cd7943176628e2b7301a005c6ebf9f660e813fbf1f3df213c43148d425e933208f761090b23b6ae75da93a93b13a1e924a34 -AUX elinks-0.13-ruby.patch 6679 BLAKE2B aac1923c2115743fd29d94e67af069857e03896d5e970297ba84c250f3eef54df24324975639de14a732e84897d21637397b85eb4346dc005d99a252943718cf SHA512 df93eb589fb6d30bdc4ffac8c44a5b1f4db7565d7221f9aa1edb07809cb5ada0797f6a2128bb5c0083134fa2b58ef62a157e7aad32751821f87e15f5760e34ac -AUX elinks-0.13.4-ruby-gcc10.patch 337 BLAKE2B 4b01f5cd0c311dca3dbc939157e9cb14b95da4a90782ce12ee4b524502852dade5a092c621c9bdc02f315721868237192028c85faceb13afb3d8633d6f1ccf29 SHA512 b40a69a53b48b957175dbab49566ecc73f1a9a77e7e4e1b824b4a5afcd08319842d6f530feeb2afa63e4854b7dd2e980933a481165c9d64289acf16d72f1bec9 -AUX elinks-9999-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248 -EBUILD elinks-9999.ebuild 3628 BLAKE2B 866971e83a11ee5e17252b33548d8e313f1ca2bedde3731b6bb709adbdbd2bfab19e49631ed03dd73ef6fdc2e8626e5b864542bfdca2d17aa327e75098659c42 SHA512 186a002fe4b44ba886a5fe81d8d1593c6dc434ea372c30c4683400eacaee7e079cc208d8b2f4f04249368fec86d2c8c5318f529bc4d795621e835e4b33eca7c8 -MISC metadata.xml 989 BLAKE2B 4b2f65d67e922e7e9cce74761cebca030866842af469ef4776d7cf2f8e685a52f9cbdfee25fb6a29546543e71127f48f93f78593745f6ab151e49250fe1b0259 SHA512 66a3bb8694de90a61d37a4fe5029afc894b12eba7ce7832159f88ca3168ee99c324179b27edf2876f94b4465e81cc218f5d271fff92a495bed11dd6b8ffad990 diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild deleted file mode 100644 index 0316d7b..0000000 --- a/www-client/elinks/elinks-9999.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit autotools git-r3 python-any-r1 - -EGIT_REPO_URI="https://github.com/rkd77/felinks" - -DESCRIPTION="Advanced and well-established text-mode web browser" -HOMEPAGE="http://elinks.or.cz/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls 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:17= ) - lua? ( >=dev-lang/lua-5:0= ) - perl? ( dev-lang/perl:= ) - ruby? ( dev-lang/ruby:* dev-ruby/rubygems:* ) - samba? ( net-fs/samba ) - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl: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 )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}"/${P}-parallel-make.patch -) - -src_unpack() { - default - git-r3_src_unpack -} - -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) - --with-luapkg=$(usev 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 - - 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/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 20db8a4..0000000 --- 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 dee09a6..0000000 --- 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 d41ab68..0000000 --- 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 -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 6c5679a..0000000 --- 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 1e07bcd..0000000 --- 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 ]], [[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 /* 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 ee2e5e8..0000000 --- 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 a716439..0000000 --- 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 ]], [[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 /* 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/files/elinks-0.13.4-ruby-gcc10.patch b/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch deleted file mode 100644 index 380dce5..0000000 --- a/www-client/elinks/files/elinks-0.13.4-ruby-gcc10.patch +++ /dev/null @@ -1,13 +0,0 @@ -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); diff --git a/www-client/elinks/files/elinks-9999-parallel-make.patch b/www-client/elinks/files/elinks-9999-parallel-make.patch deleted file mode 100644 index 86aea55..0000000 --- a/www-client/elinks/files/elinks-9999-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/metadata.xml b/www-client/elinks/metadata.xml deleted file mode 100644 index 8dfd572..0000000 --- a/www-client/elinks/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - felix.janda@posteo.de - Felix Janda - - - proxy-maint@gentoo.org - Proxy Maintainers - - - Enable support for the BitTorrent protocol - Enable support for brotli compression - Enable support for the finger protocol - Enable garbage collection support via dev-libs/boehm-gc - Enable support for the gopher protocol - Make elinks to grab all mouse events - Enable support for regex searches via dev-libs/tre - Enable support for bookmarks via dev-libs/expat - - -- 2.11.4.GIT