vimb: Update to 3.5.0

Changes:
3.5.0
=====
Vimb 3.5.0 is out now with following changes.

Added
-----
* Add external download command #543 #348.
* Added ephemeral mode by new option `--incognito` #562.

Changed
-------
* Hinting shows the current focused elements URI in the statusbar.
* Show error if printing with `:hardcopy` fails #564.

Fixed
-----
* Fixed compilation if source is not in a git repo (Thanks to Patrick Steinhardt).
* Fixed partial hidden hint labels on top of screen.
* Fix segfault on open in new tabe from context menu #556.
* Fix "... (null)" shown in title during url sanitization.

Removed
-------
* Setting `private-browsing` was removed in favor of `--incognito` option.

Thanks to the contributors for their work!

5 files changed, 7 insertions, 110 deletions

diff --git a/www/vimb/Makefile b/www/vimb/Makefile
index 1abb9c54cb1..925636fc5d2 100644
--- a/www/vimb/Makefile
+++ b/www/vimb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2019/07/21 22:25:55 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/07/31 16:33:42 leot Exp $
 
-DISTNAME=	vimb-3.4.0
-PKGREVISION=	3
+DISTNAME=	vimb-3.5.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fanglingsu/}
 
diff --git a/www/vimb/distinfo b/www/vimb/distinfo
index 6e28959b8c6..8957e2e45b0 100644
--- a/www/vimb/distinfo
+++ b/www/vimb/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.5 2019/05/26 20:25:13 leot Exp $
+$NetBSD: distinfo,v 1.6 2019/07/31 16:33:42 leot Exp $
 
