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 <wite...@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>
