netsurf: Update to 3.10

pkgsrc changes:
 - Remove patch-netsurf_content_handlers_html_html__interaction.c,
   patch-netsurf_utils_config.h, patch-netsurf_frontends_gtk_download.c: all
   present upstream now

Changes:
NetSurf 3.10 features many fixes, better performance and improved
functionality. In particular, handling of authentication, certificates
and fetch errors have been updated and unified. The GTK front end has
had a major overhaul too.

6 files changed, 13 insertions, 98 deletions

diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index f5df1d52c8f..1cae8029b25 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2020/05/22 10:56:45 adam Exp $
+# $NetBSD: Makefile,v 1.91 2020/05/25 17:48:36 leot Exp $
 
-DISTNAME=	netsurf-all-3.9
+DISTNAME=	netsurf-all-3.10
 PKGNAME=	${DISTNAME:S/-all//}
-PKGREVISION=	9
 CATEGORIES=	www
 MASTER_SITES=	https://download.netsurf-browser.org/netsurf/releases/source-full/
 
@@ -18,13 +17,13 @@ BUILD_DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 BUILD_TARGET=	build
 USE_TOOLS+=	bison flex gmake perl:build pax pkg-config
 
-MAKE_FLAGS+=	NETSURF_GTK_MAJOR=3
+MAKE_FLAGS+=	TARGET=gtk3
 
 SUBST_CLASSES+=			ssl-certs
 SUBST_STAGE.ssl-certs=		pre-configure
 SUBST_MESSAGE.ssl-certs=	Fixing hardcoded paths for SSL certs
 SUBST_FILES.ssl-certs=		netsurf/frontends/beos/gui.cpp
-SUBST_FILES.ssl-certs+=		netsurf/frontends/gtk/gui.c
+SUBST_FILES.ssl-certs+=		netsurf/test/data/Choices
 SUBST_FILES.ssl-certs+=		netsurf/test/data/Choices-all
 SUBST_FILES.ssl-certs+=		netsurf/test/data/Choices-full
 SUBST_FILES.ssl-certs+=		netsurf/test/data/Choices-short
diff --git a/www/netsurf/PLIST b/www/netsurf/PLIST
index c102928b0d7..5a01b357241 100644
--- a/www/netsurf/PLIST
+++ b/www/netsurf/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2019/09/12 18:41:41 nia Exp $
+@comment $NetBSD: PLIST,v 1.9 2020/05/25 17:48:36 leot Exp $
 bin/netsurf-gtk3
 share/applications/netsurf-gtk.desktop
 share/netsurf/Messages
 share/netsurf/SearchEngines
 share/netsurf/adblock.css
-share/netsurf/arrow_down_8x32.png
 share/netsurf/ca-bundle.txt
 share/netsurf/cookies.gtk3.ui
 share/netsurf/credits.html
@@ -16,7 +15,6 @@ share/netsurf/downloads.gtk3.ui
 share/netsurf/en/Messages
 share/netsurf/en/credits.html
 share/netsurf/en/licence.html
-share/netsurf/en/maps.html
 share/netsurf/en/welcome.html
 share/netsurf/favicon.png
 share/netsurf/fr/Messages
@@ -28,7 +26,9 @@ share/netsurf/icons/directory.png
 share/netsurf/icons/directory2.png
 share/netsurf/icons/hotlist-add.png
 share/netsurf/icons/hotlist-rmv.png
+share/netsurf/icons/local-history.png
 share/netsurf/icons/search.png
+share/netsurf/icons/show-cookie.png
 share/netsurf/internal.css
 share/netsurf/it/Messages
 share/netsurf/it/credits.html
@@ -38,8 +38,6 @@ share/netsurf/ja/welcome.html
 share/netsurf/languages
 share/netsurf/licence.html
 share/netsurf/localhistory.gtk3.ui
-share/netsurf/login.gtk3.ui
-share/netsurf/maps.html
 share/netsurf/netsurf-16x16.xpm
 share/netsurf/netsurf.gtk3.ui
 share/netsurf/netsurf.png
@@ -49,9 +47,9 @@ share/netsurf/nl/credits.html
 share/netsurf/nl/licence.html
 share/netsurf/nl/welcome.html
 share/netsurf/options.gtk3.ui
+share/netsurf/pageinfo.gtk3.ui
 share/netsurf/password.gtk3.ui
 share/netsurf/quirks.css
-share/netsurf/ssl.gtk3.ui
 share/netsurf/tabcontents.gtk3.ui
 share/netsurf/throbber/throbber0.png
 share/netsurf/throbber/throbber1.png
diff --git a/www/netsurf/distinfo b/www/netsurf/distinfo
index 3b71aca7d02..141ed11fba3 100644
--- a/www/netsurf/distinfo
+++ b/www/netsurf/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.18 2019/12/16 18:01:10 nros Exp $
+$NetBSD: distinfo,v 1.19 2020/05/25 17:48:36 leot Exp $
 
-SHA1 (netsurf-all-3.9.tar.gz) = 392aa7cf94b303228a00e6887c74e5763a81f3a4
-RMD160 (netsurf-all-3.9.tar.gz) = 3f7aff04cfd253f2b18590830b0aa2fca0123b3c
-SHA512 (netsurf-all-3.9.tar.gz) = 3223b0a3bc9721ea1a5a81bbabdda11e1d0f63850074a5dea3ea8999e53c92f07228f58befbf10359c028965131426888a8b9595d6c3cd7a5cde33ca256cf987
-Size (netsurf-all-3.9.tar.gz) = 8416458 bytes
-SHA1 (patch-netsurf_content_handlers_html_html__interaction.c) = 5dbfbaf26ba8ee32077af5aae0db2ee54cf59eb8
-SHA1 (patch-netsurf_frontends_gtk_download.c) = 8a449c0b46859be104f2eb87860960f84ebd38ad
-SHA1 (patch-netsurf_utils_config.h) = 0617eb62219eb9d9a570a9857e910c584b68a18b
+SHA1 (netsurf-all-3.10.tar.gz) = d1404abcc8ba526dc425d8fda81a5a495082de19
+RMD160 (netsurf-all-3.10.tar.gz) = 2ba50fcb148d1b229e48b80f2a2c24daf2948783
+SHA512 (netsurf-all-3.10.tar.gz) = fc4c300eef07c540a7e07f8034db25b7e5fb731b5956029af2220f8638802aa38c055ad54b5683c14501aef9c22fb781b96613c16ae9a6996c3833ceede6f9bf
+Size (netsurf-all-3.10.tar.gz) = 8537919 bytes
 SHA1 (patch-nsgenbind_src_Makefile) = 9024fe193c532fefec83b86a8cf85f1bcffb614e
diff --git a/www/netsurf/patches/patch-netsurf_content_handlers_html_html__interaction.c b/www/netsurf/patches/patch-netsurf_content_handlers_html_html__interaction.c
deleted file mode 100644
index df5c65a7b56..00000000000
--- a/www/netsurf/patches/patch-netsurf_content_handlers_html_html__interaction.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-netsurf_content_handlers_html_html__interaction.c,v 1.1 2019/11/11 12:58:53 nros Exp $
-* fix crash when an entire document has visability: hidden
-  from upstream:
-http://source.netsurf-browser.org/netsurf.git/commit/content/handlers/html/html_interaction.c?id=acee5faa3f03a229a6d7d14e042441a6af048faf
---- netsurf/content/handlers/html/html_interaction.c.orig	2019-11-11 12:34:12.647371538 +0000
-+++ netsurf/content/handlers/html/html_interaction.c
-@@ -382,7 +382,7 @@ void html_mouse_action(struct content *c
- 	int padding_left, padding_right, padding_top, padding_bottom;
- 	browser_drag_type drag_type = browser_window_get_drag_type(bw);
- 	union content_msg_data msg_data;
--	struct dom_node *node = NULL;
-+	struct dom_node *node = html->layout->node; /* Default to the <HTML> */
- 	union html_drag_owner drag_owner;
- 	union html_selection_owner sel_owner;
- 	bool click = mouse & (BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_PRESS_2 |
diff --git a/www/netsurf/patches/patch-netsurf_frontends_gtk_download.c b/www/netsurf/patches/patch-netsurf_frontends_gtk_download.c
deleted file mode 100644
index 4f869d67422..00000000000
--- a/www/netsurf/patches/patch-netsurf_frontends_gtk_download.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-netsurf_frontends_gtk_download.c,v 1.2 2019/11/11 10:33:30 nros Exp $
-* fix crash when downloading files (nullpointer dereference)
-* fixed upstream
-  http://source.netsurf-browser.org/netsurf.git/commit/frontends/gtk/download.c?id=1f0dc9dd6e014e0e5d4093fef53c41cd09854897
---- netsurf/frontends/gtk/download.c.orig	2019-07-17 15:37:00.000000000 +0000
-+++ netsurf/frontends/gtk/download.c
-@@ -89,6 +89,8 @@ struct gui_download_window {
- 	GError *error;
- };
- 
-+bool nsgtk_download_FALSE = FALSE;
-+
- typedef	void (*nsgtk_download_selection_action)(
- 		struct gui_download_window *dl,
- 		void *user_data);
-@@ -838,7 +840,7 @@ gui_download_window_create(download_cont
- 		g_timeout_add(
- 			UPDATE_RATE,
- 			nsgtk_download_gsourcefunc__nsgtk_download_update,
--			FALSE);
-+			(gpointer) &nsgtk_download_FALSE);
- 	}
- 
- 	nsgtk_downloads_list = g_list_prepend(nsgtk_downloads_list, download);
diff --git a/www/netsurf/patches/patch-netsurf_utils_config.h b/www/netsurf/patches/patch-netsurf_utils_config.h
deleted file mode 100644
index 1e604f0a484..00000000000
--- a/www/netsurf/patches/patch-netsurf_utils_config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-netsurf_utils_config.h,v 1.4 2019/12/16 18:01:10 nros Exp $
-
-NetBSD has strcasestr(3)
-NetBSD 8 and later has strchrnul(3).
-Fixed upstream: https://bugs.netsurf-browser.org/mantis/view.php?id=2718
-
---- netsurf/utils/config.h.orig	2019-07-17 15:37:00.000000000 +0000
-+++ netsurf/utils/config.h
-@@ -21,6 +21,13 @@
- 
- #include <stddef.h>
- 
-+#if defined(__NetBSD__)
-+#include <sys/param.h>
-+#if (defined(__NetBSD_Version__) && __NetBSD_Prereq__(8,0,0))
-+#define NetBSD_v8
-+#endif
-+#endif
-+
- /* Try to detect which features the target OS supports */
- 
- #if (defined(_GNU_SOURCE) && !defined(__APPLE__) || defined(__amigaos4__) || defined(__HAIKU__) || (defined(_POSIX_C_SOURCE) && ((_POSIX_C_SOURCE - 0) >= 200809L)) && !defined(__riscos__))
-@@ -30,7 +37,7 @@
- char *strndup(const char *s, size_t n);
- #endif
- 
--#if (defined(_GNU_SOURCE) || defined(__APPLE__) || defined(__HAIKU__) || defined(__OpenBSD__))
-+#if (defined(_GNU_SOURCE) || defined(__APPLE__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__OpenBSD__))
- #define HAVE_STRCASESTR
- #else
- #undef HAVE_STRCASESTR
-@@ -51,7 +58,7 @@ char *strcasestr(const char *haystack, c
- /* For some reason, UnixLib defines this unconditionally. Assume we're using
-  *  UnixLib if building for RISC OS.
-  */
--#if ((defined(_GNU_SOURCE) && !defined(__APPLE__)) || defined(__riscos__))
-+#if ((defined(_GNU_SOURCE) && !defined(__APPLE__)) || defined(__riscos__) || defined(NetBSD_v8))
- #define HAVE_STRCHRNUL
- #else
- #undef HAVE_STRCHRNUL