-SHA1 (vimb-3.4.0.tar.gz) = 6a179822fd5bb03a4597ffc7267ccd2e8357ad16
-RMD160 (vimb-3.4.0.tar.gz) = a339e8227bbace0004d10f6d36095079559da973
-SHA512 (vimb-3.4.0.tar.gz) = 80586c1ee5836b848a63cb4efd53c4a75fbeede0a3f6ee405b6e145063a17c32c3856af122b6a385cd2283519b86ad480fbf88c978ec0a32830c74d68c95a6ea
-Size (vimb-3.4.0.tar.gz) = 138452 bytes
-SHA1 (patch-Makefile) = 973017a0cc4b2a65535aaa40ae2eb63a4b020acf
-SHA1 (patch-src_main.c) = 127beefbe9cb853a7f2e1b7a0f19d4e87cbc9db3
-SHA1 (patch-src_util.c) = 8794f09aaf86cb2e19372f404e3c60fa1b045505
+SHA1 (vimb-3.5.0.tar.gz) = e988398a1d83744ef0c7021f5aa7084b55f4ca67
+RMD160 (vimb-3.5.0.tar.gz) = cfd03e29f1fef449deb8769aa45fce8bfa376e0b
+SHA512 (vimb-3.5.0.tar.gz) = e90373235b0d277a8232eff069faaa0c615d53dbfbfae3c3ba76af30cc5a3424c173c4bc5f56c0e5dd2d4e5dac349d6615d452a00ab2b2ee12c7c39ebe95c981
+Size (vimb-3.5.0.tar.gz) = 141269 bytes
diff --git a/www/vimb/patches/patch-Makefile b/www/vimb/patches/patch-Makefile
deleted file mode 100644
index 06f7bfa2bce..00000000000
--- a/www/vimb/patches/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2019/03/31 20:52:16 leot Exp $
-
-Backport upstream commit 0eda3ec2ac78577a08ace4c18cd9e912a56609e6
-to fix the build for vimb released versions.
-
---- Makefile.orig	2019-03-26 22:47:03.000000000 +0000
-+++ Makefile
-@@ -3,7 +3,7 @@ include config.mk
- 
- all: version.h src.subdir-all
- 
--version.h: Makefile .git/index
-+version.h: Makefile $(wildcard .git/index)
- 	@echo "create $@"
- 	$(Q)v="$$(git describe --tags 2>/dev/null)"; \
- 	echo "#define VERSION \"$${v:-$(version)}\"" > $@
diff --git a/www/vimb/patches/patch-src_main.c b/www/vimb/patches/patch-src_main.c
deleted file mode 100644
index 03d219571d0..00000000000
--- a/www/vimb/patches/patch-src_main.c
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-src_main.c,v 1.1 2019/05/26 20:25:13 leot Exp $
-
-Backport upstream commit 79c69ba194db0e4ddfb4ff985bc51c3b14ac8dd3.
-
-Fix segfault on open in new tabe from context menu #556.
-
---- src/main.c.orig	2019-03-26 22:47:03.000000000 +0000
-+++ src/main.c
-@@ -1347,17 +1347,22 @@ static void on_webview_load_changed(WebK
-         WebKitLoadEvent event, Client *c)
- {
-     GTlsCertificateFlags tlsflags;
-+    const char *raw_uri;
-     char *uri = NULL;
- 
-+    raw_uri = webkit_web_view_get_uri(webview);
-+    if (raw_uri) {
-+        uri = util_sanitize_uri(raw_uri);
-+    }
-+
-     switch (event) {
-         case WEBKIT_LOAD_STARTED:
- #ifdef FEATURE_AUTOCMD
--            autocmd_run(c, AU_LOAD_STARTED, webkit_web_view_get_uri(webview), NULL);
-+            autocmd_run(c, AU_LOAD_STARTED, raw_uri, NULL);
- #endif
-             /* update load progress in statusbar */
-             c->state.progress = 0;
-             vb_statusbar_update(c);
--            uri = util_sanitize_uri(webkit_web_view_get_uri(webview));
-             set_title(c, uri);
-             /* Make sure hinting is cleared before the new page is loaded.
-              * Without that vimb would still be in hinting mode after hinting
-@@ -1379,10 +1384,9 @@ static void on_webview_load_changed(WebK
-              * right place to remove the flag. */
-             c->mode->flags &= ~FLAG_IGNORE_FOCUS;
- #ifdef FEATURE_AUTOCMD
--            autocmd_run(c, AU_LOAD_COMMITTED, webkit_web_view_get_uri(webview), NULL);
-+            autocmd_run(c, AU_LOAD_COMMITTED, raw_uri, NULL);
- #endif
-             /* save the current URI in register % */
--            uri = util_sanitize_uri(webkit_web_view_get_uri(webview));
-             vb_register_add(c, '%', uri);
-             /* check if tls is on and the page is trusted */
-             if (g_str_has_prefix(uri, "https://")) {
-@@ -1405,9 +1409,8 @@ static void on_webview_load_changed(WebK
-             break;
- 
-         case WEBKIT_LOAD_FINISHED:
--            uri = util_sanitize_uri(webkit_web_view_get_uri(webview));
- #ifdef FEATURE_AUTOCMD
--            autocmd_run(c, AU_LOAD_FINISHED, webkit_web_view_get_uri(webview), NULL);
-+            autocmd_run(c, AU_LOAD_FINISHED, raw_uri, NULL);
- #endif
-             c->state.progress = 100;
-             if (strncmp(uri, "about:", 6)) {
diff --git a/www/vimb/patches/patch-src_util.c b/www/vimb/patches/patch-src_util.c
deleted file mode 100644
index 2d639caee6c..00000000000
--- a/www/vimb/patches/patch-src_util.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_util.c,v 1.1 2019/05/26 20:25:13 leot Exp $
-
-Backport upstream commit 79c69ba194db0e4ddfb4ff985bc51c3b14ac8dd3.
-
-Fix segfault on open in new tabe from context menu #556.
-
---- src/util.c.orig	2019-03-26 22:47:03.000000000 +0000
-+++ src/util.c
-@@ -821,7 +821,7 @@ char *util_sanitize_filename(char *filen
- /**
-  * Strips password from a uri.
-  *
-- * Return newly allocated string.
-+ * Return newly allocated string or NULL.
-  */
- char *util_sanitize_uri(const char *uri_str)
- {
-@@ -829,6 +829,9 @@ char *util_sanitize_uri(const char *uri_
-     char *sanitized_uri;
-     char *for_display;
- 
-+    if (!uri_str) {
-+        return NULL;
-+    }
- #if WEBKIT_CHECK_VERSION(2, 24, 0)
-     for_display = webkit_uri_for_display(uri_str);
- #else