[notify] midori: 0.5.5 -> 0.5.6. New dependency libzeitgeist

3 files changed, 52 insertions, 81 deletions

diff --git a/midori/.footprint b/midori/.footprint
index 36950c260..b46756140 100644
--- a/midori/.footprint
+++ b/midori/.footprint
@@ -8,46 +8,41 @@ drwxr-xr-x	root/root	etc/xdg/midori/extensions/adblock/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/midori
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/midori-0.5/
-drwxr-xr-x	root/root	usr/include/midori-0.5/extensions/
--rw-r--r--	root/root	usr/include/midori-0.5/extensions/apps.h
--rw-r--r--	root/root	usr/include/midori-0.5/extensions/delayed-load.h
--rw-r--r--	root/root	usr/include/midori-0.5/extensions/devpet.h
--rw-r--r--	root/root	usr/include/midori-0.5/extensions/external-download-manager.h
--rw-r--r--	root/root	usr/include/midori-0.5/extensions/history-list.h
--rw-r--r--	root/root	usr/include/midori-0.5/extensions/nsplugin-manager.h
--rw-r--r--	root/root	usr/include/midori-0.5/extensions/transfers.h
 drwxr-xr-x	root/root	usr/lib/
+lrwxrwxrwx	root/root	usr/lib/libmidori-core.so -> libmidori-core.so.1
+-rwxr-xr-x	root/root	usr/lib/libmidori-core.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libmidori-core.so.1 -> libmidori-core.so.0.0.0
 drwxr-xr-x	root/root	usr/lib/midori/
--rw-r--r--	root/root	usr/lib/midori/libadblock.so
--rw-r--r--	root/root	usr/lib/midori/libaddons.so
--rw-r--r--	root/root	usr/lib/midori/libapps.so
--rw-r--r--	root/root	usr/lib/midori/libcolorful-tabs.so
--rw-r--r--	root/root	usr/lib/midori/libcookie-manager.so
--rw-r--r--	root/root	usr/lib/midori/libcookie-permissions.so
--rw-r--r--	root/root	usr/lib/midori/libcopy-tabs.so
--rw-r--r--	root/root	usr/lib/midori/libdelayed-load.so
--rw-r--r--	root/root	usr/lib/midori/libdevpet.so
--rw-r--r--	root/root	usr/lib/midori/libexternal-download-manager.so
--rw-r--r--	root/root	usr/lib/midori/libfeed-panel.so
--rw-r--r--	root/root	usr/lib/midori/libformhistory.so
--rw-r--r--	root/root	usr/lib/midori/libhistory-list.so
--rw-r--r--	root/root	usr/lib/midori/libmouse-gestures.so
--rw-r--r--	root/root	usr/lib/midori/libnojs.so
--rw-r--r--	root/root	usr/lib/midori/libnsplugin-manager.so
--rw-r--r--	root/root	usr/lib/midori/libshortcuts.so
--rw-r--r--	root/root	usr/lib/midori/libstatus-clock.so
--rw-r--r--	root/root	usr/lib/midori/libstatusbar-features.so
--rw-r--r--	root/root	usr/lib/midori/libtab-panel.so
--rw-r--r--	root/root	usr/lib/midori/libtabs-minimized.so
--rw-r--r--	root/root	usr/lib/midori/libtoolbar-editor.so
--rw-r--r--	root/root	usr/lib/midori/libtransfers.so
+-rwxr-xr-x	root/root	usr/lib/midori/libadblock.so
+-rwxr-xr-x	root/root	usr/lib/midori/libaddons.so
+-rwxr-xr-x	root/root	usr/lib/midori/libapps.so
+-rwxr-xr-x	root/root	usr/lib/midori/libcolorful-tabs.so
+-rwxr-xr-x	root/root	usr/lib/midori/libcookie-manager.so
+-rwxr-xr-x	root/root	usr/lib/midori/libcookie-permissions.so
+-rwxr-xr-x	root/root	usr/lib/midori/libcopy-tabs.so
+-rwxr-xr-x	root/root	usr/lib/midori/libdelayed-load.so
+-rwxr-xr-x	root/root	usr/lib/midori/libdevpet.so
+-rwxr-xr-x	root/root	usr/lib/midori/libexternal-download-manager.so
+-rwxr-xr-x	root/root	usr/lib/midori/libfeed-panel.so
+-rwxr-xr-x	root/root	usr/lib/midori/libformhistory.so
+-rwxr-xr-x	root/root	usr/lib/midori/libhistory-list.so
+-rwxr-xr-x	root/root	usr/lib/midori/libmouse-gestures.so
+-rwxr-xr-x	root/root	usr/lib/midori/libnojs.so
+-rwxr-xr-x	root/root	usr/lib/midori/libnsplugin-manager.so
+-rwxr-xr-x	root/root	usr/lib/midori/libshortcuts.so
+-rwxr-xr-x	root/root	usr/lib/midori/libstatus-clock.so
+-rwxr-xr-x	root/root	usr/lib/midori/libstatusbar-features.so
+-rwxr-xr-x	root/root	usr/lib/midori/libtab-panel.so
+-rwxr-xr-x	root/root	usr/lib/midori/libtabby.so
+-rwxr-xr-x	root/root	usr/lib/midori/libtabs-minimized.so
+-rwxr-xr-x	root/root	usr/lib/midori/libtoolbar-editor.so
+-rwxr-xr-x	root/root	usr/lib/midori/libtransfers.so
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/appdata/
+-rw-r--r--	root/root	usr/share/appdata/midori.appdata.xml
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/midori-private.desktop
 -rw-r--r--	root/root	usr/share/applications/midori.desktop
