www/elinks: update to 0.17.0

ChangeLog: https://raw.githubusercontent.com/rkd77/elinks/master/NEWS

ELinks 0.17.0
-------------

Released on 2023-12-25

* fix for some 32-bit systems and select-only builds
* fix for gettext in Windows builds

ELinks 0.17.0rc2
----------------

Released on 2023-12-10

* Avoid division by zero. Refs #276
* Fix for FSP under Windows

ELinks 0.17.0rc1
----------------

Released on 2023-12-02

* configuration files are now saved to ~/.config/elinks/ or $XDG_CONFIG_HOME/elinks/ #199
  User must copy files from ~/.elinks/ to ~/.config/elinks/ himself or herself
* HOME_ETC support was dropped, you can set ELINKS_CONFDIR instead
* idn2 in place of idn #206
* libcss support (a few netsurf's libraries are required). Set document.css.libcss = 1 to enable
* experimental libsixel support (image/*; img2sixel %s; copiousoutput) in ~/.mailcap
  Must be enabled in a few places in configuration: set document.plain.sixel = 1
  and in terminal options. Do not try it on metered remote connections
* testing libcurl support (explicit FTPS and SFTP among others)
  To enable set protocol.ftp.use_curl = 1
  set protocol.http.use_curl = 1 for http/https
* ui.sessions.postpone_unlink option. Delete temporary files at exit instead of immediately after
  closing viewer #257
* redefined isspace #249
* Serbian translation update
* compilation fixes

PR:		276090
Reported by:	jailbird@fdf.net (maintainer)

4 files changed, 65 insertions, 60 deletions

diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 82bf889d751f..224bfb88ca96 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	elinks
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.16.1.1
-PORTREVISION=	1
+DISTVERSION=	0.17.0
 CATEGORIES=	www
 
 MAINTAINER=	jailbird@fdf.net
@@ -20,9 +19,9 @@ GH_ACCOUNT=	rkd77
 LDFLAGS+=	-lexecinfo
 MESON_ARGS=	-Dgpm=false -Dperl=true
 
-OPTIONS_DEFINE=		256COLORS 88COLORS TRUECOLORS BITTORRENT BROTLI EXMODE \
-			FASTMEM FINGER FSP FTP GOPHER GUILE HIGHLIGHT \
-			IDN LOCAL_CGI LUA LZMA MOUSE NLS NNTP NOROOT \
+OPTIONS_DEFINE=		256COLORS 88COLORS TRUECOLORS BITTORRENT BROTLI CSS \
+			CURL EXMODE FASTMEM FINGER FSP FTP GOPHER GUILE \
+			HIGHLIGHT IDN LOCAL_CGI LUA LZMA MOUSE NLS NNTP NOROOT \
 			SMB SPIDERMONKEY TRE XBELMARKS ZSTD
 OPTIONS_DEFAULT=	256COLORS 88COLORS BROTLI EXMODE FASTMEM FTP \
 			HIGHLIGHT LZMA MOUSE
@@ -31,44 +30,40 @@ OPTIONS_SUB=		yes
 88COLORS_DESC=		88 color support
 256COLORS_DESC=		256 color support
 TRUECOLORS_DESC=	True color support
-SPIDERMONKEY_DESC=	ECMAScript support (via SpiderMonkey)
-XBELMARKS_DESC=		XBEL bookmarks (via expat)
-LOCAL_CGI_DESC=		Local CGI support
-FSP_DESC=		FSP protocol support (via fsplib)
+CSS_DESC=		Cascading Style Sheets support (via libcss & libdom)
 EXMODE_DESC=		Exmode (CLI) support
+FASTMEM_DESC=		Fast memory allocation functions
+FSP_DESC=		FSP protocol support (via fsplib)
 HIGHLIGHT_DESC=		HTML highlighting using DOM engine
+LOCAL_CGI_DESC=		Local CGI support
 NOROOT_DESC=		Prevention of usage by root
-FASTMEM_DESC=		Fast memory allocation functions
+SPIDERMONKEY_DESC=	ECMAScript support (via SpiderMonkey)
 TRE_DESC=		TRE regex search support
+XBELMARKS_DESC=		XBEL bookmarks (via expat)
 
-BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
-BROTLI_MESON_TRUE=	brotli
-
-NLS_USES=		gettext
-NLS_MESON_TRUE=		nls
-
-GUILE_USES=		guile:3.0
-GUILE_MESON_TRUE=	guile
+256COLORS_MESON_TRUE=	256-colors
 
-LUA_USES=		lua:52-53
-LUA_MESON_ON=		-Dluapkg=lua-${LUA_VER}
+88COLORS_MESON_TRUE=	88-colors
 
-LZMA_MESON_TRUE=	lzma
+TRUECOLORS_MESON_TRUE=	true-color
 
-FASTMEM_MESON_TRUE=	fastmem
+BITTORRENT_MESON_TRUE=	bittorrent
 
-IDN_LIB_DEPENDS=	libidn.so:dns/libidn
-IDN_USES=		localbase
-IDN_MESON_TRUE=		idn
+BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
+BROTLI_MESON_TRUE=	brotli
 
-NOROOT_MESON_TRUE=	no-root
+CSS_LIB_DEPENDS=	libcss.so:textproc/libcss \
+			libdom.so:www/libdom
+CSS_MESON_TRUE=		libcss
 
-HIGHLIGHT_MESON_TRUE=	html-highlight
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_MESON_TRUE=	libcurl
 
 EXMODE_MESON_TRUE=	exmode
 
-SMB_USES=		samba # smbclient
-SMB_MESON_TRUE=		smb
+FASTMEM_MESON_TRUE=	fastmem
+
+FINGER_MESON_TRUE=	finger
 
 FSP_RUN_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:net/fsplib
 FSP_BUILD_DEPENDS=	${LOCALBASE}/lib/libfsplib.a:net/fsplib
@@ -76,26 +71,35 @@ FSP_MESON_TRUE=		fsp
 
 FTP_MESON_TRUE=		ftp
 
-NNTP_MESON_TRUE=	nntp
-
-BITTORRENT_MESON_TRUE=	bittorrent
-
 GOPHER_MESON_TRUE=	gopher
 
-MOUSE_MESON_TRUE=	mouse
+GUILE_USES=		guile:3.0
+GUILE_MESON_TRUE=	guile
 
-FINGER_MESON_TRUE=	finger
+HIGHLIGHT_MESON_TRUE=	html-highlight
+
+IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
+IDN_USES=		localbase
+IDN_MESON_TRUE=		idn
 
 LOCAL_CGI_MESON_TRUE=	cgi
 
-XBELMARKS_LIB_DEPENDS=	libexpat.so:textproc/expat2
-XBELMARKS_MESON_TRUE=	xbel
+LUA_USES=		lua:52-53
+LUA_MESON_ON=		-Dluapkg=lua-${LUA_VER}
 
-256COLORS_MESON_TRUE=	256-colors
+LZMA_MESON_TRUE=	lzma
 
-88COLORS_MESON_TRUE=	88-colors
+MOUSE_MESON_TRUE=	mouse
 
-TRUECOLORS_MESON_TRUE=	true-color
+NLS_USES=		gettext
+NLS_MESON_TRUE=		nls
+
+NNTP_MESON_TRUE=	nntp
+
+NOROOT_MESON_TRUE=	no-root
+
+SMB_USES=		samba # smbclient
+SMB_MESON_TRUE=		smb
 
 SPIDERMONKEY_USES=		compiler:c++17-lang sqlite
 SPIDERMONKEY_BUILD_DEPENDS=	${LOCALBASE}/lib/libmozjs-102.so:lang/spidermonkey102 \
@@ -112,12 +116,14 @@ SPIDERMONKEY_MESON_ON=		-Dsm-scripting=true -Dspidermonkey=true
 TRE_LIB_DEPENDS=	libtre.so:textproc/libtre
 TRE_MESON_TRUE=		tre
 
+XBELMARKS_LIB_DEPENDS=	libexpat.so:textproc/expat2
+XBELMARKS_MESON_TRUE=	xbel
+
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_USES=		localbase
 ZSTD_MESON_TRUE=	zstd
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' ${WRKSRC}/meson.build
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/doc/tools/help2xml
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|g' ${WRKSRC}/doc/tools/asciidoc/asciidoc.py
 
diff --git a/www/elinks/distinfo b/www/elinks/distinfo
index af1733398ccd..5859cc0da016 100644
--- a/www/elinks/distinfo
+++ b/www/elinks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1682930820
-SHA256 (rkd77-elinks-v0.16.1.1_GH0.tar.gz) = d07e55ede144d532212b2b5b92fb81df4360ddd2b156ccaf09cfa4aa218e1aed
-SIZE (rkd77-elinks-v0.16.1.1_GH0.tar.gz) = 3940305
+TIMESTAMP = 1703503620
+SHA256 (rkd77-elinks-v0.17.0_GH0.tar.gz) = 250a55198bb3e16a49a52fde85ffc54f1e654b7615369467725a3d74bc469f22
+SIZE (rkd77-elinks-v0.17.0_GH0.tar.gz) = 4006073
diff --git a/www/elinks/files/patch-meson.build b/www/elinks/files/patch-meson.build
index 8ca2f7d08468..b85b42c91d52 100644
--- a/www/elinks/files/patch-meson.build
+++ b/www/elinks/files/patch-meson.build
@@ -1,6 +1,6 @@
---- meson.build.orig	2023-05-01 08:45:22 UTC
+--- meson.build.orig	2023-12-25 11:25:27 UTC
 +++ meson.build
-@@ -178,6 +178,10 @@ if compiler.has_header('fcntl.h')
+@@ -211,6 +211,10 @@ endif
      conf_data.set('HAVE_FCNTL_H', 1)
  endif
  
@@ -11,18 +11,17 @@
  if compiler.has_header('libgen.h')
      conf_data.set('HAVE_LIBGEN_H', 1)
  endif
-@@ -344,8 +348,8 @@ gnutlsdeps = []
- ssldeps = []
- 
+@@ -396,7 +400,8 @@ if conf_data.get('CONFIG_OPENSSL')
  if conf_data.get('CONFIG_OPENSSL')
--    ssldeps = dependency('openssl', static: st)
--    deps += ssldeps
-+    deps += compiler.find_library('crypto', dirs: '%%OPENSSLLIB%%')
-+    deps += compiler.find_library('ssl', dirs: '%%OPENSSLLIB%%')
+     ssldeps = dependency('openssl', static: st, required: false)
+     if not ssldeps.found()
+-        ssldeps = compiler.find_library('ssl', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib'])
++        ssldeps = compiler.find_library('crypto', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib'])
++        ssldeps += compiler.find_library('ssl', static: st, dirs: [get_option('prefix')+'/lib', '/usr/local/lib'])
+     endif
+     deps += ssldeps
      conf_data.set('USE_OPENSSL', true)
-     conf_data.set('CONFIG_GNUTLS', false)
- elif conf_data.get('CONFIG_GNUTLS')
-@@ -845,7 +849,7 @@ if compiler.has_function('iconv', prefix: '#include <i
+@@ -959,7 +964,7 @@ endif
      conf_data.set('HAVE_ICONV', 1)
  endif
  
@@ -31,7 +30,7 @@
      conf_data.set('HAVE_ALLOCA', 1)
  endif
  
-@@ -861,7 +865,7 @@ if compiler.has_function('gnutls_certificate_set_x509_
+@@ -975,7 +980,7 @@ endif
      conf_data.set('HAVE_GNUTLS_CERTIFICATE_SET_X509_SYSTEM_TRUST', 1)
  endif
  
diff --git a/www/elinks/files/patch-src_document_renderer.cpp b/www/elinks/files/patch-src_document_renderer.cpp
index 56bc49fb5991..4cedc6de6da2 100644
--- a/www/elinks/files/patch-src_document_renderer.cpp
+++ b/www/elinks/files/patch-src_document_renderer.cpp
@@ -1,6 +1,6 @@
---- src/document/renderer.cpp.orig	2022-12-25 18:17:02 UTC
-+++ src/document/renderer.cpp
-@@ -615,11 +615,11 @@ struct conv_table *
+--- src/document/renderer.c.orig	2023-12-27 03:03:28 UTC
++++ src/document/renderer.c
+@@ -415,11 +415,11 @@ struct conv_table *
  }
  
  struct conv_table *