# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1331301529 -3600
# Node ID 0a352dc005b7508b6edb2f26ee623f469abc40a7
# Parent  8b78d0838df0cbcec32e700f2ab72e8b6ab438a4
Up: midori (0.4.4) - More search engines, use DDG by default with slitaz string and desktop file with fr

diff -r 8b78d0838df0 -r 0a352dc005b7 midori/receipt
--- a/midori/receipt	Fri Mar 09 14:38:57 2012 +0100
+++ b/midori/receipt	Fri Mar 09 14:58:49 2012 +0100
@@ -1,16 +1,20 @@
 # SliTaz package receipt.
 
 PACKAGE="midori"
-VERSION="0.4.3"
+VERSION="0.4.4"
 CATEGORY="x-window"
 SHORT_DESC="Light Web Browse using GTK+/WebKit."
 MAINTAINER="pankso@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-DEPENDS="libsexy libwebkit libsoup sqlite xorg-libXdamage xorg-libXss gcc-lib-base libgnutls"
-BUILD_DEPENDS="python libsexy-dev libsexy libwebkit-dev libsoup-dev sqlite-dev intltool libgio-dev dbus-dev dbus-glib-dev pkg-config xorg-libXss xorg-libXss-dev xorg-libXdamage-dev xorg-libX11-dev gtk+-dev vala"
 WEB_SITE="http://software.twotoasts.de/?page=midori"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
+DEPENDS="libsexy libwebkit libsoup sqlite xorg-libXdamage xorg-libXss \
+gcc-lib-base libgnutls"
+BUILD_DEPENDS="python libsexy-dev libwebkit-dev libsoup-dev sqlite-dev \
+intltool libgio-dev dbus-dev dbus-glib-dev pkg-config xorg-libXss-dev \
+xorg-libXdamage-dev xorg-libX11-dev gtk+-dev vala"
+
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -32,13 +36,17 @@
 	mkdir -p \
 		$fs/usr/share/pixmaps \
 		$fs/usr/share/icons
-	cp -a $_pkg/etc $fs
+	cp -a $install/etc $fs
 	cp $stuff/config $fs/etc/xdg/midori
-	cp $stuff/bookmarks.xbel $fs/etc/xdg/midori
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/lib $fs/usr
-	cp -a $_pkg/usr/share/$PACKAGE $fs/usr/share
-	cp -a $_pkg/usr/share/icons/hicolor $fs/usr/share/icons
+	cp $stuff/search $fs/etc/xdg/midori
+	# Midori use sqlite to store bookmarks
+	#cp $stuff/bookmarks.xbel $fs/etc/xdg/midori
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/lib $fs/usr
+	cp -a $install/usr/share/$PACKAGE $fs/usr/share
+	# Icons
+	cp -a $install/usr/share/icons/hicolor $fs/usr/share/icons
+	rm -rf $fs/usr/share/icons/hicolor/scalable
 	cd $fs/usr/share/pixmaps
 	ln -s ../icons/hicolor/22x22/apps/midori.png  .
 }