-drwxr-xr-x	root/root	usr/share/gir-1.0/
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
@@ -64,27 +59,6 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/categories/
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/categories/extension.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/status/
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/status/internet-news-reader.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/midori.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/categories/
--rw-r--r--	root/root	usr/share/icons/hicolor/24x24/categories/extension.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/status/
--rw-r--r--	root/root	usr/share/icons/hicolor/24x24/status/internet-news-reader.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/midori.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/categories/
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/categories/extension.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/status/
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/status/internet-news-reader.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
-drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/midori.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/categories/
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/categories/extension.png
-drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/status/
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/status/internet-news-reader.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/midori.svg
@@ -97,29 +71,19 @@ drwxr-xr-x	root/root	usr/share/midori/res/
 -rw-r--r--	root/root	usr/share/midori/res/about.css
 -rw-r--r--	root/root	usr/share/midori/res/autosuggestcontrol.css
 -rw-r--r--	root/root	usr/share/midori/res/autosuggestcontrol.js
+drwxr-xr-x	root/root	usr/share/midori/res/bookmarks/
+-rw-r--r--	root/root	usr/share/midori/res/bookmarks/Create.sql
+-rw-r--r--	root/root	usr/share/midori/res/bookmarks/Import_old_db_bookmarks.sql
 -rw-r--r--	root/root	usr/share/midori/res/close.png
 -rw-r--r--	root/root	usr/share/midori/res/error.html
+drwxr-xr-x	root/root	usr/share/midori/res/forms/
+-rw-r--r--	root/root	usr/share/midori/res/forms/Create.sql
 -rw-r--r--	root/root	usr/share/midori/res/gtk3.css
+drwxr-xr-x	root/root	usr/share/midori/res/history/
+-rw-r--r--	root/root	usr/share/midori/res/history/Create.sql
+-rw-r--r--	root/root	usr/share/midori/res/history/Day.sql
 -rw-r--r--	root/root	usr/share/midori/res/logo-shade.png
--rw-r--r--	root/root	usr/share/midori/res/logo-shade.svg
-drwxr-xr-x	root/root	usr/share/midori/res/nojs/
--rw-r--r--	root/root	usr/share/midori/res/nojs/nojs-statusicon-allowed.png
--rw-r--r--	root/root	usr/share/midori/res/nojs/nojs-statusicon-denied.png
--rw-r--r--	root/root	usr/share/midori/res/nojs/nojs-statusicon-mixed.png
 -rw-r--r--	root/root	usr/share/midori/res/speeddial-head.html
-drwxr-xr-x	root/root	usr/share/vala/
-drwxr-xr-x	root/root	usr/share/vala/vapi/
--rw-r--r--	root/root	usr/share/vala/vapi/apps.deps
--rw-r--r--	root/root	usr/share/vala/vapi/apps.vapi
--rw-r--r--	root/root	usr/share/vala/vapi/delayed-load.deps
--rw-r--r--	root/root	usr/share/vala/vapi/delayed-load.vapi
--rw-r--r--	root/root	usr/share/vala/vapi/devpet.deps
--rw-r--r--	root/root	usr/share/vala/vapi/devpet.vapi
--rw-r--r--	root/root	usr/share/vala/vapi/external-download-manager.deps
--rw-r--r--	root/root	usr/share/vala/vapi/external-download-manager.vapi
--rw-r--r--	root/root	usr/share/vala/vapi/history-list.deps
--rw-r--r--	root/root	usr/share/vala/vapi/history-list.vapi
--rw-r--r--	root/root	usr/share/vala/vapi/nsplugin-manager.deps
--rw-r--r--	root/root	usr/share/vala/vapi/nsplugin-manager.vapi
--rw-r--r--	root/root	usr/share/vala/vapi/transfers.deps
--rw-r--r--	root/root	usr/share/vala/vapi/transfers.vapi
+drwxr-xr-x	root/root	usr/share/midori/res/tabby/
+-rw-r--r--	root/root	usr/share/midori/res/tabby/Create.sql
+-rw-r--r--	root/root	usr/share/midori/res/tabby/Update1.sql
diff --git a/midori/.md5sum b/midori/.md5sum
index 67149858e..405387766 100644
--- a/midori/.md5sum
+++ b/midori/.md5sum
@@ -1 +1 @@
-b99e87d4b73a4732ed1c1e591f0242ac  midori_0.5.5_all_.tar.bz2
+62ee86eb103b74efe71d40e343120a3c  midori_0.5.6_all_.tar.bz2
diff --git a/midori/Pkgfile b/midori/Pkgfile
index d4868de7f..60ab5d3b1 100644
--- a/midori/Pkgfile
+++ b/midori/Pkgfile
@@ -2,18 +2,25 @@
 # URL: http://www.midori-browser.org/
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Brett Goulder, predatorfreak at dcaf-security dot org
-# Depends on: libnotify librsvg vala webkit xorg-libxscrnsaver libunique
+# Depends on: cmake libnotify librsvg vala webkit xorg-libxscrnsaver libunique libzeitgeist
 
 name=midori
-version=0.5.5
+version=0.5.6
 release=1
 source=(http://www.midori-browser.org/downloads/${name}_${version}_all_.tar.bz2)
 
 build() {
 	cd $name-$version
-	local JOBS="$(sed -e 's/.*\(\-j[ 0-9]\+\) \{0,1\}.*/\1/' <<< $MAKEFLAGS)"
-	./configure --prefix=/usr --disable-zeitgeist $JOBS
+
+	install -d build
+	cd build
+
+	cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib
+
 	make
 	make DESTDIR=$PKG install
+
 	rm -r $PKG/usr/share/{doc,locale}
 }