- Update to 0.4.7

- Convert to OptionsNG
- Trim header
- Use USE_PKGCONFIG
- Remove ABI version in LIB_DEPENDS

Approved by:	rene, miwi (mentors)

13 files changed, 338 insertions, 53 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 3d17067e6708..63d0f1472cf9 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	midori
-# Date created:		2007-10-21
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
+# Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/www/midori/Makefile,v 1.21 2010/04/05 21:56:26 kwm Exp $
 #
 
 PORTNAME=	midori
-PORTVERSION=	0.4.6
-PORTREVISION=	1
+PORTVERSION=	0.4.7
 CATEGORIES=	www xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -22,9 +17,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
 		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	webkitgtk-1:${PORTSDIR}/www/webkit-gtk2 \
+		sqlite3:${PORTSDIR}/databases/sqlite3 \
+		notify:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -39,34 +34,35 @@ MAKE_JOBS_SAFE=	yes
 HAS_CONFIGURE=	yes
 USE_PYTHON_BUILD=	yes
 USE_BZIP2=	yes
-USE_GNOME=	glib20 gtk20 intltool libxml2 pkgconfig desktopfileutils
+USE_GNOME=	glib20 gtk20 intltool libxml2 desktopfileutils
 USE_XORG=	xscrnsaver
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-.endif
+USE_PKGCONFIG=	build
 
 PLIST_SUB=	VERSION="${PORTVERSION:R}" \
 	PORTVERSION="${PORTVERSION}"
 
-OPTIONS=	NLS "Enable Native Language support" on \
-		APIDOCS "Build api documentation" off \
-		UNIQUE "Enable single instance support" on
+OPTIONS_DEFINE=	APIDOCS NLS UNIQUE
+OPTIONS_DEFAULT=	NLS UNIQUE
 
-.include <bsd.port.pre.mk>
+APIDOCS_DESC=	Build API documentation
+UNIQUE_DESC=	Single instance support
+
+.include <bsd.port.options.mk>
 
 # WAF needs that
 CONFIGURE_ENV+=	CC="${CC}"
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes 
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_APIDOCS)
+.if ${PORT_OPTIONS:MAPIDOCS}
 BUILD_DEPENDS+=	gtkdoc-scan:${PORTSDIR}/textproc/gtk-doc
 CONFIGURE_ARGS+=--enable-apidocs
 PLIST_SUB+=	APIDOCS=""
@@ -75,20 +71,24 @@ CONFIGURE_ARGS+=--disable-apidocs
 PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.if defined(WITH_UNIQUE)
-LIB_DEPENDS+=	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+.if ${PORT_OPTIONS:MUNIQUE}
+LIB_DEPENDS+=	unique-1:${PORTSDIR}/x11-toolkits/unique
 CONFIGURE_ARGS+=--enable-unique
 .else
 CONFIGURE_ARGS+=--disable-unique
 .endif
 
+pre-patch:
+# Disable HTTP Strict Transport Security (hsts)
+	@cd ${WRKSRC}/katze && ${RM} midori-hsts.vala
+
 post-install:
 	@-update-desktop-database
-.if defined(WITH_APIDOCS)
+.if ${PORT_OPTIONS:MAPIDOCS}
 	${MKDIR} ${DOCSDIR}/api/katze/html
 	${MKDIR} ${DOCSDIR}/api/midori/html
 	(cd ${WRKSRC}/_build/docs/api/katze/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/api/katze/html)
 	(cd ${WRKSRC}/_build/docs/api/midori/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/api/midori/html)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 339f9fb9b831..e4318c25bc07 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/midori-0.4.6.tar.bz2) = 910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea
