midori 0.4.1-1 maj port

5 files changed, 34 insertions, 14 deletions

diff --git a/extra/midori/.footprint.i686 b/extra/midori/.footprint.i686
index 90448da85..0f3967a6d 100644
--- a/extra/midori/.footprint.i686
+++ b/extra/midori/.footprint.i686
@@ -8,6 +8,10 @@ drwxr-xr-x	root/root	etc/xdg/midori/extensions/libadblock.so/
 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.4/
+drwxr-xr-x	root/root	usr/include/midori-0.4/extensions/
+-rw-r--r--	root/root	usr/include/midori-0.4/extensions/history-list.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/midori/
 -rw-r--r--	root/root	usr/lib/midori/libadblock.so
@@ -17,6 +21,7 @@ drwxr-xr-x	root/root	usr/lib/midori/
 -rw-r--r--	root/root	usr/lib/midori/libcopy-tabs.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/libshortcuts.so
 -rw-r--r--	root/root	usr/lib/midori/libstatus-clock.so
@@ -27,6 +32,7 @@ drwxr-xr-x	root/root	usr/lib/midori/
 -rw-r--r--	root/root	usr/lib/midori/libweb-cache.so
 drwxr-xr-x	root/root	usr/share/
 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/doc/
 drwxr-xr-x	root/root	usr/share/doc/midori/
@@ -37,6 +43,7 @@ drwxr-xr-x	root/root	usr/share/doc/midori/
 -rw-r--r--	root/root	usr/share/doc/midori/README
 -rw-r--r--	root/root	usr/share/doc/midori/faq.css
 -rw-r--r--	root/root	usr/share/doc/midori/faq.html
+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/
@@ -91,5 +98,8 @@ drwxr-xr-x	root/root	usr/share/midori/res/
 -rw-r--r--	root/root	usr/share/midori/res/autosuggestcontrol.js
 -rw-r--r--	root/root	usr/share/midori/res/error.html
 -rw-r--r--	root/root	usr/share/midori/res/logo-shade.png
--rw-r--r--	root/root	usr/share/midori/res/mootools.js
 -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/history-list.deps
+-rw-r--r--	root/root	usr/share/vala/vapi/history-list.vapi
diff --git a/extra/midori/.footprint.x86_64 b/extra/midori/.footprint.x86_64
index 90448da85..0f3967a6d 100644
--- a/extra/midori/.footprint.x86_64
+++ b/extra/midori/.footprint.x86_64
@@ -8,6 +8,10 @@ drwxr-xr-x	root/root	etc/xdg/midori/extensions/libadblock.so/
 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.4/
+drwxr-xr-x	root/root	usr/include/midori-0.4/extensions/
+-rw-r--r--	root/root	usr/include/midori-0.4/extensions/history-list.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/midori/
 -rw-r--r--	root/root	usr/lib/midori/libadblock.so
@@ -17,6 +21,7 @@ drwxr-xr-x	root/root	usr/lib/midori/
 -rw-r--r--	root/root	usr/lib/midori/libcopy-tabs.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/libshortcuts.so
 -rw-r--r--	root/root	usr/lib/midori/libstatus-clock.so
@@ -27,6 +32,7 @@ drwxr-xr-x	root/root	usr/lib/midori/
 -rw-r--r--	root/root	usr/lib/midori/libweb-cache.so
 drwxr-xr-x	root/root	usr/share/
 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/doc/
 drwxr-xr-x	root/root	usr/share/doc/midori/
@@ -37,6 +43,7 @@ drwxr-xr-x	root/root	usr/share/doc/midori/
 -rw-r--r--	root/root	usr/share/doc/midori/README
 -rw-r--r--	root/root	usr/share/doc/midori/faq.css
 -rw-r--r--	root/root	usr/share/doc/midori/faq.html
+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/
@@ -91,5 +98,8 @@ drwxr-xr-x	root/root	usr/share/midori/res/
 -rw-r--r--	root/root	usr/share/midori/res/autosuggestcontrol.js
 -rw-r--r--	root/root	usr/share/midori/res/error.html
 -rw-r--r--	root/root	usr/share/midori/res/logo-shade.png
--rw-r--r--	root/root	usr/share/midori/res/mootools.js
 -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/history-list.deps
+-rw-r--r--	root/root	usr/share/vala/vapi/history-list.vapi
diff --git a/extra/midori/.md5sum.i686 b/extra/midori/.md5sum.i686
index 8d4e6dcb4..b55bf6720 100644
--- a/extra/midori/.md5sum.i686
+++ b/extra/midori/.md5sum.i686
@@ -1 +1 @@
-c4cb0686601b1c470c317de3d3f8e8fd  midori-0.3.6.tar.bz2
+33dde203cd71ae2b1d2adcc7f5739f65  midori-0.4.1.tar.bz2
diff --git a/extra/midori/.md5sum.x86_64 b/extra/midori/.md5sum.x86_64
index 8d4e6dcb4..b55bf6720 100644
--- a/extra/midori/.md5sum.x86_64
+++ b/extra/midori/.md5sum.x86_64
@@ -1 +1 @@
-c4cb0686601b1c470c317de3d3f8e8fd  midori-0.3.6.tar.bz2
+33dde203cd71ae2b1d2adcc7f5739f65  midori-0.4.1.tar.bz2
diff --git a/extra/midori/Pkgfile b/extra/midori/Pkgfile
index e0b46cb5d..969b72b72 100755
--- a/extra/midori/Pkgfile
+++ b/extra/midori/Pkgfile
@@ -2,11 +2,11 @@
 # URL: http://www.twotoasts.de/index.php?/pages/midori_summary.html
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: atk, cairo, desktop-file-utils, enchant, fontconfig, gtk, gnutls, gstreamer, hicolor-icon-theme, intltool, libgcrypt, libgpg-error, libtasn1, libsoup, libunique, libxml2,  webkit, xdg-utils, librsvg, hunspell, xorg-libxt,nettle
-# Run on: atk,cairo,dbus,dbus-glib,expat,fontconfig,glitz,gtk,libnotify,libsoup,libunique,libxml2,pango,webkit,nettle
+# Depends on: atk, cairo, desktop-file-utils, enchant, fontconfig, gtk3, gnutls, gstreamer, hicolor-icon-theme, intltool, libgcrypt, libgpg-error, libtasn1, libsoup, libxml2,  webkit, xdg-utils, librsvg, hunspell, xorg-libxt,nettle,vala
+# Run on: atk,cairo,dbus,dbus-glib,expat,fontconfig,glitz,gtk3,libnotify,libsoup,libxml2,pango,webkit,nettle
 
 name=midori
-version=0.3.6
+version=0.4.1
 release=1
 source=(http://archive.xfce.org/src/apps/$name/0.3/$name-$version.tar.bz2)
 
@@ -16,13 +16,13 @@ build() {
 	sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
 
 	./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
-	    --enable-libidn \
-	    --enable-addons \
-	    --disable-hildon \
-	    --disable-vala \
-	    --enable-unique \
-	    --enable-nls
-    	make
+    		--enable-addons \
+		--disable-hildon \
+		--disable-unique \
+		--enable-nls \
+		--enable-docs \
+		--enable-apidocs
+	make
    	 make DESTDIR=$PKG install
 }