diff -r 8b78d0838df0 -r 0a352dc005b7 midori/stuff/applications/midori-private.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/midori/stuff/applications/midori-private.desktop	Fri Mar 09 14:58:49 2012 +0100
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Midori Private Browsing
+Name[cs]=Midori - soukromé prohlížení
+Name[da]=Midori Privat browsing
+Name[fr]=Midori Navigation privée
+Name[gl]=Midori, navegación privada
+Name[he]=גלישה פרטית
+Name[ko]=미도리 개인 정보 보호 모드
+Name[nl]=Midori Privé-surfen
+Name[pl]=Tryb prywatny przeglądarki Midori
+Name[pt_BR]=Midori Navegação privada
+Name[zh_CN]=Midori 浏览器隐私浏览方式
+Name[zh_TW]=Midori 私密瀏覽
+Categories=GTK;Network;WebBrowser;
+Exec=midori --private %U
+Icon=midori
+Terminal=false
+StartupNotify=true
diff -r 8b78d0838df0 -r 0a352dc005b7 midori/stuff/applications/midori.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/midori/stuff/applications/midori.desktop	Fri Mar 09 14:58:49 2012 +0100
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Midori Web Browser
+Name[de]=Netznavigator Midori
+Name[fr]=Navigateur Web Midori
+Name[pt_PT]=Navegador Web Midori
+Categories=GTK;Network;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;
+Exec=midori %u
+Icon=midori
+Terminal=false
+StartupNotify=true
diff -r 8b78d0838df0 -r 0a352dc005b7 midori/stuff/bookmarks.xbel
--- a/midori/stuff/bookmarks.xbel	Fri Mar 09 14:38:57 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xbel PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML" "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd">
-<xbel version="1.0" xmlns:midori="http://www.twotoasts.de">
-<bookmark href="http://www.slitaz.org/">
-<title>‪SliTaz GNU/Linux</title>
-<desc></desc>
-<info>
-<metadata owner="http://www.twotoasts.de"/>
-</info>
-</bookmark>
-<bookmark href="http://pkgs.slitaz.org/">
-<title>‪SliTaz Packages</title>
-<desc></desc>
-<info>
-<metadata owner="http://www.twotoasts.de"/>
-</info>
-</bookmark>
-<bookmark href="http://twitter.com/slitaz">
-<title>‪SliTaz on Twitter</title>
-<desc></desc>
-<info>
-<metadata owner="http://www.twotoasts.de"/>
-</info>
-</bookmark>
-<bookmark href="http://distrowatch.com/table.php?distribution=slitaz">
-<title>SliTaz on ‪DistroWatch</title>
-<desc></desc>
-<info>
-<metadata owner="http://www.twotoasts.de"/>
-</info>
-</bookmark>
-</xbel>
diff -r 8b78d0838df0 -r 0a352dc005b7 midori/stuff/config
--- a/midori/stuff/config	Fri Mar 09 14:38:57 2012 +0100
+++ b/midori/stuff/config	Fri Mar 09 14:58:49 2012 +0100
@@ -4,6 +4,9 @@
 last-window-height=580
 show-menubar=true
 toolbar-style=MIDORI_TOOLBAR_SMALL_ICONS
-toolbar-items=Back,Forward,ReloadStop,Homepage,TabNew,Location
+toolbar-items=Back,Forward,ReloadStop,Homepage,TabNew,Location,Search,
 load-on-startup=MIDORI_STARTUP_HOMEPAGE
 homepage=file:///usr/share/webhome/index.html
+
+[extensions]
+libtoolbar-editor.so=true
diff -r 8b78d0838df0 -r 0a352dc005b7 midori/stuff/midori.desktop
--- a/midori/stuff/midori.desktop	Fri Mar 09 14:38:57 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Midori Web Browser
-Name[de]=Netznavigator Midori
-Name[fr]=Navigateur Web Midori
-Name[pt_PT]=Navegador Web Midori
-Categories=GTK;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;
-Exec=midori %u
-Icon=midori
-Terminal=false
-StartupNotify=true
diff -r 8b78d0838df0 -r 0a352dc005b7 midori/stuff/search
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/midori/stuff/search	Fri Mar 09 14:58:49 2012 +0100
@@ -0,0 +1,41 @@
+[Duck Duck Go]
+name=Duck Duck Go
+text=Privacy-aware Web Search
+uri=https://duckduckgo.com/?q=%s&t=slitaz
+token=dd
+
+[Google]
+name=Google
+text=Web Search
+uri=http://www.google.com/search?q=%s
+token=g
+
+[Twitter]
+name=Twitter
+text=Twitter Search
+uri=https://twitter.com/#!/search/realtime/%s
+token=tt
+
+[Wikipedia]
+name=Wikipedia
+text=The free encyclopedia
+uri=http://en.wikipedia.org/wiki/Special:Search/%s
+token=wp
+
+[SliTaz]
+name=SliTaz
+text=SliTaz Search
+uri=http://www.google.com/cse?cx=000868395082919927601:nddq7yjdcxg&cof=FORID:0&q=%s
+token=s
+
+[TheFreeDictionary]
+name=The Free Dictionary
+text=Dictionary, Encyclopedia and Thesaurus
+uri=http://www.thefreedictionary.com/%s
+token=fd
+
+[Yahoo]
+name=Yahoo
+text=Yahoo Web Search
+uri=http://search.yahoo.com/search?p=
+token=y