midori: Update www/midori to 7.0

Changes:
7.0
---
 Fixed YouTube rendering issue due to custom user agent
 Fixed invisible cursor in text fields
 Restored behavior of " " and "." in urlbar completion
 Download/ web notifications for background window/ tab
 Highlight in toolbar for finished downloads
 Re-introduced proxy server UX
 Multiple processes for indivdual tabs
 Adaptive toolbar layout for smaller screens

6.0
---
 Revamped Vala-only core based on GTK+3 and WebKit2
 App based on Gtk.Application, supporting global/ window app menu
 Tabs on top with a custom stack switcher and Gtk.Stack
 Url completion with GLib.ListModel and Gtk.ListBox
 Peas-based extensions, also available in Private Browsing
 New fullscreen mode with auto-revealing toolbar

Based on www/midori and updated in pkgsrc-wip by <bsiegert> and <leot>.

16 files changed, 39 insertions, 613 deletions

diff --git a/www/midori/DESCR b/www/midori/DESCR
index 90aebe5a451..f7e2bc07e02 100644
--- a/www/midori/DESCR
+++ b/www/midori/DESCR
@@ -1,7 +1,7 @@
 Midori is a lightweight web browser.
 
 Features
-	Full integration with GTK+ 2
+	Full integration with GTK+ 3
 	Fast rendering with WebKit
 	Tabs, windows and session management
 	Bookmarks with XBEL and token support
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 09ac32e1f01..61ccd83f86c 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,66 +1,37 @@
-# $NetBSD: Makefile,v 1.114 2018/12/09 18:52:49 adam Exp $
+# $NetBSD: Makefile,v 1.115 2018/12/11 12:40:18 bsiegert Exp $
 
