- Update to 0.5.6

- Add GTK2 and GTK3 options (OPTIONS_SINGLE)
- Remove unneeded patches (upstream switched to CMake)

8 files changed, 209 insertions, 275 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 2943ab60e731..17dfeedd9b9c 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	midori
-PORTVERSION=	0.5.5
-PORTREVISION=	1
+PORTVERSION=	0.5.6
 CATEGORIES=	www xfce
 MASTER_SITES=	http://www.midori-browser.org/downloads/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_all_
@@ -16,81 +15,73 @@ LICENSE=	LGPL21
 
 BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
 		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
+LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
 		libnotify.so:${PORTSDIR}/devel/libnotify \
 		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=--enable-addons \
-		--enable-docs \
-		--disable-gtk3 \
-		--jobs=${MAKE_JOBS_NUMBER}
+CMAKE_ARGS=	-DUSE_GRANITE:BOOL=OFF \
+	-DUSE_GCR:BOOL=OFF
 
 WRKSRC=	${WRKDIR}/${DISTNAME:C/([a-z]*)_([0-9\.]*)(_all_)/\1-\2/}
-HAS_CONFIGURE=	yes
-USE_PYTHON=	-2.7
-USE_PYTHON_BUILD=	yes
 USE_BZIP2=	yes
-USE_GNOME=	glib20 gtk20 intltool libxml2
+USE_GNOME=	glib20 intltool libxml2
 USE_XORG=	xscrnsaver
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-USES=		desktop-file-utils pkgconfig
+USES=		desktop-file-utils pkgconfig cmake gettext
 
 PLIST_SUB=	VERSION="${PORTVERSION:R}"
 
-OPTIONS_DEFINE=	DOCS NLS UNIQUE ZEITGEIST
-OPTIONS_DEFAULT=	NLS UNIQUE
-
-UNIQUE_DESC=	Single instance support
+OPTIONS_DEFINE=	DOCS ZEITGEIST
+OPTIONS_SINGLE=	GTK
+OPTIONS_SINGLE_GTK=	GTK2 GTK3
+OPTIONS_DEFAULT=	GTK2
 ZEITGEIST_DESC=	User logs activities
 
 .include <bsd.port.options.mk>
 
-# WAF needs that
-CONFIGURE_ENV+=	CC="${CC}"
+.if ${PORT_OPTIONS:MGTK2}
+LIB_DEPENDS+=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+USE_GNOME+=	gtk20
+CMAKE_ARGS+=	-DUSE_GTK3:BOOL=OFF
+.endif
+
+.if ${PORT_OPTIONS:MGTK3}
+LIB_DEPENDS+=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+USE_GNOME+=	gtk30
+CMAKE_ARGS+=	-DUSE_GTK3:BOOL=ON
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
+# Support the new WebKit2 API (>= 1.11.91)
+.if exists(${LOCALBASE}/libdata/pkgconfig/webkit2gtk-3.0.pc)
+CMAKE_ARGS+=	-DHALF_BRO_INCOM_WEBKIT2:BOOL=ON
 .else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
+CMAKE_ARGS+=	-DHALF_BRO_INCOM_WEBKIT2:BOOL=OFF
+.endif
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	gtkdoc-scan:${PORTSDIR}/textproc/gtk-doc
-CONFIGURE_ARGS+=--enable-apidocs
+CMAKE_ARGS+=	-DUSE_APIDOCS:BOOL=ON
 PLIST_SUB+=	APIDOCS=""
 .else
-CONFIGURE_ARGS+=--disable-apidocs
+CMAKE_ARGS+=	-DUSE_APIDOCS:BOOL=OFF
 PLIST_SUB+=	APIDOCS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MUNIQUE}
-LIB_DEPENDS+=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
-CONFIGURE_ARGS+=--enable-unique
-.else
-CONFIGURE_ARGS+=--disable-unique
-.endif
-
 .if ${PORT_OPTIONS:MZEITGEIST}
 LIB_DEPENDS+=	libzeitgeist-1.0.so:${PORTSDIR}/sysutils/libzeitgeist
-CONFIGURE_ARGS+=--enable-zeitgeist
+CMAKE_ARGS+=	-DUSE_ZEITGEIST:BOOL=ON
 .else