-SIZE (xfce4/midori-0.4.6.tar.bz2) = 978570
+SHA256 (xfce4/midori-0.4.7.tar.bz2) = 65bf9976733597c405492ce91aa664fd10547cb7df16e0a70f260c7a3e97ea5d
+SIZE (xfce4/midori-0.4.7.tar.bz2) = 1015921
diff --git a/www/midori/files/patch-extensions__delayed-load.vala b/www/midori/files/patch-extensions__delayed-load.vala
new file mode 100644
index 000000000000..4e704f6f2acf
--- /dev/null
+++ b/www/midori/files/patch-extensions__delayed-load.vala
@@ -0,0 +1,44 @@
+--- ./extensions/delayed-load.vala.orig	2012-09-19 21:17:43.000000000 +0000
++++ ./extensions/delayed-load.vala	2012-09-21 16:51:55.000000000 +0000
+@@ -86,7 +86,7 @@
+                     item.ref();
+ 
+                     int64 delay = item.get_meta_integer ("delay");
+-                    if (delay == -2) {
++                    if (delay == Midori.Delay.PENDING_UNDELAY) {
+                         view.reload (true);
+                     }
+                 }
+@@ -124,7 +124,7 @@
+             if (this.timeout == 0)
+                 view.reload (true);
+             else {
+-                unowned TabShaker shaker = tasks.get (browser);
++                unowned TabShaker shaker = tasks.lookup (browser);
+                 if (shaker != null) {
+                     shaker.tasks.add (view);
+                     Timeout.add (this.timeout, shaker.reload_tab);
+@@ -141,7 +141,7 @@
+                 item.ref();
+ 
+                 int64 delay = item.get_meta_integer ("delay");
+-                if (delay == -2 && new_view.progress < 1.0) {
++                if (delay == Midori.Delay.PENDING_UNDELAY && new_view.progress < 1.0) {
+                     this.schedule_reload (browser, new_view);
+                 }
+             }
+@@ -157,12 +157,12 @@
+                 item.ref();
+ 
+                 int64 delay = item.get_meta_integer ("delay");
+-                if (delay != 1) {
++                if (delay != Midori.Delay.DELAYED) {
+                     unowned WebKit.WebView web_view = view.get_web_view ();
+                     WebKit.LoadStatus load_status = web_view.load_status;
+                     if (load_status == WebKit.LoadStatus.FINISHED) {
+                         if (this.timeout != 0)
+-                            this.tasks.set (browser, new TabShaker (browser));
++                            this.tasks.replace (browser, new TabShaker (browser));
+ 
+                         if (view.progress < 1.0)
+                             this.schedule_reload (browser, view);
diff --git a/www/midori/files/patch-extensions__external-download-manager.vala b/www/midori/files/patch-extensions__external-download-manager.vala
new file mode 100644
index 000000000000..ccba813638c9
--- /dev/null
+++ b/www/midori/files/patch-extensions__external-download-manager.vala
@@ -0,0 +1,50 @@
+--- ./extensions/external-download-manager.vala.orig	2012-09-19 21:17:43.000000000 +0000
++++ ./extensions/external-download-manager.vala	2012-09-21 16:54:03.000000000 +0000
+@@ -134,17 +134,23 @@
+ 
+     private class Aria2 : ExternalDownloadManager {
+         public override bool download (DownloadRequest dlReq) {
+-            var url = value_array_new ();
+-            value_array_insert (url, 0, typeof (string), dlReq.uri);
++            var url = new GLib.ValueArray (2);
++
++            var uri = new GLib.Value (typeof (string));
++            uri.set_string (dlReq.uri);
++
++            url.insert (0, uri);
+ 
+             GLib.HashTable<string, GLib.Value?> options = value_hash_new ();
+             var referer = new GLib.Value (typeof (string));
+             referer.set_string (dlReq.referer);
+             options.insert ("referer", referer);
+ 
+-            var headers = value_array_new ();
++            var headers = new GLib.ValueArray (2);
+             if (dlReq.cookie_header != null) {
+-                value_array_insert (headers, 0, typeof (string), "Cookie: %s".printf(dlReq.cookie_header));
++                var cookie = new GLib.Value (typeof (string)); 
++                cookie.set_string ("Cookie: %s".printf(dlReq.cookie_header));
++                headers.insert (0, cookie);
+             }
+ 
+             if (headers.n_values > 0)
+@@ -158,8 +164,8 @@
+             session.send_message (message);
+ 
+             try {
+-                Value v;
+-                XMLRPC.parse_method_response ((string) message.response_body.flatten ().data, -1, out v);
++                var v = new GLib.Value (typeof(string));
++                XMLRPC.parse_method_response ((string) message.response_body.flatten ().data, -1, v);
+                 return true;
+             } catch (Error e) {
+                 this.handle_exception (e);
+@@ -293,7 +299,7 @@
+                          authors: "André Stösel <andre@stoesel.de>",
+                          key: "commandline");
+ 
+-            this.install_string ("commandline", "wget --no-check-certificate --referer={REFERER} --header={COOKIES} {URL}");
++            this.install_string ("commandline", "fetch {URL}");
+ 
+             this.activate.connect (activated);
+             this.deactivate.connect (deactivated);
diff --git a/www/midori/files/patch-extensions__wscript_build b/www/midori/files/patch-extensions__wscript_build
deleted file mode 100644
index 2b28214b82de..000000000000
--- a/www/midori/files/patch-extensions__wscript_build
+++ /dev/null
@@ -1,12 +0,0 @@
---- extensions/wscript_build.orig	2012-04-14 21:17:35.000000000 +0200
-+++ extensions/wscript_build	2012-05-02 22:02:34.000000000 +0200
-@@ -4,7 +4,8 @@
- 
- import os
- 
--extensions = os.listdir ('extensions')
-+exclude_files = ['external-download-manager.vala']
-+extensions = [i for i in os.listdir ('extensions') if i not in exclude_files]
- for extension in extensions:
-     folder = 'extensions' + os.sep + extension
-     if os.path.isdir (folder):
diff --git a/www/midori/files/patch-katze__gtk3-compat.h b/www/midori/files/patch-katze__gtk3-compat.h
new file mode 100644
index 000000000000..36810eca69dd
--- /dev/null
+++ b/www/midori/files/patch-katze__gtk3-compat.h
@@ -0,0 +1,16 @@
+--- ./katze/gtk3-compat.h.orig	2012-09-19 21:17:43.000000000 +0000
++++ ./katze/gtk3-compat.h	2012-09-21 14:13:13.000000000 +0000
+@@ -116,8 +116,11 @@
+     #define GDK_KEY_Return GDK_Return
+ #endif
+ 
+-#ifndef GDK_IS_X11_DISPLAY
+-    #define GDK_IS_X11_DISPLAY(display) TRUE
++#ifdef GDK_WINDOWING_X11
++    #include <gdk/gdkx.h>
++    #ifndef GDK_IS_X11_DISPLAY
++        #define GDK_IS_X11_DISPLAY(display) TRUE
++    #endif
+ #endif
+ 
+ G_END_DECLS
diff --git a/www/midori/files/patch-midori__main.c b/www/midori/files/patch-midori__main.c
new file mode 100644
index 000000000000..725a5d706a90
--- /dev/null
+++ b/www/midori/files/patch-midori__main.c
@@ -0,0 +1,24 @@
+--- ./midori/main.c.orig	2012-09-19 21:17:43.000000000 +0000
++++ ./midori/main.c	2012-09-21 19:10:59.000000000 +0000
+@@ -1027,9 +1027,6 @@
+     g_signal_connect (session, "request-queued",
+         G_CALLBACK (midori_soup_session_settings_accept_language_cb), settings);
+ 
+-    soup_session_add_feature (session, SOUP_SESSION_FEATURE (
+-        midori_hsts_new (midori_paths_get_readonly_config_filename ("hsts"))));
+-
+     midori_soup_session_debug (session);
+ 
+     g_object_set_data (G_OBJECT (session), "midori-session-initialized", (void*)1);
+@@ -1430,8 +1427,9 @@
+     {
+         katze_item_set_meta_integer (item, "append", 1);
+         katze_item_set_meta_integer (item, "dont-write-history", 1);
+-        if (load_on_startup == MIDORI_STARTUP_DELAYED_PAGES)
+-            katze_item_set_meta_integer (item, "delay", 1);
++        if (load_on_startup == MIDORI_STARTUP_DELAYED_PAGES
++         || katze_item_get_meta_integer (item, "delay") == MIDORI_DELAY_PENDING_UNDELAY)
++            katze_item_set_meta_integer (item, "delay", MIDORI_DELAY_DELAYED);
+         midori_browser_add_item (browser, item);
+     }
+     current = katze_item_get_meta_integer (KATZE_ITEM (_session), "current");
diff --git a/www/midori/files/patch-midori__midori-download.vala b/www/midori/files/patch-midori__midori-download.vala
new file mode 100644
index 000000000000..0a5358a30504
--- /dev/null
+++ b/www/midori/files/patch-midori__midori-download.vala
@@ -0,0 +1,40 @@
+--- ./midori/midori-download.vala.orig	2012-09-19 21:17:43.000000000 +0000
++++ ./midori/midori-download.vala	2012-09-21 14:29:25.000000000 +0000
+@@ -46,8 +46,8 @@
+             string filename = Path.get_basename (download.destination_uri);
+             /* i18n: Download tooltip (size): 4KB of 43MB */
+             string size = _("%s of %s").printf (
+-                format_size (download.current_size),
+-                format_size (download.total_size));
++                format_size_for_display ((int64) download.current_size),
++                format_size_for_display ((int64) download.total_size));
+ 
+             /* Finished, no speed or remaining time */
+             if (is_finished (download) || download.status == WebKit.DownloadStatus.CREATED)
+@@ -84,7 +84,7 @@
+ 
+             string speed;
+             if (elapsed != last_time) {
+-                speed = format_size ((uint64)(
++                speed = format_size_for_display ((int64)(
+                     (current_size - last_size) / (elapsed - last_time)));
+             }
+             else
+@@ -172,6 +172,8 @@
+                     return Gtk.Stock.OPEN;
+                 case WebKit.DownloadStatus.CANCELLED:
+                     return Gtk.Stock.CLEAR;
++                case WebKit.DownloadStatus.ERROR:
++                    return Gtk.Stock.DIALOG_ERROR;
+                 default:
+                     critical ("action_stock_id: %d", download.status);
+                     warn_if_reached ();
+@@ -307,7 +309,7 @@
+                     message = _("There is not enough free space to download \"%s\".").printf (
+                         Path.get_basename (uri));
+                     detailed_message = _("The file needs %s but only %s are left.").printf (
+-                        format_size (download.total_size), format_size (free_space));
++                        format_size_for_display ((int64) download.total_size), format_size_for_display ((int64) free_space));
+                 }
+                 else
+                     assert_not_reached ();
diff --git a/www/midori/files/patch-midori__midori-view.c b/www/midori/files/patch-midori__midori-view.c
new file mode 100644
index 000000000000..45b013257fbe
--- /dev/null
+++ b/www/midori/files/patch-midori__midori-view.c
@@ -0,0 +1,62 @@
+--- ./midori/midori-view.c.orig	2012-09-19 21:17:43.000000000 +0000
++++ ./midori/midori-view.c	2012-09-21 14:22:48.000000000 +0000
+@@ -1025,6 +1025,9 @@
+     #endif
+     view->special = FALSE;
+ 
++    if (katze_item_get_meta_integer (view->item, "delay") == MIDORI_DELAY_PENDING_UNDELAY)
++        katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED);
++
+     /* Remove link labels */
+     js_context = webkit_web_frame_get_global_context (web_frame);
+     result = sokoke_js_script_eval (js_context,
+@@ -4205,7 +4208,7 @@
+             katze_assign (view->uri, NULL);
+             katze_assign (view->mime_type, NULL);
+             katze_item_set_meta_string (view->item, "mime-type", NULL);
+-            katze_item_set_meta_integer (view->item, "delay", -1);
++            katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED);
+ 
+             html = midori_speed_dial_get_html (dial, NULL);
+             midori_view_load_alternate_string (view, html, "about:blank", NULL);
+@@ -4365,10 +4368,12 @@
+                 gchar const* version_strings[] = {
+                     LIBSOUP_VERSION,
+                     CAIRO_VERSION_STRING, cairo_version_string (),
++                    #ifdef HAVE_GCR
+                     GCR_VERSION,
++                    #elif HAVE_GRANITE
+                     GRANITE_VERSION,
+                     LIBNOTIFY_VERSION,
+-                    #ifdef HAVE_HILDON_2_2
++                    #elif HAVE_HILDON_2_2
+                     "Hildon 2.2",
+                     #elif HAVE_HILDON
+                     "Hildon",
+@@ -4437,15 +4442,15 @@
+             webkit_web_view_load_html_string (
+                 WEBKIT_WEB_VIEW (view->web_view), data, view->uri);
+             g_free (data);
+-            katze_item_set_meta_integer (view->item, "delay", -1);
++            katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED);
+             if (g_strcmp0 (view->item->uri, view->uri))
+                 katze_item_set_uri (view->item, view->uri);
+             g_object_notify (G_OBJECT (view), "uri");
+         }
+-        else if (katze_item_get_meta_boolean (view->item, "delay"))
++        else if (katze_item_get_meta_integer (view->item, "delay") == MIDORI_DELAY_DELAYED)
+         {
+             katze_assign (view->uri, g_strdup (uri));
+-            katze_item_set_meta_integer (view->item, "delay", -2);
++            katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_PENDING_UNDELAY);
+             midori_view_display_error (
+                 view, view->uri, view->title ? view->title : view->uri,
+                 _("Page loading delayed"),
+@@ -5479,7 +5484,6 @@
+         webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view));
+     else
+         webkit_web_view_reload_bypass_cache (WEBKIT_WEB_VIEW (view->web_view));
+-    katze_item_set_meta_integer (view->item, "delay", -1);
+ }
+ 
+ /**
diff --git a/www/midori/files/patch-midori__midori-view.h b/www/midori/files/patch-midori__midori-view.h
new file mode 100644
index 000000000000..a3e376966acc
--- /dev/null
+++ b/www/midori/files/patch-midori__midori-view.h
@@ -0,0 +1,16 @@
+--- ./midori/midori-view.h.orig	2012-09-19 21:17:43.000000000 +0000
++++ ./midori/midori-view.h	2012-09-21 14:17:03.000000000 +0000
+@@ -35,6 +35,13 @@
+     MIDORI_NEW_VIEW_WINDOW
+ } MidoriNewView;
+ 
++typedef enum
++{
++    MIDORI_DELAY_UNDELAYED = -1, /* The view is in a regular undelayed state */
++    MIDORI_DELAY_DELAYED = 1, /* The view is delayed but has not displayed any indication of such */
++    MIDORI_DELAY_PENDING_UNDELAY = -2 /* The view is delayed and showing a message asking to be undelayed */
++} MidoriDelay;
++
+ GType
+ midori_new_view_get_type (void) G_GNUC_CONST;
+ 
diff --git a/www/midori/files/patch-midori__midori.vapi b/www/midori/files/patch-midori__midori.vapi
new file mode 100644
index 000000000000..7f385d422f29
--- /dev/null
+++ b/www/midori/files/patch-midori__midori.vapi
@@ -0,0 +1,24 @@
+--- ./midori/midori.vapi.orig	2012-09-19 21:17:43.000000000 +0000
++++ ./midori/midori.vapi	2012-09-21 14:15:47.000000000 +0000
+@@ -124,6 +124,7 @@
+         public string key { get; set; }
+ 
+         public signal void activate (Midori.App app);
++        public signal bool is_prepared ();
+         public signal void deactivate ();
+         public signal void open_preferences ();
+     }
+@@ -190,6 +191,13 @@
+         OPEN_IN_VIEWER
+     }
+ 
++    [CCode (cheader_filename = "midori/midori-view.h", cprefix = "MIDORI_DELAY_")]
++    public enum Delay {
++        UNDELAYED,
++        DELAYED,
++        PENDING_UNDELAY,
++    }
++
+     public class WebSettings : WebKit.WebSettings {
+         public WebSettings ();
+         [NoAccessorMethod]
diff --git a/www/midori/files/patch-wscript b/www/midori/files/patch-wscript
index 6165d02ac6e8..48f69e64cae8 100644
--- a/www/midori/files/patch-wscript
+++ b/www/midori/files/patch-wscript
@@ -1,6 +1,6 @@
---- wscript.orig	2012-04-14 21:17:35.000000000 +0200
-+++ wscript	2012-05-02 19:15:37.000000000 +0200
-@@ -104,8 +104,8 @@
+--- ./wscript.orig	2012-09-19 21:17:43.000000000 +0000
++++ ./wscript	2012-09-20 06:32:04.000000000 +0000
+@@ -106,8 +106,8 @@
      conf.check_tool ('compiler_cc')
      conf.check_tool ('vala')
      conf.check_tool ('glib2')
@@ -11,3 +11,17 @@
          sys.exit (1)
  
      if option_enabled ('nls'):
+@@ -184,11 +184,8 @@
+         return conf.env['HAVE_' + var]
+ 
+     if option_enabled ('gtk3'):
+-        gcr_pkg = 'gcr-3'
+-    else:
+-        gcr_pkg = 'gcr-3-gtk2'
+-    check_pkg (gcr_pkg, '2.32', mandatory=False)
+-    conf.define ('GCR_VERSION', ['No',conf.check_cfg(modversion=gcr_pkg)][conf.env['HAVE_GCR'] == 1])
++        check_pkg ('gcr-3', '2.32', mandatory=False)
++        conf.define ('GCR_VERSION', ['No',conf.check_cfg(modversion='gcr-3')][conf.env['HAVE_GCR'] == 1])
+ 
+     if option_enabled ('unique'):
+         if option_enabled('gtk3'): unique_pkg = 'unique-3.0'
diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist
index 759c158ec839..f1b28b524c7b 100644
--- a/www/midori/pkg-plist
+++ b/www/midori/pkg-plist
@@ -1,12 +1,16 @@
 bin/midori
 etc/xdg/midori/extensions/adblock/config
 etc/xdg/midori/search
+include/midori-%%VERSION%%/extensions/delayed-load.h
+include/midori-%%VERSION%%/extensions/external-download-manager.h
 include/midori-%%VERSION%%/extensions/history-list.h
 lib/midori/libadblock.so
 lib/midori/libaddons.so
 lib/midori/libcolorful-tabs.so
 lib/midori/libcookie-manager.so
 lib/midori/libcopy-tabs.so
+lib/midori/libdelayed-load.so
+lib/midori/libexternal-download-manager.so
 lib/midori/libfeed-panel.so
 lib/midori/libformhistory.so
 lib/midori/libhistory-list.so
@@ -27,7 +31,6 @@ share/applications/midori-private.desktop
 %%DOCSDIR%%/README
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/api-index-full.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/ch01.html
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/deprecated-api-index.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/home.png
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/index.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/index.sgml
@@ -44,6 +47,7 @@ share/applications/midori-private.desktop
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-separatoraction.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-throbber.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-utils.html
+%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze.devhelp
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze.devhelp2
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/left.png
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/right.png
@@ -51,21 +55,18 @@ share/applications/midori-private.desktop
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/up.png
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/api-index-full.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/ch01.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/deprecated-api-index.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/home.png
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/index.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/index.sgml
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/left.png
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-GtkIconEntry.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-MidoriBrowser.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-MidoriExtension.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-MidoriPreferences.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-MidoriViewable.html
+%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-gtkiconentry.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-app.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-array.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-bookmarks.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-locationaction.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-panedaction.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-panel.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-platform.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-searchaction.html
@@ -75,6 +76,7 @@ share/applications/midori-private.desktop
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-socket.html
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-sokoke.html
+%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori.devhelp
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori.devhelp2
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/right.png
 %%APIDOCS%%%%DOCSDIR%%/api/midori/html/style.css
@@ -83,22 +85,22 @@ share/applications/midori-private.desktop
 %%DOCSDIR%%/faq.html
 share/icons/hicolor/16x16/apps/midori.png
 share/icons/hicolor/16x16/categories/extension.png
-share/icons/hicolor/16x16/status/news-feed.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/news-feed.png
+share/icons/hicolor/22x22/status/internet-news-reader.png
 share/icons/hicolor/24x24/apps/midori.png
 share/icons/hicolor/24x24/categories/extension.png
-share/icons/hicolor/24x24/status/news-feed.png
+share/icons/hicolor/24x24/status/internet-news-reader.png
 share/icons/hicolor/32x32/apps/midori.png
 share/icons/hicolor/32x32/categories/extension.png
-share/icons/hicolor/32x32/status/news-feed.png
+share/icons/hicolor/32x32/status/internet-news-reader.png
 share/icons/hicolor/48x48/apps/midori.png
 share/icons/hicolor/48x48/categories/extension.png
-share/icons/hicolor/48x48/status/news-feed.png
+share/icons/hicolor/48x48/status/internet-news-reader.png
 share/icons/hicolor/scalable/apps/midori.svg
 share/icons/hicolor/scalable/categories/extension.svg
-share/icons/hicolor/scalable/status/news-feed.svg
+share/icons/hicolor/scalable/status/internet-news-reader.svg
 %%NLS%%share/locale/ast/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/midori.mo
 %%NLS%%share/locale/be/LC_MESSAGES/midori.mo
@@ -145,8 +147,13 @@ share/icons/hicolor/scalable/status/news-feed.svg
 %%DATADIR%%/res/autosuggestcontrol.js
 %%DATADIR%%/res/close.png
 %%DATADIR%%/res/error.html
+%%DATADIR%%/res/gtk3.css
 %%DATADIR%%/res/logo-shade.png
-%%DATADIR%%/res/speeddial-head-%%PORTVERSION%%.html
+%%DATADIR%%/res/speeddial-head.html
+share/vala/vapi/delayed-load.deps
+share/vala/vapi/delayed-load.vapi
+share/vala/vapi/external-download-manager.deps
+share/vala/vapi/external-download-manager.vapi
 share/vala/vapi/history-list.deps
 share/vala/vapi/history-list.vapi
 @dirrmtry share/vala/vapi