-DISTNAME=	midori_0.5.11_all_
-PKGNAME=	${DISTNAME:S/_all_//:S/_/-/}
-PKGREVISION=	29
+DISTNAME=	midori-v7.0
+PKGNAME=	${DISTNAME:S/v//}
 CATEGORIES=	www
-MASTER_SITES=	http://midori-browser.org/downloads/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=midori-browser/}
+GITHUB_PROJECT=	core
+GITHUB_RELEASE=	v7
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://midori-browser.org/
 COMMENT=	Lightweight web browser using WebKit
 LICENSE=	gnu-lgpl-v2.1
-EXTRACT_SUFX=	.tar.bz2
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-
-HAS_CONFIGURE=	yes
 USE_CMAKE=	yes
-USE_TOOLS+=	gmake intltool msgfmt pkg-config
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--disable-zeitgeist
-CMAKE_ARGS+=		-DUSE_ZEITGEIST=OFF
-CMAKE_ARGS+=		-DPREFIX=${PREFIX}
-
-CHECK_PORTABILITY_SKIP+=	win32/old/x86-mingw32-opensuse/install.sh
-CHECK_PORTABILITY_SKIP+=	win32/makedist/makedist.midori
-
-BUILD_DEPENDS+=		librsvg>=2.18:../../graphics/librsvg
-
-DEPENDS+=		gnome-themes-standard-[0-9]*:../../graphics/gnome-themes-standard
-
-EGDIR=			${PREFIX}/share/examples/midori
-OWN_DIRS=		${PKG_SYSCONFDIR}/xdg/midori
-CONF_FILES=		${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
-
-# Otherwise build chokes on .orig files
-pre-configure:
-	${FIND} ${WRKSRC} -name "*.orig*" -exec ${RM} -f {} \;
-
-.include "../../mk/bsd.prefs.mk"
-
-OWN_DIRS+=	${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock
-CONF_FILES+=	${EGDIR}/extensions/adblock/config \
-		${PKG_SYSCONFDIR}/xdg/midori/extensions/adblock/config
-
-CONFIGURE_ENV=	VALAC=${VALAC}
+USE_TOOLS+=	intltool msgfmt pkg-config
 
-NOT_PAX_MPROTECT_SAFE+=	bin/midori
+BUILDLINK_TRANSFORM+=	rm:-Werror
 
-.include "options.mk"
+CONFIGURE_ENV+=	VALAC=${VALAC}
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/libpeas/buildlink3.mk"
+.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
-#.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
 BUILDLINK_DEPMETHOD.vala= build
 .include "../../lang/vala/buildlink3.mk"
+.include "../../security/gcr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/midori/PLIST b/www/midori/PLIST
index 3fd12c9adc1..9a38fbab76b 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,66 +1,35 @@
-@comment $NetBSD: PLIST,v 1.27 2015/10/25 13:50:22 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.28 2018/12/11 12:40:18 bsiegert Exp $
 bin/midori
+lib/girepository-1.0/Midori-0.6.typelib
 lib/libmidori-core.so
-lib/libmidori-core.so.0.0.0
-lib/libmidori-core.so.1
-lib/midori/libabout.so
+lib/libmidori-core.so.0
+lib/libmidori-core.so.0.6
+lib/midori/adblock.plugin
+lib/midori/bookmarks.plugin
+lib/midori/colorful-tabs.plugin
+lib/midori/libactivatable.so
 lib/midori/libadblock.so
-lib/midori/libaddons.so
-lib/midori/libapps.so
+lib/midori/libbookmarks.so
 lib/midori/libcolorful-tabs.so
-lib/midori/libcookie-manager.so
-lib/midori/libcookie-permissions.so
-lib/midori/libcopy-tabs.so
-lib/midori/libdelayed-load.so
-lib/midori/libdevpet.so
-lib/midori/libdomain-keys.so
-lib/midori/libexternal-download-manager.so
-lib/midori/libfeed-panel.so
-lib/midori/libflummi.so
-lib/midori/libformhistory.so
-lib/midori/libhistory-list.so
-lib/midori/libmouse-gestures.so
-lib/midori/libnojs.so
-lib/midori/libnotes.so
-lib/midori/libnsplugin-manager.so
-lib/midori/libopen-with.so
-lib/midori/libshortcuts.so
+lib/midori/libsession.so
 lib/midori/libstatus-clock.so
 lib/midori/libstatusbar-features.so
-lib/midori/libtab-panel.so
-lib/midori/libtabby.so
-lib/midori/libtabs-minimized.so
-lib/midori/libtoolbar-editor.so
-lib/midori/libtransfers.so
-lib/midori/libwebmedia-now-playing.so
+lib/midori/session.plugin
+lib/midori/status-clock.plugin
+lib/midori/statusbar-features.plugin
 share/appdata/midori.appdata.xml
-share/applications/midori-private.desktop
-share/applications/midori.desktop
-share/doc/midori/AUTHORS
+share/applications/org.midori_browser.Midori.desktop
 share/doc/midori/COPYING
-share/doc/midori/ChangeLog
-share/doc/midori/EXPAT
-share/doc/midori/README
-share/doc/midori/faq.css
-share/doc/midori/faq.html
-share/examples/midori/extensions/adblock/config
-share/examples/midori/search
+share/doc/midori/README.md
+share/gir-1.0/Midori-0.6.gir
 share/icons/hicolor/16x16/apps/midori.png
-share/icons/hicolor/16x16/categories/extension.png
-share/icons/hicolor/16x16/status/internet-news-reader.png
 share/icons/hicolor/22x22/apps/midori.png
-share/icons/hicolor/22x22/categories/extension.png
-share/icons/hicolor/22x22/status/internet-news-reader.png
-share/icons/hicolor/24x24/status/adblock-blocked.svg
-share/icons/hicolor/24x24/status/adblock-disabled.svg
-share/icons/hicolor/24x24/status/adblock-enabled.svg
 share/icons/hicolor/scalable/apps/midori.svg
-share/icons/hicolor/scalable/categories/extension.svg
-share/icons/hicolor/scalable/status/internet-news-reader.svg
 share/locale/af/LC_MESSAGES/midori.mo
 share/locale/am/LC_MESSAGES/midori.mo
 share/locale/ar/LC_MESSAGES/midori.mo
 share/locale/ast/LC_MESSAGES/midori.mo
+share/locale/az/LC_MESSAGES/midori.mo
 share/locale/be/LC_MESSAGES/midori.mo
 share/locale/bg/LC_MESSAGES/midori.mo
 share/locale/bn/LC_MESSAGES/midori.mo
@@ -120,9 +89,11 @@ share/locale/sq/LC_MESSAGES/midori.mo
 share/locale/sr/LC_MESSAGES/midori.mo
 share/locale/sr@latin/LC_MESSAGES/midori.mo
 share/locale/sv/LC_MESSAGES/midori.mo
+share/locale/szl/LC_MESSAGES/midori.mo
 share/locale/ta/LC_MESSAGES/midori.mo
 share/locale/te/LC_MESSAGES/midori.mo
 share/locale/th/LC_MESSAGES/midori.mo
+share/locale/tl/LC_MESSAGES/midori.mo
 share/locale/tr/LC_MESSAGES/midori.mo
 share/locale/ug/LC_MESSAGES/midori.mo
 share/locale/uk/LC_MESSAGES/midori.mo
@@ -132,24 +103,3 @@ share/locale/vi/LC_MESSAGES/midori.mo
 share/locale/zh_CN/LC_MESSAGES/midori.mo
 share/locale/zh_HK/LC_MESSAGES/midori.mo
 share/locale/zh_TW/LC_MESSAGES/midori.mo
-share/midori/res/about.css
-share/midori/res/adblock.list
-share/midori/res/adblock/element_hider.js
-share/midori/res/autosuggestcontrol.css
-share/midori/res/autosuggestcontrol.js
-share/midori/res/bookmarks/Create.sql
-share/midori/res/bookmarks/Import_old_db_bookmarks.sql
-share/midori/res/error.html
-share/midori/res/flummi/Create.sql
-share/midori/res/forms/Create.sql
-share/midori/res/gtk3.css
-share/midori/res/history/Create.sql
-share/midori/res/history/Day.sql
-share/midori/res/logo-shade.png
-share/midori/res/nojs/nojs-statusicon-allowed.png
-share/midori/res/nojs/nojs-statusicon-denied.png
-share/midori/res/nojs/nojs-statusicon-mixed.png
-share/midori/res/notes/Create.sql
-share/midori/res/speeddial-head.html
-share/midori/res/tabby/Create.sql
-share/midori/res/tabby/Update1.sql
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 79dee1c25e2..e8d082ccbba 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,17 +1,6 @@
-$NetBSD: distinfo,v 1.26 2018/11/09 09:17:07 abs Exp $
+$NetBSD: distinfo,v 1.27 2018/12/11 12:40:18 bsiegert Exp $
 
-SHA1 (midori_0.5.11_all_.tar.bz2) = 64c86935028feb5f89d799c2acacaad67764da6f
-RMD160 (midori_0.5.11_all_.tar.bz2) = 66aaf624d39fbb86c1bec42972fba7998965ef50
-SHA512 (midori_0.5.11_all_.tar.bz2) = 237310d1f0bf70796474b9ec5be6755927e66acd2b527d04db39696c5e2f7ea2d11f7deb51ba3f5c151a450ab71e642282a1386e34253aaea1d8602ce76ac87d
-Size (midori_0.5.11_all_.tar.bz2) = 1428791 bytes
-SHA1 (patch-CMakeLists.txt) = 68d0232b254e4094118b7f029162bf669f096d45
-SHA1 (patch-config_CMakeLists.txt) = 5ac4af9f980749659058fb55e7fd25ad6226861f
-SHA1 (patch-extensions_adblock_widgets.vala) = 076a3e9bcc33b20bde4df0ae5f89efd950260087
-SHA1 (patch-extensions_apps.vala) = 77b4e5ed86809446b2d63cbf248fd5a9dddd159f
-SHA1 (patch-extensions_external-download-manager.vala) = 3ccd1a11828849ddc2e6007f52b3549bdb34418f
-SHA1 (patch-extensions_history-list.vala) = e17c5b8ff0bbbaec41b64c813138b564cf555b56
-SHA1 (patch-extensions_notes.vala) = 7869734d57377b713b4e78029fc2d12f3d6e7ab5
-SHA1 (patch-extensions_open-with.vala) = bb07507b64b73ae7c68aedb7e1f704ba00c323d2
-SHA1 (patch-extensions_transfers.vala) = bea6a7789cbda64f8a950360e87b2a256e70d83d
-SHA1 (patch-katze_midori-paths.vala) = f304804f39fc47d5c5591c9712a4b98ace3e1b26
-SHA1 (patch-midori_midori-notebook.vala) = c117d382af224af05241daaa7ccf991e702098a0
+SHA1 (midori-v7.0.tar.gz) = 802ceb76483bf6b9d1dfe94561fb42568e398200
+RMD160 (midori-v7.0.tar.gz) = c9b2bb0734db3ddabd5d5f71ab610e4b788804cf
+SHA512 (midori-v7.0.tar.gz) = 4110d1566ba8b0979c29f1c3a95af3da4cba884f44a1305403d8951f7f2dfb17946c3c7326eebafc111738950c907d06cc6c54ce670cde321da890d8b9ced051
+Size (midori-v7.0.tar.gz) = 1827341 bytes
diff --git a/www/midori/options.mk b/www/midori/options.mk
deleted file mode 100644
index b59055320d0..00000000000
--- a/www/midori/options.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2017/04/22 07:16:19 maya Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.midori
-
-PKG_OPTIONS_REQUIRED_GROUPS=	gtk
-PKG_OPTIONS_GROUP.gtk=		gtk2 gtk3
-
-PKG_SUGGESTED_OPTIONS=		gtk2
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgtk2)
-.include "../../www/webkit24-gtk/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtk3)
-CONFIGURE_ARGS+=	--enable-gtk3
-CMAKE_ARGS+=		-DUSE_GTK3=1
-.include "../../www/webkit24-gtk3/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.endif
diff --git a/www/midori/patches/patch-CMakeLists.txt b/www/midori/patches/patch-CMakeLists.txt
deleted file mode 100644
index 2304a02b6db..00000000000
--- a/www/midori/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/10/25 13:50:22 jmcneill Exp $
-
---- CMakeLists.txt.orig	2015-08-30 11:56:26.000000000 +0000
-+++ CMakeLists.txt
-@@ -149,6 +149,7 @@ option(USE_GRANITE "Fancy notebook and p
- option(USE_APIDOCS "API documentation" OFF)
- option(USE_GIR "Generate GObject Introspection bindings" OFF)
- option(EXTRA_WARNINGS "Additional compiler warnings" OFF)
-+option(USE_GCR "Use GCR library" OFF)
- 
- # GTK+3 is implied here, whether set or not
- if (USE_GRANITE OR HALF_BRO_INCOM_WEBKIT2)
-@@ -175,18 +176,22 @@ if (USE_ZEITGEIST)
-     set(PKGS ${PKGS} zeitgeist-2.0)
- endif()
- 
--if (WIN32)
--    add_definitions("-DGCR_VERSION=\"No\"")
--else ()
--    if (USE_GTK3)
--        pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
-+if (USE_GCR)
-+    if (WIN32)
-+        add_definitions("-DGCR_VERSION=\"No\"")
-     else ()
--        pkg_check_modules(GCR REQUIRED gcr-base-3>=2.32)
-+        if (USE_GTK3)
-+            pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
-+        else ()
-+            pkg_check_modules(GCR REQUIRED gcr-base-3>=2.32)
-+        endif ()
-+        add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"")
-+        add_definitions("-DHAVE_GCR")
-+        set(OPTS_INCLUDE_DIRS ${OPTS_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS})
-+        set(OPTS_LIBRARIES ${OPTS_LIBRARIES} ${GCR_LIBRARIES})
-     endif ()
--    add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"")
--    add_definitions("-DHAVE_GCR")
--    set(OPTS_INCLUDE_DIRS ${OPTS_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS})
--    set(OPTS_LIBRARIES ${OPTS_LIBRARIES} ${GCR_LIBRARIES})
-+else ()
-+    add_definitions("-DGCR_VERSION=\"No\"")
- endif ()
- 
- if (HALF_BRO_INCOM_WEBKIT2)
diff --git a/www/midori/patches/patch-config_CMakeLists.txt b/www/midori/patches/patch-config_CMakeLists.txt
deleted file mode 100644
index 90dad686482..00000000000
--- a/www/midori/patches/patch-config_CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-config_CMakeLists.txt,v 1.1 2014/12/02 10:07:24 snj Exp $
-
-Put config files to examples dir.
-
---- config/CMakeLists.txt.orig	2014-11-10 15:30:22.000000000 -0800
-+++ config/CMakeLists.txt	2014-12-01 23:04:42.000000000 -0800
-@@ -10,14 +10,5 @@ if (${CMAKE_INSTALL_PREFIX} STREQUAL "/u
-     set(CMAKE_INSTALL_SYSCONFDIR "/etc")
- endif()
- 
--foreach (FILE ${CONFIG_FILES})
--    string (FIND ${FILE} "adblock" ADBLOCK_CONF)
--    if (ADBLOCK_CONF GREATER -1)
--        string (REPLACE "config" "" dirname ${FILE})
--        install (FILES ${FILE}
--            DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/${XDG_CONFIG_DIR}/${dirname}")
--    else ()
--        install (FILES ${FILE}
--            DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/${XDG_CONFIG_DIR}")
--    endif ()
--endforeach ()
-+install (FILES "search" DESTINATION "${PREFIX}/share/examples/midori")
-+install (FILES "extensions/adblock/config" DESTINATION "${PREFIX}/share/examples/midori/extensions/adblock")
diff --git a/www/midori/patches/patch-extensions_adblock_widgets.vala b/www/midori/patches/patch-extensions_adblock_widgets.vala
deleted file mode 100644
index 26405ffd4d4..00000000000
--- a/www/midori/patches/patch-extensions_adblock_widgets.vala
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-extensions_adblock_widgets.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
-
-Update to build against vala-0.42.0
-
---- extensions/adblock/widgets.vala.orig	2015-08-30 11:56:26.000000000 +0000
-+++ extensions/adblock/widgets.vala
-@@ -27,7 +27,7 @@ namespace Adblock {
-             this.debug_element_toggled = false;
- 
-             var item = new Midori.ContextAction ("Preferences",
--                _("Preferences"), null, Gtk.STOCK_PREFERENCES);
-+                _("Preferences"), null, Gtk.Stock.PREFERENCES);
-             item.activate.connect (() => {
-                 manager.add_subscription (null);
-             });
-@@ -99,12 +99,12 @@ namespace Adblock {
-                 Gtk.DialogFlags.NO_SEPARATOR |
- #endif
-                 Gtk.DialogFlags.DESTROY_WITH_PARENT,
--                Gtk.STOCK_HELP, Gtk.ResponseType.HELP,
--                Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE);
-+                Gtk.Stock.HELP, Gtk.ResponseType.HELP,
-+                Gtk.Stock.CLOSE, Gtk.ResponseType.CLOSE);
- #if HAVE_GTK3
-             dialog.get_widget_for_response (Gtk.ResponseType.HELP).get_style_context ().add_class ("help_button");
- #endif
--            dialog.set_icon_name (Gtk.STOCK_PROPERTIES);
-+            dialog.set_icon_name (Gtk.Stock.PROPERTIES);
-             dialog.set_response_sensitive (Gtk.ResponseType.HELP, false);
- 
-             var hbox = new Gtk.HBox (false, 0);
-@@ -211,7 +211,7 @@ namespace Adblock {
-             Subscription sub;
-             liststore.get (iter, 0, out sub);
- 
--            renderer.set ("stock-id", sub.mutable ? Gtk.STOCK_DELETE : null,
-+            renderer.set ("stock-id", sub.mutable ? Gtk.Stock.DELETE : null,
-                           "stock-size", Gtk.IconSize.MENU);
-         }
- 
-@@ -227,7 +227,7 @@ namespace Adblock {
-                             liststore.get (iter, 0, out sub);
-                             if (sub.mutable) {
-                                 config.remove (sub);
--                                liststore.remove (iter);
-+                                liststore.remove (ref iter);
-                                 return true;
-                             }
-                         }
-@@ -258,9 +258,9 @@ namespace Adblock {
-                 Gtk.DialogFlags.NO_SEPARATOR |
- #endif
-                 Gtk.DialogFlags.DESTROY_WITH_PARENT,
--                Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
--                Gtk.STOCK_ADD, Gtk.ResponseType.ACCEPT);
--            dialog.set_icon_name (Gtk.STOCK_ADD);
-+                Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-+                Gtk.Stock.ADD, Gtk.ResponseType.ACCEPT);
-+            dialog.set_icon_name (Gtk.Stock.ADD);
-             dialog.resizable = false;
- 
-             var hbox = new Gtk.HBox (false, 8);
diff --git a/www/midori/patches/patch-extensions_apps.vala b/www/midori/patches/patch-extensions_apps.vala
deleted file mode 100644
index 66d30894fae..00000000000
--- a/www/midori/patches/patch-extensions_apps.vala
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-extensions_apps.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
-
-Update to build against vala-0.42.0
-
---- extensions/apps.vala.orig	2015-08-30 11:56:26.000000000 +0000
-+++ extensions/apps.vala
-@@ -98,7 +98,7 @@ namespace Apps {
-         }
- 
-         internal static async File create_profile (Gtk.Widget? proxy) {
--            string uuid = g_dbus_generate_guid ();
-+            string uuid = DBus.generate_guid ();
-             string config = Path.build_path (Path.DIR_SEPARATOR_S,
-                 Midori.Paths.get_user_data_dir (), PACKAGE_NAME, "profiles", uuid);
-             var folder = get_profile_folder ();
-@@ -207,7 +207,7 @@ namespace Apps {
- 
- #if !HAVE_WIN32
-                 /* FIXME: Profiles are broken on win32 because of no multi instance support */
--                var profile = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
-+                var profile = new Gtk.ToolButton.from_stock (Gtk.Stock.ADD);
-                 profile.label = _("New _Profile");
-                 profile.tooltip_text = _("Creates a new, independent profile and a launcher");
-                 profile.use_underline = true;
-@@ -219,7 +219,7 @@ namespace Apps {
-                 toolbar.insert (profile, -1);
- #endif
- 
--                var app = new Gtk.ToolButton.from_stock (Gtk.STOCK_ADD);
-+                var app = new Gtk.ToolButton.from_stock (Gtk.Stock.ADD);
-                 app.label = _("New _App");
-                 app.tooltip_text = _("Creates a new app for a specific site");
-                 app.use_underline = true;
-@@ -265,7 +265,7 @@ namespace Apps {
-                             store.get (iter, 0, out launcher);
-                             try {
-                                 launcher.file.trash (null);
--                                store.remove (iter);
-+                                store.remove (ref iter);
- 
-                                 string filename = Midori.Download.clean_filename (launcher.name);
- #if HAVE_WIN32
-@@ -385,7 +385,7 @@ namespace Apps {
-         void on_render_button (Gtk.CellLayout column, Gtk.CellRenderer renderer,
-             Gtk.TreeModel model, Gtk.TreeIter iter) {
- 
--            renderer.set ("stock-id", Gtk.STOCK_DELETE,
-+            renderer.set ("stock-id", Gtk.Stock.DELETE,
-                           "stock-size", Gtk.IconSize.MENU);
-         }
-     }
diff --git a/www/midori/patches/patch-extensions_external-download-manager.vala b/www/midori/patches/patch-extensions_external-download-manager.vala
deleted file mode 100644
index ac7d80f7dc3..00000000000
--- a/www/midori/patches/patch-extensions_external-download-manager.vala
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-extensions_external-download-manager.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
-
-Update to build against vala-0.42.0
-
---- extensions/external-download-manager.vala.orig	2015-08-30 11:56:26.000000000 +0000
-+++ extensions/external-download-manager.vala
-@@ -280,8 +280,8 @@ namespace EDM {
-             this.vbox.pack_start (this.input, false, true, 0);
- #endif
- 
--            this.add_button (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
--            this.add_button (Gtk.STOCK_APPLY, Gtk.ResponseType.APPLY);
-+            this.add_button (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
-+            this.add_button (Gtk.Stock.APPLY, Gtk.ResponseType.APPLY);
- 
-             this.show_all ();
-         }
diff --git a/www/midori/patches/patch-extensions_history-list.vala b/www/midori/patches/patch-extensions_history-list.vala
deleted file mode 100644
index 7fd74bd566c..00000000000
--- a/www/midori/patches/patch-extensions_history-list.vala
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-extensions_history-list.vala,v 1.3 2018/11/09 09:17:07 abs Exp $
-
-Update to build against vala-0.42.0
-
---- extensions/history-list.vala.orig	2015-08-30 11:56:26.000000000 +0000
-+++ extensions/history-list.vala
-@@ -223,7 +223,7 @@ namespace HistoryList {
-                     FixMe: the retrun value of `Gtk.ListStore.remove` should be checked
-                     Note:  in some cases the return value of `Gtk.ListStore.remove` is wrong
-                 */
--                model.remove (iter);
-+                model.remove (ref iter);
-                 this.browser.close_tab (view);
-                 if (length > 2)
-                     this.resize_treeview ();
-@@ -365,8 +365,8 @@ namespace HistoryList {
-             this.vbox.pack_start (table, false, true, 0);
- #endif
- 
--            this.add_button (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
--            this.add_button (Gtk.STOCK_APPLY, Gtk.ResponseType.APPLY);
-+            this.add_button (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
-+            this.add_button (Gtk.Stock.APPLY, Gtk.ResponseType.APPLY);
- 
-             this.show_all ();
-         }
diff --git a/www/midori/patches/patch-extensions_notes.vala b/www/midori/patches/patch-extensions_notes.vala
deleted file mode 100644
index 1d78de17dde..00000000000
--- a/www/midori/patches/patch-extensions_notes.vala
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-extensions_notes.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
-
-Update to build against vala-0.42.0
-
---- extensions/notes.vala.orig	2015-08-30 11:56:26.000000000 +0000
-+++ extensions/notes.vala
-@@ -116,7 +116,7 @@ namespace ClipNotes {
-                     if (current_note == note) {
-                         current_note = null;
-                     }
--                    notes_list_store.remove (iter);
-+                    notes_list_store.remove (ref iter);
-                     break;
-                 }
-             } while (notes_list_store.iter_next (ref iter));
-@@ -131,7 +131,7 @@ namespace ClipNotes {
-         Gtk.TextView note_text_view = new Gtk.TextView ();
- 
-         public unowned string get_stock_id () {
--            return Gtk.STOCK_EDIT;
-+            return Gtk.Stock.EDIT;
-         }
- 
-         public unowned string get_label () {
-@@ -141,7 +141,7 @@ namespace ClipNotes {
-         public Gtk.Widget get_toolbar () {
-             if (toolbar == null) {
-                 toolbar = new Gtk.Toolbar ();
--                var new_note_button = new Gtk.ToolButton.from_stock (Gtk.STOCK_EDIT);
-+                var new_note_button = new Gtk.ToolButton.from_stock (Gtk.Stock.EDIT);
-                 new_note_button.label = _("New Note");
-                 new_note_button.tooltip_text = _("Creates a new empty note, unrelated to opened pages");
-                 new_note_button.use_underline  = true;
-@@ -337,7 +337,7 @@ namespace ClipNotes {
-                 var menu = new Gtk.Menu ();
- 
-                 var menuitem = new Gtk.ImageMenuItem.with_label (_("Rename note"));
--                var image = new Gtk.Image.from_stock (Gtk.STOCK_EDIT, Gtk.IconSize.MENU);
-+                var image = new Gtk.Image.from_stock (Gtk.Stock.EDIT, Gtk.IconSize.MENU);
-                 menuitem.always_show_image = true;
-                 menuitem.set_image (image);
-                 menuitem.activate.connect (() => {
-@@ -348,7 +348,7 @@ namespace ClipNotes {
- 
- 
-                 menuitem = new Gtk.ImageMenuItem.with_label (_("Copy note to clipboard"));
--                image = new Gtk.Image.from_stock (Gtk.STOCK_COPY, Gtk.IconSize.MENU);
-+                image = new Gtk.Image.from_stock (Gtk.Stock.COPY, Gtk.IconSize.MENU);
-                 menuitem.always_show_image = true;
-                 menuitem.set_image (image);
-                 menuitem.activate.connect (() => {
-@@ -358,7 +358,7 @@ namespace ClipNotes {
- 
- 
-                 menuitem = new Gtk.ImageMenuItem.with_label (_("Remove note"));
--                image = new Gtk.Image.from_stock (Gtk.STOCK_DELETE, Gtk.IconSize.MENU);
-+                image = new Gtk.Image.from_stock (Gtk.Stock.DELETE, Gtk.IconSize.MENU);
-                 menuitem.always_show_image = true;
-                 menuitem.set_image (image);
-                 menuitem.activate.connect (() => {
diff --git a/www/midori/patches/patch-extensions_open-with.vala b/www/midori/patches/patch-extensions_open-with.vala
deleted file mode 100644
index 6efd0c9cde7..00000000000
--- a/www/midori/patches/patch-extensions_open-with.vala
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-extensions_open-with.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
-
-Update to build against vala-0.42.0
-
---- extensions/open-with.vala.orig	2015-08-30 11:56:26.000000000 +0000
-+++ extensions/open-with.vala
-@@ -161,10 +161,10 @@ namespace ExternalApplications {
-             has_separator = false;
- #endif
-             destroy_with_parent = true;
--            set_icon_name (Gtk.STOCK_OPEN);
-+            set_icon_name (Gtk.Stock.OPEN);
-             resizable = false;
--            add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
--                         Gtk.STOCK_SAVE, Gtk.ResponseType.ACCEPT);
-+            add_buttons (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-+                         Gtk.Stock.SAVE, Gtk.ResponseType.ACCEPT);
- 
-             var vbox = new Gtk.VBox (false, 8);
-             vbox.border_width = 8;
-@@ -266,7 +266,7 @@ namespace ExternalApplications {
- 
-                 var menu = new Gtk.Menu ();
-                 var menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("Custom…"));
--                menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_EDIT, Gtk.IconSize.MENU);
-+                menuitem.image = new Gtk.Image.from_stock (Gtk.Stock.EDIT, Gtk.IconSize.MENU);
-                 menuitem.activate.connect (() => {
-                     customize_app_info (app_info, content_type, uri);
-                 });
-@@ -374,10 +374,10 @@ namespace ExternalApplications {
-             has_separator = false;
- #endif
-             destroy_with_parent = true;
--            set_icon_name (Gtk.STOCK_OPEN);
-+            set_icon_name (Gtk.Stock.OPEN);
-             resizable = true;
--            add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
--                         Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT);
-+            add_buttons (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-+                         Gtk.Stock.OPEN, Gtk.ResponseType.ACCEPT);
- 
-             var vbox = new Gtk.VBox (false, 8);
-             vbox.border_width = 8;
-@@ -740,7 +740,7 @@ namespace ExternalApplications {
- 
-         void show_preferences (Katze.Preferences preferences) {
-             var settings = get_app ().settings;
--            var category = preferences.add_category (_("File Types"), Gtk.STOCK_FILE);
-+            var category = preferences.add_category (_("File Types"), Gtk.Stock.FILE);
-             preferences.add_group (null);
- 
-             var sizegroup = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
diff --git a/www/midori/patches/patch-extensions_transfers.vala b/www/midori/patches/patch-extensions_transfers.vala
deleted file mode 100644
index ceb6ca86ffe..00000000000
--- a/www/midori/patches/patch-extensions_transfers.vala
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-extensions_transfers.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
-
-Update to build against vala-0.42.0
-
---- extensions/transfers.vala.orig	2015-08-30 11:56:26.000000000 +0000
-+++ extensions/transfers.vala
-@@ -119,7 +119,7 @@ namespace Transfers {
-                 separator.draw = false;
-                 separator.set_expand (true);
-                 toolbar.insert (separator, -1);
--                clear = new Gtk.ToolButton.from_stock (Gtk.STOCK_CLEAR);
-+                clear = new Gtk.ToolButton.from_stock (Gtk.Stock.CLEAR);
-                 clear.label = _("Clear All");
-                 clear.is_important = true;
-                 clear.clicked.connect (clear_clicked);
-@@ -213,7 +213,7 @@ namespace Transfers {
-                 store.get (iter, 0, out transfer);
- 
-                 var menu = new Gtk.Menu ();
--                var menuitem = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_OPEN, null);
-+                var menuitem = new Gtk.ImageMenuItem.from_stock (Gtk.Stock.OPEN, null);
-                 menuitem.activate.connect (() => {
-                     try {
-                         Midori.Download.open (transfer.download, treeview);
-@@ -224,7 +224,7 @@ namespace Transfers {
-                 menuitem.sensitive = transfer.succeeded;
-                 menu.append (menuitem);
-                 menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("Open Destination _Folder"));
--                menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_DIRECTORY, Gtk.IconSize.MENU);
-+                menuitem.image = new Gtk.Image.from_stock (Gtk.Stock.DIRECTORY, Gtk.IconSize.MENU);
-                 menuitem.activate.connect (() => {
-                     var folder = GLib.File.new_for_uri (transfer.destination);
-                     (Midori.Browser.get_for_widget (this).tab as Midori.Tab).open_uri (folder.get_parent ().get_uri ());
-@@ -236,7 +236,7 @@ namespace Transfers {
-                     get_clipboard (Gdk.SELECTION_PRIMARY).set_text (uri, -1);
-                     get_clipboard (Gdk.SELECTION_CLIPBOARD).set_text (uri, -1);
-                 });
--                menuitem.image = new Gtk.Image.from_stock (Gtk.STOCK_COPY, Gtk.IconSize.MENU);
-+                menuitem.image = new Gtk.Image.from_stock (Gtk.Stock.COPY, Gtk.IconSize.MENU);
-                 menu.append (menuitem);
-                 menu.show_all ();
-                 Katze.widget_popup (treeview, menu, null, Katze.MenuPos.CURSOR);
-@@ -275,7 +275,7 @@ namespace Transfers {
-                     Transfer found;
-                     store.get (iter, 0, out found);
-                     if (transfer == found) {
--                        store.remove (iter);
-+                        store.remove (ref iter);
-                         break;
-                     }
-                 } while (store.iter_next (ref iter));
-@@ -394,7 +394,7 @@ namespace Transfers {
-             set_style (Gtk.ToolbarStyle.BOTH_HORIZ);
-             show_arrow = false;
- 
--            clear = new Gtk.ToolButton.from_stock (Gtk.STOCK_CLEAR);
-+            clear = new Gtk.ToolButton.from_stock (Gtk.Stock.CLEAR);
-             clear.label = _("Clear All");
-             clear.is_important = true;
-             clear.clicked.connect (clear_clicked);
-@@ -455,7 +455,7 @@ namespace Transfers {
-                 if (notifications.length () == 1)
-                     msg = _("The file '<b>%s</b>' has been downloaded.").printf (filename);
-                 else
--                    msg = _("'<b>%s</b>' and %d other files have been downloaded.").printf (filename, notifications.length ());
-+                    msg = _("'<b>%s</b>' and %u other files have been downloaded.").printf (filename, notifications.length ());
-                 get_app ().send_notification (_("Transfer completed"), msg);
-                 notifications = new GLib.List<string> ();
-             }
-@@ -514,7 +514,7 @@ namespace Transfers {
-                     "%s",
-                     _("Some files are being downloaded"));
-                 dialog.title = _("Some files are being downloaded");
--                dialog.add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
-+                dialog.add_buttons (Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-                                     _("_Quit Midori"), Gtk.ResponseType.ACCEPT);
-                 dialog.format_secondary_text (
-                     _("The transfers will be cancelled if Midori quits."));
diff --git a/www/midori/patches/patch-katze_midori-paths.vala b/www/midori/patches/patch-katze_midori-paths.vala
deleted file mode 100644
index c32ed6d5698..00000000000
--- a/www/midori/patches/patch-katze_midori-paths.vala
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-katze_midori-paths.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
-
-Update to build against vala-0.42.0
-
---- katze/midori-paths.vala.orig	2015-08-30 11:56:26.000000000 +0000
-+++ katze/midori-paths.vala
-@@ -485,7 +485,7 @@ namespace Midori {
-                 return pixbuf;
- #endif
-             if (widget != null)
--                return widget.render_icon (Gtk.STOCK_FILE, Gtk.IconSize.MENU, null);
-+                return widget.render_icon (Gtk.Stock.FILE, Gtk.IconSize.MENU, null);
-             return null;
-         }
-     }
diff --git a/www/midori/patches/patch-midori_midori-notebook.vala b/www/midori/patches/patch-midori_midori-notebook.vala
deleted file mode 100644
index 929e77e4d4a..00000000000
--- a/www/midori/patches/patch-midori_midori-notebook.vala
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-midori_midori-notebook.vala,v 1.1 2018/11/09 09:17:07 abs Exp $
-
-Update to build against vala-0.42.0
-
---- midori/midori-notebook.vala.orig	2015-08-30 11:56:26.000000000 +0000
-+++ midori/midori-notebook.vala
-@@ -10,7 +10,7 @@
- */
- 
- namespace Midori {
--    protected class Tally : Gtk.EventBox {
-+    internal class Tally : Gtk.EventBox {
-         public Midori.Tab tab { get; set; }
-         Gtk.Spinner spinner;
-         public Gtk.Label label;
-@@ -22,7 +22,7 @@ namespace Midori {
-         public bool close_button_left { get; set; default = false; }
-         public bool close_button_visible { get; set; default = false; }
- 
--        protected Tally (Midori.Tab tab) {
-+        internal Tally (Midori.Tab tab) {
-             this.tab = tab;
-             box = new Gtk.HBox (false, 1);
-             add (box);
-@@ -393,7 +393,7 @@ namespace Midori {
-                         child.destroy ();
-             });
-             menu.add (action_other);
--            var action_close = new Midori.ContextAction ("TabClose", null, null, Gtk.STOCK_CLOSE);
-+            var action_close = new Midori.ContextAction ("TabClose", null, null, Gtk.Stock.CLOSE);
-             action_close.activate.connect (()=>{
-                 tab.destroy ();
-             });