-CONFIGURE_ARGS+=--disable-zeitgeist
+CMAKE_ARGS+=	-DUSE_ZEITGEIST:BOOL=OFF
 .endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-.for dir in katze midori
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/api/${dir}/html
-	@cd ${WRKSRC}/_build/docs/api/${dir}/html && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/api/${dir}/html
+post-patch:
+# Avoid errors with CMake
+.for dir in config extensions
+	@cd ${WRKSRC} && ${RM} ${dir}/*.orig
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 4fc77a4b51b4..4f01c5346b8a 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/midori_0.5.5_all_.tar.bz2) = ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62
-SIZE (xfce4/midori_0.5.5_all_.tar.bz2) = 1092309
+SHA256 (xfce4/midori_0.5.6_all_.tar.bz2) = c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a
+SIZE (xfce4/midori_0.5.6_all_.tar.bz2) = 1194529
diff --git a/www/midori/files/patch-cmake__GtkDoc.cmake b/www/midori/files/patch-cmake__GtkDoc.cmake
new file mode 100644
index 000000000000..f5bd09a6af33
--- /dev/null
+++ b/www/midori/files/patch-cmake__GtkDoc.cmake
@@ -0,0 +1,11 @@
+--- ./cmake/GtkDoc.cmake.orig	2013-11-20 01:26:52.000000000 +0000
++++ ./cmake/GtkDoc.cmake	2013-11-21 16:30:38.000000000 +0000
+@@ -52,7 +52,7 @@
+         file (MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${module}/html")
+         gtkdoc_build (${module})
+ 
+-        set (DOC_DIR "html/midori-${MIDORI_MAJOR_VERSION}-${MIDORI_MINOR_VERSION}")
++        set (DOC_DIR "html/midori-${MIDORI_MAJOR_VERSION}.${MIDORI_MINOR_VERSION}")
+         install (DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${module}/html/"
+             DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/${DOC_DIR}/${module}"
+             PATTERN "html/*"
diff --git a/www/midori/files/patch-config__search b/www/midori/files/patch-config__search
index 04bb632fa822..e8380b36fc88 100644
--- a/www/midori/files/patch-config__search
+++ b/www/midori/files/patch-config__search
@@ -1,5 +1,5 @@
---- ./config/search.orig	2013-08-14 18:32:02.000000000 +0000
-+++ ./config/search	2013-08-15 10:17:00.000000000 +0000
+--- ./config/search.orig	2013-11-20 01:26:52.000000000 +0000
++++ ./config/search	2013-11-20 18:03:47.000000000 +0000
 @@ -16,6 +16,12 @@
  uri=http://www.google.com/search?q=%s
  token=g
diff --git a/www/midori/files/patch-extensions__CMakeLists.txt b/www/midori/files/patch-extensions__CMakeLists.txt
new file mode 100644
index 000000000000..0065f7f6bbe4
--- /dev/null
+++ b/www/midori/files/patch-extensions__CMakeLists.txt
@@ -0,0 +1,16 @@
+--- ./extensions/CMakeLists.txt.orig	2013-09-17 10:59:53.000000000 +0000
++++ ./extensions/CMakeLists.txt	2013-09-17 14:46:05.000000000 +0000
+@@ -24,6 +24,13 @@
+          "nsplugin-manager.vala"
+          )
+ endif ()
++string(FIND ${CMAKE_SYSTEM_NAME} "BSD" BEGIN)
++string(SUBSTRING ${CMAKE_SYSTEM_NAME} ${BEGIN} 3 BSD)
++if (BSD)
++    list(REMOVE_ITEM EXTENSIONS
++         "devpet.vala"
++         )
++endif ()
+ 
+ foreach(UNIT_SRC ${EXTENSIONS})
+     string(FIND ${UNIT_SRC} ".c" UNIT_EXTENSION)
diff --git a/www/midori/files/patch-extensions__wscript_build b/www/midori/files/patch-extensions__wscript_build
deleted file mode 100644
index 4d4e628cbc63..000000000000
--- a/www/midori/files/patch-extensions__wscript_build
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./extensions/wscript_build.orig	2013-08-14 18:32:02.000000000 +0000
-+++ ./extensions/wscript_build	2013-09-17 17:55:12.000000000 +0000
-@@ -4,8 +4,12 @@
- 
- import Options
- import os
-+import sys
- 
- extensions = os.listdir ('extensions')
-+if 'bsd' in sys.platform:
-+    if 'devpet.vala' in extensions:
-+        extensions.remove('devpet.vala')
- for extension in extensions:
-     # FIXME In the absense of a proper mechanism, transfers is a stock extension
-     if not bld.env['addons'] and extension != 'transfers.vala':
diff --git a/www/midori/files/patch-wscript b/www/midori/files/patch-wscript
deleted file mode 100644
index c6e25929e1df..000000000000
--- a/www/midori/files/patch-wscript
+++ /dev/null
@@ -1,49 +0,0 @@
---- ./wscript.orig	2013-08-14 18:32:02.000000000 +0000
-+++ ./wscript	2013-09-17 19:23:37.000000000 +0000
-@@ -29,7 +29,6 @@
- 
- APPNAME = 'midori'
- VERSION = VERSION_FULL = '0.5.5'
--VERSION_SUFFIX = ' (%s)' % VERSION
- 
- try:
-     if os.path.isdir ('.git'):
-@@ -44,8 +43,10 @@
-         folder = os.getcwd ()
-         if VERSION in folder:
-             VERSION_FULL = os.path.basename (folder)
--    if VERSION in VERSION_FULL:
--        VERSION_SUFFIX = VERSION_FULL.replace (VERSION, '')
-+    if APPNAME in VERSION_FULL:
-+        VERSION_FULL = VERSION_FULL.replace (APPNAME, '')[1:]
-+
-+    VERSION_SUFFIX = ' (%s)' % VERSION_FULL
- except:
-     pass
- 
-@@ -530,15 +531,16 @@
- 
-     for config_file in os.listdir ('config'):
-         dest = '${SYSCONFDIR}/xdg/' + APPNAME
--        if (os.path.isdir ('config/' + config_file)):
--            dest += '/' + config_file
--            for child in os.listdir ('config/' + config_file):
--                if (os.path.isdir ('config/' + config_file + '/' + child)):
--                    dest += '/' + child
--                    child += '/*'
--                bld.install_files (dest, 'config/' + config_file + '/' + child)
--            continue
--        bld.install_files (dest, 'config/' + config_file)
-+        if not config_file.endswith('.orig'):
-+            if (os.path.isdir ('config/' + config_file)):
-+                dest += '/' + config_file
-+                for child in os.listdir ('config/' + config_file):
-+                    if (os.path.isdir ('config/' + config_file + '/' + child)):
-+                        dest += '/' + child
-+                        child += '/*'
-+                    bld.install_files (dest, 'config/' + config_file + '/' + child)
-+                continue
-+            bld.install_files (dest, 'config/' + config_file)
- 
-     if Options.commands['check'] or bld.env['tests']:
-         bld.add_subdirs ('tests')
diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist
index 80f52708b205..51d2b2a5c6b7 100644
--- a/www/midori/pkg-plist
+++ b/www/midori/pkg-plist
@@ -1,12 +1,9 @@
 bin/midori
 etc/xdg/midori/extensions/adblock/config
 etc/xdg/midori/search
-include/midori-%%VERSION%%/extensions/apps.h
-include/midori-%%VERSION%%/extensions/delayed-load.h
-include/midori-%%VERSION%%/extensions/external-download-manager.h
-include/midori-%%VERSION%%/extensions/history-list.h
-include/midori-%%VERSION%%/extensions/nsplugin-manager.h
-include/midori-%%VERSION%%/extensions/transfers.h
+lib/libmidori-core.so
+lib/libmidori-core.so.0.0.0
+lib/libmidori-core.so.1
 lib/midori/libadblock.so
 lib/midori/libaddons.so
 lib/midori/libapps.so
@@ -26,197 +23,180 @@ lib/midori/libshortcuts.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
-share/applications/midori.desktop
+share/appdata/midori.appdata.xml
 share/applications/midori-private.desktop
+share/applications/midori.desktop
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/EXPAT
 %%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
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-KatzeItem.html
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-KatzeCellRendererComboBoxText.html
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-KatzePreferences.html
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-gtk3-compat.html
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-array.html
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-arrayaction.html
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-http-auth.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.devhelp2
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/left.png
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/right.png
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/style.css
-%%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-MidoriBrowser.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-MidoriExtension.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-MidoriPreferences.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-frontend.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-history.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-locationaction.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-privatedata.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-searchaction.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-session.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-stock.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-view.html
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/midori-midori-websettings.html
-%%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.devhelp2
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/right.png
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/style.css
-%%APIDOCS%%%%DOCSDIR%%/api/midori/html/up.png
 %%DOCSDIR%%/faq.css
 %%DOCSDIR%%/faq.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/api-index-full.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/ch01.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/deprecated-api-index.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/home.png
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/index.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-KatzeArray.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-KatzeCellRendererComboBoxText.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-KatzeItem.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-KatzePreferences.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-gtk3-compat.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-katze-arrayaction.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-katze-http-auth.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-katze-throbber.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze-katze-utils.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/katze.devhelp2
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/left.png
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/right.png
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/style.css
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/katze/up.png
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/api-index-full.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/ch01.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/deprecated-api-index.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/home.png
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/index.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/left.png
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-MidoriBrowser.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-MidoriExtension.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-MidoriPreferences.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-MidoriViewable.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-app.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-array.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-bookmarks-db.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-frontend.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-history.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-locationaction.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-panel.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-platform.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-privatedata.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-searchaction.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-session.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-stock.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-view.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori-websettings.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-midori.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori-sokoke.html
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/midori.devhelp2
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/right.png
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/style.css
+%%APIDOCS%%share/gtk-doc/html/midori-%%VERSION%%/midori/up.png
 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/apps/midori.png
-share/icons/hicolor/24x24/categories/extension.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/internet-news-reader.png
-share/icons/hicolor/48x48/apps/midori.png
-share/icons/hicolor/48x48/categories/extension.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/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
-%%NLS%%share/locale/bg/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/cy/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/da/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/de/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/el/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/en_AU/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/en_CA/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/es/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/et/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/fa/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/gd/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/he/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/ia/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/id/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/it/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/ky/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/no/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/sr@latin/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/th/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/midori.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/midori.mo
+share/locale/ar/LC_MESSAGES/midori.mo
+share/locale/ast/LC_MESSAGES/midori.mo
+share/locale/be/LC_MESSAGES/midori.mo
+share/locale/bg/LC_MESSAGES/midori.mo
+share/locale/bs/LC_MESSAGES/midori.mo
+share/locale/ca/LC_MESSAGES/midori.mo
+share/locale/cs/LC_MESSAGES/midori.mo
+share/locale/cy/LC_MESSAGES/midori.mo
+share/locale/da/LC_MESSAGES/midori.mo
+share/locale/de/LC_MESSAGES/midori.mo
+share/locale/el/LC_MESSAGES/midori.mo
+share/locale/en_AU/LC_MESSAGES/midori.mo
+share/locale/en_CA/LC_MESSAGES/midori.mo
+share/locale/en_GB/LC_MESSAGES/midori.mo
+share/locale/eo/LC_MESSAGES/midori.mo
+share/locale/es/LC_MESSAGES/midori.mo
+share/locale/et/LC_MESSAGES/midori.mo
+share/locale/eu/LC_MESSAGES/midori.mo
+share/locale/fa/LC_MESSAGES/midori.mo
+share/locale/fi/LC_MESSAGES/midori.mo
+share/locale/fr/LC_MESSAGES/midori.mo
+share/locale/gd/LC_MESSAGES/midori.mo
+share/locale/gl/LC_MESSAGES/midori.mo
+share/locale/he/LC_MESSAGES/midori.mo
+share/locale/hr/LC_MESSAGES/midori.mo
+share/locale/hu/LC_MESSAGES/midori.mo
+share/locale/ia/LC_MESSAGES/midori.mo
+share/locale/id/LC_MESSAGES/midori.mo
+share/locale/it/LC_MESSAGES/midori.mo
+share/locale/ja/LC_MESSAGES/midori.mo
+share/locale/kk/LC_MESSAGES/midori.mo
+share/locale/ko/LC_MESSAGES/midori.mo
+share/locale/ky/LC_MESSAGES/midori.mo
+share/locale/lt/LC_MESSAGES/midori.mo
+share/locale/lv/LC_MESSAGES/midori.mo
+share/locale/ml/LC_MESSAGES/midori.mo
+share/locale/ms/LC_MESSAGES/midori.mo
+share/locale/nb/LC_MESSAGES/midori.mo
+share/locale/nl/LC_MESSAGES/midori.mo
+share/locale/nn/LC_MESSAGES/midori.mo
+share/locale/no/LC_MESSAGES/midori.mo
+share/locale/pa/LC_MESSAGES/midori.mo
+share/locale/pl/LC_MESSAGES/midori.mo
+share/locale/pt/LC_MESSAGES/midori.mo
+share/locale/pt_BR/LC_MESSAGES/midori.mo
+share/locale/ro/LC_MESSAGES/midori.mo
+share/locale/ru/LC_MESSAGES/midori.mo
+share/locale/sk/LC_MESSAGES/midori.mo
+share/locale/sl/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/th/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
+share/locale/vi/LC_MESSAGES/midori.mo
+share/locale/zh_CN/LC_MESSAGES/midori.mo
+share/locale/zh_TW/LC_MESSAGES/midori.mo
 %%DATADIR%%/res/about.css
 %%DATADIR%%/res/autosuggestcontrol.css
 %%DATADIR%%/res/autosuggestcontrol.js
+%%DATADIR%%/res/bookmarks/Create.sql
+%%DATADIR%%/res/bookmarks/Import_old_db_bookmarks.sql
 %%DATADIR%%/res/close.png
 %%DATADIR%%/res/error.html
+%%DATADIR%%/res/forms/Create.sql
 %%DATADIR%%/res/gtk3.css
+%%DATADIR%%/res/history/Create.sql
+%%DATADIR%%/res/history/Day.sql
 %%DATADIR%%/res/logo-shade.png
-%%DATADIR%%/res/logo-shade.svg
-%%DATADIR%%/res/nojs/nojs-statusicon-allowed.png
-%%DATADIR%%/res/nojs/nojs-statusicon-denied.png
-%%DATADIR%%/res/nojs/nojs-statusicon-mixed.png
 %%DATADIR%%/res/speeddial-head.html
-share/vala/vapi/apps.deps
-share/vala/vapi/apps.vapi
-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
-share/vala/vapi/nsplugin-manager.deps
-share/vala/vapi/nsplugin-manager.vapi
-share/vala/vapi/transfers.deps
-share/vala/vapi/transfers.vapi
-@dirrmtry share/vala/vapi
-@dirrmtry share/vala
-@dirrm %%DATADIR%%/res/nojs
+%%DATADIR%%/res/tabby/Create.sql
+%%DATADIR%%/res/tabby/Update1.sql
+@dirrm %%DATADIR%%/res/tabby
+@dirrm %%DATADIR%%/res/history
+@dirrm %%DATADIR%%/res/forms
+@dirrm %%DATADIR%%/res/bookmarks
 @dirrm %%DATADIR%%/res
 @dirrm %%DATADIR%%
-%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sr@latin
-%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ky
-%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ia
-%%NLS%%@dirrmtry share/locale/gd/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gd
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-%%APIDOCS%%@dirrm %%DOCSDIR%%/api/midori/html
-%%APIDOCS%%@dirrm %%DOCSDIR%%/api/midori
-%%APIDOCS%%@dirrm %%DOCSDIR%%/api/katze/html
-%%APIDOCS%%@dirrm %%DOCSDIR%%/api/katze
-%%APIDOCS%%@dirrm %%DOCSDIR%%/api
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/ia/LC_MESSAGES
+@dirrmtry share/locale/ia
+@dirrmtry share/locale/gd/LC_MESSAGES
+@dirrmtry share/locale/gd
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+%%APIDOCS%%@dirrm share/gtk-doc/html/midori-%%VERSION%%/midori
+%%APIDOCS%%@dirrm share/gtk-doc/html/midori-%%VERSION%%/katze
+%%APIDOCS%%@dirrm share/gtk-doc/html/midori-%%VERSION%%
+%%APIDOCS%%@dirrmtry share/gtk-doc/html
+%%APIDOCS%%@dirrmtry share/gtk-doc
 @dirrm %%DOCSDIR%%
+@dirrm share/appdata
 @dirrm lib/midori
-@dirrm include/midori-%%VERSION%%/extensions
-@dirrm include/midori-%%VERSION%%
 @dirrm etc/xdg/midori/extensions/adblock
 @dirrm etc/xdg/midori/extensions
 @dirrm etc/xdg/midori