wok rev 12082

Up: midori (0.4.4) - More search engines, use DDG by default with slitaz string and desktop file with fr
author Christophe Lincoln <pankso@slitaz.org>
date Fri Mar 09 14:58:49 2012 +0100 (2012-03-09)
parents 8b78d0838df0
children 0adddcc6b227
files midori/receipt midori/stuff/applications/midori-private.desktop midori/stuff/applications/midori.desktop midori/stuff/bookmarks.xbel midori/stuff/config midori/stuff/midori.desktop midori/stuff/search
line diff
     1.1 --- a/midori/receipt	Fri Mar 09 14:38:57 2012 +0100
     1.2 +++ b/midori/receipt	Fri Mar 09 14:58:49 2012 +0100
     1.3 @@ -1,16 +1,20 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="midori"
     1.7 -VERSION="0.4.3"
     1.8 +VERSION="0.4.4"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Light Web Browse using GTK+/WebKit."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.13 -DEPENDS="libsexy libwebkit libsoup sqlite xorg-libXdamage xorg-libXss gcc-lib-base libgnutls"
    1.14 -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"
    1.15  WEB_SITE="http://software.twotoasts.de/?page=midori"
    1.16  WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
    1.17  
    1.18 +DEPENDS="libsexy libwebkit libsoup sqlite xorg-libXdamage xorg-libXss \
    1.19 +gcc-lib-base libgnutls"
    1.20 +BUILD_DEPENDS="python libsexy-dev libwebkit-dev libsoup-dev sqlite-dev \
    1.21 +intltool libgio-dev dbus-dev dbus-glib-dev pkg-config xorg-libXss-dev \
    1.22 +xorg-libXdamage-dev xorg-libX11-dev gtk+-dev vala"
    1.23 +
    1.24  # Rules to configure and make the package.
    1.25  compile_rules()
    1.26  {
    1.27 @@ -32,13 +36,17 @@
    1.28  	mkdir -p \
    1.29  		$fs/usr/share/pixmaps \
    1.30  		$fs/usr/share/icons
    1.31 -	cp -a $_pkg/etc $fs
    1.32 +	cp -a $install/etc $fs
    1.33  	cp $stuff/config $fs/etc/xdg/midori
    1.34 -	cp $stuff/bookmarks.xbel $fs/etc/xdg/midori
    1.35 -	cp -a $_pkg/usr/bin $fs/usr
    1.36 -	cp -a $_pkg/usr/lib $fs/usr
    1.37 -	cp -a $_pkg/usr/share/$PACKAGE $fs/usr/share
    1.38 -	cp -a $_pkg/usr/share/icons/hicolor $fs/usr/share/icons
    1.39 +	cp $stuff/search $fs/etc/xdg/midori
    1.40 +	# Midori use sqlite to store bookmarks
    1.41 +	#cp $stuff/bookmarks.xbel $fs/etc/xdg/midori
    1.42 +	cp -a $install/usr/bin $fs/usr
    1.43 +	cp -a $install/usr/lib $fs/usr
    1.44 +	cp -a $install/usr/share/$PACKAGE $fs/usr/share
    1.45 +	# Icons
    1.46 +	cp -a $install/usr/share/icons/hicolor $fs/usr/share/icons
    1.47 +	rm -rf $fs/usr/share/icons/hicolor/scalable
    1.48  	cd $fs/usr/share/pixmaps
    1.49  	ln -s ../icons/hicolor/22x22/apps/midori.png  .
    1.50  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/midori/stuff/applications/midori-private.desktop	Fri Mar 09 14:58:49 2012 +0100
     2.3 @@ -0,0 +1,20 @@
     2.4 +[Desktop Entry]
     2.5 +Version=1.0
     2.6 +Type=Application
     2.7 +Name=Midori Private Browsing
     2.8 +Name[cs]=Midori - soukromé prohlížení
     2.9 +Name[da]=Midori Privat browsing
    2.10 +Name[fr]=Midori Navigation privée
    2.11 +Name[gl]=Midori, navegación privada
    2.12 +Name[he]=גלישה פרטית
    2.13 +Name[ko]=미도리 개인 정보 보호 모드
    2.14 +Name[nl]=Midori Privé-surfen
    2.15 +Name[pl]=Tryb prywatny przeglądarki Midori
    2.16 +Name[pt_BR]=Midori Navegação privada
    2.17 +Name[zh_CN]=Midori 浏览器隐私浏览方式
    2.18 +Name[zh_TW]=Midori 私密瀏覽
    2.19 +Categories=GTK;Network;WebBrowser;
    2.20 +Exec=midori --private %U
    2.21 +Icon=midori
    2.22 +Terminal=false
    2.23 +StartupNotify=true
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/midori/stuff/applications/midori.desktop	Fri Mar 09 14:58:49 2012 +0100
     3.3 @@ -0,0 +1,13 @@
     3.4 +[Desktop Entry]
     3.5 +Version=1.0
     3.6 +Type=Application
     3.7 +Name=Midori Web Browser
     3.8 +Name[de]=Netznavigator Midori
     3.9 +Name[fr]=Navigateur Web Midori
    3.10 +Name[pt_PT]=Navegador Web Midori
    3.11 +Categories=GTK;Network;
    3.12 +MimeType=text/html;text/xml;application/xhtml+xml;application/xml;
    3.13 +Exec=midori %u
    3.14 +Icon=midori
    3.15 +Terminal=false
    3.16 +StartupNotify=true
     4.1 --- a/midori/stuff/bookmarks.xbel	Fri Mar 09 14:38:57 2012 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,32 +0,0 @@
     4.4 -<?xml version="1.0" encoding="UTF-8"?>
     4.5 -<!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">
     4.6 -<xbel version="1.0" xmlns:midori="http://www.twotoasts.de">
     4.7 -<bookmark href="http://www.slitaz.org/">
     4.8 -<title>‪SliTaz GNU/Linux</title>
     4.9 -<desc></desc>
    4.10 -<info>
    4.11 -<metadata owner="http://www.twotoasts.de"/>
    4.12 -</info>
    4.13 -</bookmark>
    4.14 -<bookmark href="http://pkgs.slitaz.org/">
    4.15 -<title>‪SliTaz Packages</title>
    4.16 -<desc></desc>
    4.17 -<info>
    4.18 -<metadata owner="http://www.twotoasts.de"/>
    4.19 -</info>
    4.20 -</bookmark>
    4.21 -<bookmark href="http://twitter.com/slitaz">
    4.22 -<title>‪SliTaz on Twitter</title>
    4.23 -<desc></desc>
    4.24 -<info>
    4.25 -<metadata owner="http://www.twotoasts.de"/>
    4.26 -</info>
    4.27 -</bookmark>
    4.28 -<bookmark href="http://distrowatch.com/table.php?distribution=slitaz">
    4.29 -<title>SliTaz on ‪DistroWatch</title>
    4.30 -<desc></desc>
    4.31 -<info>
    4.32 -<metadata owner="http://www.twotoasts.de"/>
    4.33 -</info>
    4.34 -</bookmark>
    4.35 -</xbel>
     5.1 --- a/midori/stuff/config	Fri Mar 09 14:38:57 2012 +0100
     5.2 +++ b/midori/stuff/config	Fri Mar 09 14:58:49 2012 +0100
     5.3 @@ -4,6 +4,9 @@
     5.4  last-window-height=580
     5.5  show-menubar=true
     5.6  toolbar-style=MIDORI_TOOLBAR_SMALL_ICONS
     5.7 -toolbar-items=Back,Forward,ReloadStop,Homepage,TabNew,Location
     5.8 +toolbar-items=Back,Forward,ReloadStop,Homepage,TabNew,Location,Search,
     5.9  load-on-startup=MIDORI_STARTUP_HOMEPAGE
    5.10  homepage=file:///usr/share/webhome/index.html
    5.11 +
    5.12 +[extensions]
    5.13 +libtoolbar-editor.so=true
     6.1 --- a/midori/stuff/midori.desktop	Fri Mar 09 14:38:57 2012 +0100
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,13 +0,0 @@
     6.4 -[Desktop Entry]
     6.5 -Version=1.0
     6.6 -Type=Application
     6.7 -Name=Midori Web Browser
     6.8 -Name[de]=Netznavigator Midori
     6.9 -Name[fr]=Navigateur Web Midori
    6.10 -Name[pt_PT]=Navegador Web Midori
    6.11 -Categories=GTK;Network;
    6.12 -MimeType=text/html;text/xml;application/xhtml+xml;application/xml;
    6.13 -Exec=midori %u
    6.14 -Icon=midori
    6.15 -Terminal=false
    6.16 -StartupNotify=true
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/midori/stuff/search	Fri Mar 09 14:58:49 2012 +0100
     7.3 @@ -0,0 +1,41 @@
     7.4 +[Duck Duck Go]
     7.5 +name=Duck Duck Go
     7.6 +text=Privacy-aware Web Search
     7.7 +uri=https://duckduckgo.com/?q=%s&t=slitaz
     7.8 +token=dd
     7.9 +
    7.10 +[Google]
    7.11 +name=Google
    7.12 +text=Web Search
    7.13 +uri=http://www.google.com/search?q=%s
    7.14 +token=g
    7.15 +
    7.16 +[Twitter]
    7.17 +name=Twitter
    7.18 +text=Twitter Search
    7.19 +uri=https://twitter.com/#!/search/realtime/%s
    7.20 +token=tt
    7.21 +
    7.22 +[Wikipedia]
    7.23 +name=Wikipedia
    7.24 +text=The free encyclopedia
    7.25 +uri=http://en.wikipedia.org/wiki/Special:Search/%s
    7.26 +token=wp
    7.27 +
    7.28 +[SliTaz]
    7.29 +name=SliTaz
    7.30 +text=SliTaz Search
    7.31 +uri=http://www.google.com/cse?cx=000868395082919927601:nddq7yjdcxg&cof=FORID:0&q=%s
    7.32 +token=s
    7.33 +
    7.34 +[TheFreeDictionary]
    7.35 +name=The Free Dictionary
    7.36 +text=Dictionary, Encyclopedia and Thesaurus
    7.37 +uri=http://www.thefreedictionary.com/%s
    7.38 +token=fd
    7.39 +
    7.40 +[Yahoo]
    7.41 +name=Yahoo
    7.42 +text=Yahoo Web Search
    7.43 +uri=http://search.yahoo.com/search?p=
    7.44 +token=y