SliTaz Repositories

     1.1 --- a/gtk-clearlooks/receipt	Wed Aug 23 17:19:53 2017 +0300
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,28 +0,0 @@
     1.4 -# SliTaz package receipt.
     1.5 -
     1.6 -PACKAGE="gtk-clearlooks"
     1.7 -VERSION="2.20.2"
     1.8 -CATEGORY="x-window"
     1.9 -SHORT_DESC="Updated default GTKengine, with ajustable colors."
    1.10 -MAINTAINER="psychomaniak@xakep.ru"
    1.11 -LICENSE="GPL2"
    1.12 -WEB_SITE="http://linuxfromscratch.org/blfs/view/svn/x/gtk-engines.html"
    1.13 -WANTED="gtk-engines"
    1.14 -
    1.15 -DEPENDS="gtk+"
    1.16 -
    1.17 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.18 -genpkg_rules()
    1.19 -{
    1.20 -	THEME="usr/share/themes/Clearlooks/gtk-2.0"
    1.21 -	ENGINE="usr/lib/gtk-2.0/2.10.0/engines"
    1.22 -	XML="usr/share/gtk-engines"
    1.23 -	
    1.24 -	cd $fs && mkdir -p $THEME $ENGINE $XML
    1.25 -	cp -a $install/$ENGINE/libclearlooks.so	$fs/$ENGINE
    1.26 -	cp -a $install/$THEME/gtkrc		$fs/$THEME
    1.27 -	cp -a $install/$XML/clearlooks.xml	$fs/$XML
    1.28 -	
    1.29 -	sed -i '/lang/d' $fs/$XML/*
    1.30 -}
    1.31 -

     2.1 --- a/gtk-engines/receipt	Wed Aug 23 17:19:53 2017 +0300
     2.2 +++ b/gtk-engines/receipt	Fri Aug 25 15:45:11 2017 +0300
     2.3 @@ -1,33 +1,43 @@
     2.4 -# SliTaz package receipt.
     2.5 +# SliTaz package receipt v2.
     2.6  
     2.7  PACKAGE="gtk-engines"
     2.8  VERSION="2.20.2"
     2.9  CATEGORY="customization"
    2.10 -SHORT_DESC="All standart GTK+2 engines for themes"
    2.11 +SHORT_DESC="Standard GTK+2 theme engines"
    2.12  MAINTAINER="psychomaniak@xakep.ru"
    2.13  LICENSE="GPL2"
    2.14 +WEB_SITE="http://linuxfromscratch.org/blfs/view/svn/x/gtk-engines.html"
    2.15 +
    2.16  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.17 -WEB_SITE="http://linuxfromscratch.org/blfs/view/svn/x/gtk-engines.html"
    2.18  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
    2.19  
    2.20 -DEPENDS="gtk+ xorg-libXdamage"
    2.21 -BUILD_DEPENDS="pkg-config file gtk+-dev"
    2.22 +BUILD_DEPENDS="file gtk+-dev intltool"
    2.23 +SPLIT="gtk-clearlooks gtk-engines gtk-engines-dev"
    2.24  
    2.25  # Rules to configure and make the package.
    2.26  compile_rules()
    2.27  {
    2.28 -	./configure && make && make install
    2.29 +	./configure $CONFIGURE_ARGS && make && make install
    2.30  }
    2.31  
    2.32  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.33  genpkg_rules()
    2.34  {
    2.35 -	cp -a $install/* $fs && rm -rf $fs/usr/share/locale
    2.36 -	rm $fs/usr/lib/gtk-2.0/2.10.0/engines/*.la
    2.37 -	cd $fs/usr/share/$PACKAGE ; sed -i '/lang/d' *
    2.38 -	
    2.39 -	# This clearlooks is 5(!) years newer (+~100Kb)
    2.40 -	# but there are bugs with default slitaz gtk themes
    2.41 -	find $fs -regex '.*\(clearlooks\|Clearlooks\).*' \
    2.42 -	-exec ls -l {} \; -delete
    2.43 +	case $PACKAGE in
    2.44 +		gtk-clearlooks)
    2.45 +			copy libclearlooks.so Clearlooks/ clearlooks.xml
    2.46 +			sed -i '/xml:lang=/d' $fs/usr/share/gtk-engines/*.xml
    2.47 +			CAT="x-window|default gtk-engine, with ajustable colors"
    2.48 +			DEPENDS="gtk+"
    2.49 +			;;
    2.50 +		gtk-engines)
    2.51 +			copy @std
    2.52 +			remove_already_packed
    2.53 +			sed -i '/xml:lang=/d' $fs/usr/share/gtk-engines/*.xml
    2.54 +			DEPENDS="gtk+ xorg-libXdamage"
    2.55 +			;;
    2.56 +		*-dev)
    2.57 +			copy @dev
    2.58 +			;;
    2.59 +	esac
    2.60  }

     3.1 --- a/lxde/receipt	Wed Aug 23 17:19:53 2017 +0300
     3.2 +++ b/lxde/receipt	Fri Aug 25 15:45:11 2017 +0300
     3.3 @@ -1,4 +1,4 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="lxde"
     3.8  VERSION="0.3.2.1"
     3.9 @@ -7,14 +7,8 @@
    3.10  MAINTAINER="pankso@slitaz.org"
    3.11  LICENSE="GPL2"
    3.12  WEB_SITE="http://lxde.org/"
    3.13 -TAGS="LXDE window-manager desktop"
    3.14  HOST_ARCH="i486 arm"
    3.15  
    3.16 -SUGGESTED="lxterminal lxdm lxshortcut xarchiver"
    3.17 -DEPENDS="xorg-libX11 gtk+ lxpanel lxtask lxappearance lxsession pcmanfm \
    3.18 -lxsession-edit lxrandr lxinput openbox obconf gpicview leafpad slitaz-configs \
    3.19 -slitaz-tools-boxes"
    3.20 -
    3.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.22  genpkg_rules()
    3.23  {
    3.24 @@ -24,22 +18,24 @@
    3.25  	cp -a $stuff/xsessions $fs/usr/share
    3.26  	cp -a $stuff/lxde-logout.desktop $fs/usr/share/applications
    3.27  	chown -R 0.0 $fs
    3.28 +
    3.29 +	TAGS="LXDE window-manager desktop"
    3.30 +	SUGGESTED="lxterminal lxdm lxshortcut xarchiver"
    3.31 +	DEPENDS="xorg-libX11 gtk+ lxpanel lxtask lxappearance lxsession pcmanfm \
    3.32 +	lxsession-edit lxrandr lxinput openbox obconf gpicview leafpad \
    3.33 +	slitaz-configs slitaz-tools-boxes"
    3.34  }
    3.35  
    3.36  # Add WM to SLIM available sessions.
    3.37 -post_install()
    3.38 -{
    3.39 +post_install() {
    3.40  	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
    3.41  	if ! echo "$res" | grep -q $PACKAGE; then
    3.42 -		echo -n "Adding $PACKAGE to /etc/slim.conf..."
    3.43 -		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
    3.44 -		status
    3.45 +		sed -i "s/^sessions.*/sessions            $res,$PACKAGE/" "$1/etc/slim.conf"
    3.46  	fi
    3.47  }
    3.48  
    3.49  # Remove WM from SLIM available sessions.
    3.50 -post_remove()
    3.51 -{
    3.52 +post_remove() {
    3.53  	if grep -q $PACKAGE $root/etc/slim.conf; then
    3.54  		sed -i s/,$PACKAGE// "$1/etc/slim.conf"
    3.55  	fi

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/sakura-gtk2/description.txt	Fri Aug 25 15:45:11 2017 +0300
     4.3 @@ -0,0 +1,6 @@
     4.4 +Sakura is a terminal emulator based just on GTK and VTE. It's a terminal
     4.5 +emulator with few dependencies, so you don't need a full GNOME desktop
     4.6 +installed to have a decent terminal emulator. Some of the terminal emulators
     4.7 +based on VTE are gnome-terminal, XFCE Terminal, TermIt, etc. Sakura just uses
     4.8 +a notebook to provide several terminals in one window and adds a contextual
     4.9 +menu with some basic options. No more no less.

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/sakura-gtk2/receipt	Fri Aug 25 15:45:11 2017 +0300
     5.3 @@ -0,0 +1,44 @@
     5.4 +# SliTaz package receipt v2.
     5.5 +
     5.6 +PACKAGE="sakura-gtk2"
     5.7 +VERSION="2.4.2" # last sakura with gtk+2 is 2.4.2
     5.8 +CATEGORY="utilities"
     5.9 +SHORT_DESC="Simple GTK+2 and VTE-based terminal emulator"
    5.10 +MAINTAINER="pankso@slitaz.org"
    5.11 +LICENSE="GPL2"
    5.12 +WEB_SITE="http://www.pleyades.net/david/projects/sakura"
    5.13 +HOST_ARCH="i486 arm"
    5.14 +
    5.15 +TARBALL="sakura-$VERSION.tar.bz2"
    5.16 +WGET_URL="https://launchpad.net/sakura/trunk/$VERSION/+download/$TARBALL"
    5.17 +
    5.18 +BUILD_DEPENDS_arm="gtk+-dev vte-dev xorg-libXdamage-dev xorg-libXi-dev"
    5.19 +BUILD_DEPENDS="cmake glib-dev gtk+-dev vte-gtk2-dev gettext"
    5.20 +
    5.21 +# Rules to configure and make the package.
    5.22 +compile_rules()
    5.23 +{
    5.24 +	cmake \
    5.25 +		-DCMAKE_INSTALL_PREFIX=/usr \
    5.26 +		-DCMAKE_BUILD_TYPE=RELEASE \
    5.27 +		-Wno-dev \
    5.28 +		. &&
    5.29 +	sed -i 's/$/ -lncurses/' CMakeFiles/sakura.dir/link.txt &&
    5.30 +	sed -i 's/-u//' CMakeLists.txt &&
    5.31 +	sed -i 's/-u//' CMakeFiles/man.dir/build.make &&
    5.32 +	make &&
    5.33 +	make DESTDIR=$DESTDIR install || exit 1
    5.34 +
    5.35 +	cp -f $stuff/sakura.desktop $install/usr/share/applications
    5.36 +	rm -rf $install/usr/share/pixmaps
    5.37 +}
    5.38 +
    5.39 +# Rules to gen a SliTaz package suitable for Tazpkg.
    5.40 +genpkg_rules()
    5.41 +{
    5.42 +	copy @std
    5.43 +	TAGS="terminal"
    5.44 +	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango vte-gtk2 \
    5.45 +	xorg-libX11 xorg-libXext"
    5.46 +	PROVIDE="sakura"
    5.47 +}

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/sakura-gtk2/stuff/patches/fr.po.patch	Fri Aug 25 15:45:11 2017 +0300
     6.3 @@ -0,0 +1,40 @@
     6.4 +--- a/po/fr.po
     6.5 ++++ b/po/fr.po
     6.6 +@@ -29,6 +29,6 @@
     6.7 + msgid "Execute command"
     6.8 +-msgstr "Exécuter une command"
     6.9 ++msgstr "Exécuter une commande"
    6.10 + 
    6.11 + msgid "Execute command (xterm compatible)"
    6.12 +-msgstr ""
    6.13 ++msgstr "Exécuter une commande (compatible xterm)"
    6.14 + 
    6.15 +@@ -50,6 +50,6 @@
    6.16 + msgid "X geometry specification"
    6.17 +-msgstr ""
    6.18 ++msgstr "Dimension & position X"
    6.19 + 
    6.20 + msgid "Configuration has been modified by another proccess. Overwrite?"
    6.21 +-msgstr ""
    6.22 ++msgstr "La configuration a été modifiée par un autre processus. L'écraser ?"
    6.23 + 
    6.24 +@@ -71,3 +71,3 @@
    6.25 + msgid "Tab new text"
    6.26 +-msgstr ""
    6.27 ++msgstr "Nouveau titre de l'onglet"
    6.28 + 
    6.29 +@@ -116,3 +116,3 @@
    6.30 + msgid "New window"
    6.31 +-msgstr ""
    6.32 ++msgstr "Nouvelle fenêtre"
    6.33 + 
    6.34 +@@ -152,3 +152,3 @@
    6.35 + msgid "Always show tab bar"
    6.36 +-msgstr ""
    6.37 ++msgstr "Toujours afficher la barre d'onglet"
    6.38 + 
    6.39 +@@ -170,3 +170,3 @@
    6.40 + msgid "Borderless and maximized"
    6.41 +-msgstr ""
    6.42 ++msgstr "Taille maximum sans bords"
    6.43 + 

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/sakura-gtk2/stuff/patches/ru.po.patch	Fri Aug 25 15:45:11 2017 +0300
     7.3 @@ -0,0 +1,80 @@
     7.4 +Update translations
     7.5 +
     7.6 +--- a/po/ru.po
     7.7 ++++ b/po/ru.po
     7.8 +@@ -32,7 +32,7 @@
     7.9 + msgstr "Логин shell"
    7.10 + 
    7.11 + msgid "Set window title"
    7.12 +-msgstr "Изменение заголовка окна"
    7.13 ++msgstr "Изменить заголовок окна"
    7.14 + 
    7.15 + msgid "Set columns number"
    7.16 + msgstr "Установить число столбцов"
    7.17 +@@ -44,10 +44,10 @@
    7.18 + msgstr "Удерживать окно после выполнения команды"
    7.19 + 
    7.20 + msgid "X geometry specification"
    7.21 +-msgstr "Определение геометрии окна X"
    7.22 ++msgstr "Указать геометрию окна X (ШxВ)"
    7.23 + 
    7.24 + msgid "Configuration has been modified by another proccess. Overwrite?"
    7.25 +-msgstr "Настройки могут быть изменены в другом процессе. Перезаписать?"
    7.26 ++msgstr "Настройки были изменены другим процессом. Перезаписать?"
    7.27 + 
    7.28 + msgid ""
    7.29 + "There are running processes.\n"
    7.30 +@@ -56,19 +56,19 @@
    7.31 + msgstr ""
    7.32 + "Не все процессы завершены.\n"
    7.33 + "\n"
    7.34 +-"Вы уверены, что хотите выйти из программы?"
    7.35 ++"Вы уверены, что хотите закрыть Sakura?"
    7.36 + 
    7.37 + msgid "Select font"
    7.38 + msgstr "Выбор шрифта"
    7.39 + 
    7.40 + msgid "Set name"
    7.41 +-msgstr "Изменение заголовка вкладки"
    7.42 ++msgstr "Изменить заголовок вкладки"
    7.43 + 
    7.44 + msgid "Tab new text"
    7.45 +-msgstr "Новоый заголовок:"
    7.46 ++msgstr "Новый заголовок"
    7.47 + 
    7.48 + msgid "Select color"
    7.49 +-msgstr "Выбор цвета"
    7.50 ++msgstr "Выбрать цвета"
    7.51 + 
    7.52 + msgid "Select foreground color:"
    7.53 + msgstr "Цвет текста:"
    7.54 +@@ -86,7 +86,7 @@
    7.55 + msgstr "Отключить прозрачность"
    7.56 + 
    7.57 + msgid "New window title"
    7.58 +-msgstr "Новый заголовок:"
    7.59 ++msgstr "Новый заголовок"
    7.60 + 
    7.61 + msgid "Select a background file"
    7.62 + msgstr "Выбор файла с фоновым рисунком"
    7.63 +@@ -96,9 +96,9 @@
    7.64 + "\n"
    7.65 + "Do you really want to close it?"
    7.66 + msgstr ""
    7.67 +-"Не все процессы завершены.\n"
    7.68 ++"В этом терминале продолжает работать процесс.\n"
    7.69 + "\n"
    7.70 +-"Вы уверены, что хотите выйти из программы?"
    7.71 ++"Вы уверены, что хотите закрыть его?"
    7.72 + 
    7.73 + msgid "Open link..."
    7.74 + msgstr "Открыть ссылку..."
    7.75 +@@ -164,7 +164,7 @@
    7.76 + msgstr "Мигающий курсор"
    7.77 + 
    7.78 + msgid "Borderless and maximized"
    7.79 +-msgstr "На весь экран без рамки."
    7.80 ++msgstr "На весь экран без рамки"
    7.81 + 
    7.82 + msgid "Input methods"
    7.83 + msgstr "Методы ввода"

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/sakura-gtk2/stuff/patches/sakura-icon.patch	Fri Aug 25 15:45:11 2017 +0300
     8.3 @@ -0,0 +1,22 @@
     8.4 +Set Freedesktop standard icon
     8.5 +
     8.6 +--- a/src/sakura.c
     8.7 ++++ b/src/sakura.c
     8.8 +@@ -210,7 +210,7 @@
     8.9 + };
    8.10 + 
    8.11 + 
    8.12 +-#define ICON_FILE "terminal-tango.svg"
    8.13 ++#define ICON_NAME "utilities-terminal"
    8.14 + #define SCROLL_LINES 4096
    8.15 + #define HTTP_REGEXP "(ftp|http)s?://[-a-zA-Z0-9.?$%&/=_~#.,:;+]*"
    8.16 + #define CONFIGFILE "sakura.conf"
    8.17 +@@ -1803,7 +1803,7 @@
    8.18 + 
    8.19 + 	sakura.main_window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
    8.20 + 	gtk_window_set_title(GTK_WINDOW(sakura.main_window), "sakura");
    8.21 +-	gtk_window_set_icon_from_file(GTK_WINDOW(sakura.main_window), DATADIR "/pixmaps/" ICON_FILE, &gerror);
    8.22 ++	gtk_window_set_icon_name(GTK_WINDOW(sakura.main_window), ICON_NAME);
    8.23 + 	/* Default terminal size*/
    8.24 + 	sakura.columns = DEFAULT_COLUMNS;
    8.25 + 	sakura.rows = DEFAULT_ROWS;

     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/sakura-gtk2/stuff/patches/series	Fri Aug 25 15:45:11 2017 +0300
     9.3 @@ -0,0 +1,3 @@
     9.4 +sakura-icon.patch
     9.5 +ru.po.patch
     9.6 +fr.po.patch

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/sakura-gtk2/stuff/sakura.desktop	Fri Aug 25 15:45:11 2017 +0300
    10.3 @@ -0,0 +1,9 @@
    10.4 +[Desktop Entry]
    10.5 +Type=Application
    10.6 +Name=Sakura Terminal
    10.7 +Name[fr]=Terminal Sakura
    10.8 +Name[ru]=Терминал Sakura
    10.9 +Exec=sh -c 'sakura --sync'
   10.10 +Icon=utilities-terminal
   10.11 +Categories=GTK;System;TerminalEmulator;
   10.12 +StartupNotify=true

    11.1 --- a/sakura/receipt	Wed Aug 23 17:19:53 2017 +0300
    11.2 +++ b/sakura/receipt	Fri Aug 25 15:45:11 2017 +0300
    11.3 @@ -1,45 +1,38 @@
    11.4 -# SliTaz package receipt
    11.5 +# SliTaz package receipt v2.
    11.6  
    11.7  PACKAGE="sakura"
    11.8 -VERSION="2.4.2"
    11.9 +VERSION="3.4.0"
   11.10  CATEGORY="utilities"
   11.11 -SHORT_DESC="A simple but powerful libvte-based terminal emulator"
   11.12 -MAINTAINER="pankso@slitaz.org"
   11.13 +SHORT_DESC="Simple GTK+3 and VTE-based terminal emulator"
   11.14 +MAINTAINER="al.bobylev@gmail.com"
   11.15  LICENSE="GPL2"
   11.16  WEB_SITE="http://www.pleyades.net/david/projects/sakura"
   11.17 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
   11.18 +
   11.19 +TARBALL="sakura-$VERSION.tar.bz2"
   11.20  WGET_URL="https://launchpad.net/sakura/trunk/$VERSION/+download/$TARBALL"
   11.21 -TAGS="terminal"
   11.22 -HOST_ARCH="i486 arm"
   11.23  
   11.24 -DEPENDS="gtk+ vte xorg-libXdamage xorg-libXi"
   11.25 -BUILD_DEPENDS="gtk+-dev vte-dev xorg-libXdamage-dev xorg-libXi-dev"
   11.26 -
   11.27 -# Handle cross compilation.
   11.28 -case "$ARCH" in
   11.29 -	i?86) BUILD_DEPENDS="$BUILD_DEPENDS gettext cmake wget" ;;
   11.30 -esac
   11.31 +BUILD_DEPENDS="cmake glib-dev gtk+3-dev vte-dev pcre2-dev gettext"
   11.32  
   11.33  # Rules to configure and make the package.
   11.34  compile_rules()
   11.35  {
   11.36 -	patch -p1 -i $stuff/sakura-icon.patch
   11.37 -	patch -p1 -i $stuff/ru.po.patch
   11.38 -	patch -p1 -i $stuff/fr.po.patch
   11.39 +	sed -i '/TryExec/d; s|Icon=.*|Icon=utilities-terminal|' sakura.desktop
   11.40  
   11.41 -	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE . &&
   11.42 -	sed -i 's/$/ -lncurses/' CMakeFiles/sakura.dir/link.txt &&
   11.43 -	sed -i 's/-u//' CMakeLists.txt &&
   11.44 -	sed -i 's/-u//' CMakeFiles/man.dir/build.make &&
   11.45 -	make &&
   11.46 -	make DESTDIR=$DESTDIR install
   11.47 -	cp -f $stuff/sakura.desktop $install/usr/share/applications
   11.48 +	cmake \
   11.49 +		-DCMAKE_INSTALL_PREFIX=/usr \
   11.50 +		-DCMAKE_BUILD_TYPE=RELEASE \
   11.51 +		. &&
   11.52 +	make && make install &&
   11.53 +
   11.54 +	rm -rf $install/usr/share/pixmaps
   11.55  }
   11.56  
   11.57  # Rules to gen a SliTaz package suitable for Tazpkg.
   11.58  genpkg_rules()
   11.59  {
   11.60 -	mkdir -p $fs/usr
   11.61 -	cp -a $install/usr/bin $fs/usr
   11.62 +	copy @std
   11.63 +	TAGS="terminal"
   11.64 +	DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libgnutls pango pcre2 vte \
   11.65 +	xorg-libX11 zlib"
   11.66 +	PROVIDE="sakura"
   11.67  }
   11.68 -

    12.1 --- a/sakura/stuff/fr.po.patch	Wed Aug 23 17:19:53 2017 +0300
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,40 +0,0 @@
    12.4 ---- a/po/fr.po
    12.5 -+++ b/po/fr.po
    12.6 -@@ -29,6 +29,6 @@
    12.7 - msgid "Execute command"
    12.8 --msgstr "Exécuter une command"
    12.9 -+msgstr "Exécuter une commande"
   12.10 - 
   12.11 - msgid "Execute command (xterm compatible)"
   12.12 --msgstr ""
   12.13 -+msgstr "Exécuter une commande (compatible xterm)"
   12.14 - 
   12.15 -@@ -50,6 +50,6 @@
   12.16 - msgid "X geometry specification"
   12.17 --msgstr ""
   12.18 -+msgstr "Dimension & position X"
   12.19 - 
   12.20 - msgid "Configuration has been modified by another proccess. Overwrite?"
   12.21 --msgstr ""
   12.22 -+msgstr "La configuration a été modifiée par un autre processus. L'écraser ?"
   12.23 - 
   12.24 -@@ -71,3 +71,3 @@
   12.25 - msgid "Tab new text"
   12.26 --msgstr ""
   12.27 -+msgstr "Nouveau titre de l'onglet"
   12.28 - 
   12.29 -@@ -116,3 +116,3 @@
   12.30 - msgid "New window"
   12.31 --msgstr ""
   12.32 -+msgstr "Nouvelle fenêtre"
   12.33 - 
   12.34 -@@ -152,3 +152,3 @@
   12.35 - msgid "Always show tab bar"
   12.36 --msgstr ""
   12.37 -+msgstr "Toujours afficher la barre d'onglet"
   12.38 - 
   12.39 -@@ -170,3 +170,3 @@
   12.40 - msgid "Borderless and maximized"
   12.41 --msgstr ""
   12.42 -+msgstr "Taille maximum sans bords"
   12.43 - 

    13.1 --- a/sakura/stuff/ru.po.patch	Wed Aug 23 17:19:53 2017 +0300
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,80 +0,0 @@
    13.4 -Update translations
    13.5 -
    13.6 ---- a/po/ru.po
    13.7 -+++ b/po/ru.po
    13.8 -@@ -32,7 +32,7 @@
    13.9 - msgstr "Логин shell"
   13.10 - 
   13.11 - msgid "Set window title"
   13.12 --msgstr "Изменение заголовка окна"
   13.13 -+msgstr "Изменить заголовок окна"
   13.14 - 
   13.15 - msgid "Set columns number"
   13.16 - msgstr "Установить число столбцов"
   13.17 -@@ -44,10 +44,10 @@
   13.18 - msgstr "Удерживать окно после выполнения команды"
   13.19 - 
   13.20 - msgid "X geometry specification"
   13.21 --msgstr "Определение геометрии окна X"
   13.22 -+msgstr "Указать геометрию окна X (ШxВ)"
   13.23 - 
   13.24 - msgid "Configuration has been modified by another proccess. Overwrite?"
   13.25 --msgstr "Настройки могут быть изменены в другом процессе. Перезаписать?"
   13.26 -+msgstr "Настройки были изменены другим процессом. Перезаписать?"
   13.27 - 
   13.28 - msgid ""
   13.29 - "There are running processes.\n"
   13.30 -@@ -56,19 +56,19 @@
   13.31 - msgstr ""
   13.32 - "Не все процессы завершены.\n"
   13.33 - "\n"
   13.34 --"Вы уверены, что хотите выйти из программы?"
   13.35 -+"Вы уверены, что хотите закрыть Sakura?"
   13.36 - 
   13.37 - msgid "Select font"
   13.38 - msgstr "Выбор шрифта"
   13.39 - 
   13.40 - msgid "Set name"
   13.41 --msgstr "Изменение заголовка вкладки"
   13.42 -+msgstr "Изменить заголовок вкладки"
   13.43 - 
   13.44 - msgid "Tab new text"
   13.45 --msgstr "Новоый заголовок:"
   13.46 -+msgstr "Новый заголовок"
   13.47 - 
   13.48 - msgid "Select color"
   13.49 --msgstr "Выбор цвета"
   13.50 -+msgstr "Выбрать цвета"
   13.51 - 
   13.52 - msgid "Select foreground color:"
   13.53 - msgstr "Цвет текста:"
   13.54 -@@ -86,7 +86,7 @@
   13.55 - msgstr "Отключить прозрачность"
   13.56 - 
   13.57 - msgid "New window title"
   13.58 --msgstr "Новый заголовок:"
   13.59 -+msgstr "Новый заголовок"
   13.60 - 
   13.61 - msgid "Select a background file"
   13.62 - msgstr "Выбор файла с фоновым рисунком"
   13.63 -@@ -96,9 +96,9 @@
   13.64 - "\n"
   13.65 - "Do you really want to close it?"
   13.66 - msgstr ""
   13.67 --"Не все процессы завершены.\n"
   13.68 -+"В этом терминале продолжает работать процесс.\n"
   13.69 - "\n"
   13.70 --"Вы уверены, что хотите выйти из программы?"
   13.71 -+"Вы уверены, что хотите закрыть его?"
   13.72 - 
   13.73 - msgid "Open link..."
   13.74 - msgstr "Открыть ссылку..."
   13.75 -@@ -164,7 +164,7 @@
   13.76 - msgstr "Мигающий курсор"
   13.77 - 
   13.78 - msgid "Borderless and maximized"
   13.79 --msgstr "На весь экран без рамки."
   13.80 -+msgstr "На весь экран без рамки"
   13.81 - 
   13.82 - msgid "Input methods"
   13.83 - msgstr "Методы ввода"

    14.1 --- a/sakura/stuff/sakura-icon.patch	Wed Aug 23 17:19:53 2017 +0300
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,22 +0,0 @@
    14.4 -Set Freedesktop standard icon
    14.5 -
    14.6 ---- a/src/sakura.c
    14.7 -+++ b/src/sakura.c
    14.8 -@@ -210,7 +210,7 @@
    14.9 - };
   14.10 - 
   14.11 - 
   14.12 --#define ICON_FILE "terminal-tango.svg"
   14.13 -+#define ICON_NAME "utilities-terminal"
   14.14 - #define SCROLL_LINES 4096
   14.15 - #define HTTP_REGEXP "(ftp|http)s?://[-a-zA-Z0-9.?$%&/=_~#.,:;+]*"
   14.16 - #define CONFIGFILE "sakura.conf"
   14.17 -@@ -1803,7 +1803,7 @@
   14.18 - 
   14.19 - 	sakura.main_window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
   14.20 - 	gtk_window_set_title(GTK_WINDOW(sakura.main_window), "sakura");
   14.21 --	gtk_window_set_icon_from_file(GTK_WINDOW(sakura.main_window), DATADIR "/pixmaps/" ICON_FILE, &gerror);
   14.22 -+	gtk_window_set_icon_name(GTK_WINDOW(sakura.main_window), ICON_NAME);
   14.23 - 	/* Default terminal size*/
   14.24 - 	sakura.columns = DEFAULT_COLUMNS;
   14.25 - 	sakura.rows = DEFAULT_ROWS;

    15.1 --- a/sakura/stuff/sakura.desktop	Wed Aug 23 17:19:53 2017 +0300
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,9 +0,0 @@
    15.4 -[Desktop Entry]
    15.5 -Type=Application
    15.6 -Name=Sakura Terminal
    15.7 -Name[fr]=Terminal Sakura
    15.8 -Name[ru]=Терминал Sakura
    15.9 -Exec=sh -c 'sakura --sync'
   15.10 -Icon=utilities-terminal
   15.11 -Categories=GTK;System;TerminalEmulator;
   15.12 -StartupNotify=true

    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/vte-gtk2/receipt	Fri Aug 25 15:45:11 2017 +0300
    16.3 @@ -0,0 +1,74 @@
    16.4 +# SliTaz package receipt v2.
    16.5 +
    16.6 +PACKAGE="vte-gtk2"
    16.7 +VERSION="0.28.2" # last gtk2-based series is 0.28; last version is 0.28.2 (2011-08-28); see vte receipt for latest vte
    16.8 +CATEGORY="utilities"
    16.9 +SHORT_DESC="Terminal capabilities for GTK+ widgets"
   16.10 +MAINTAINER="pankso@slitaz.org"
   16.11 +LICENSE="GPL2"
   16.12 +WEB_SITE="https://www.gnome.org/"
   16.13 +HOST_ARCH="i486 arm"
   16.14 +
   16.15 +TARBALL="vte-$VERSION.tar.xz"
   16.16 +WGET_URL="$GNOME_MIRROR/vte/0.28/$TARBALL"
   16.17 +
   16.18 +BUILD_DEPENDS_arm="gtk+-dev ncurses-dev"
   16.19 +BUILD_DEPENDS="intltool gtk+-dev python-dev gobject-introspection-dev pygtk-dev"
   16.20 +SPLIT="vte-gtk2-terminal vte-gtk2-python vte-gtk2 vte-gtk2-dev"
   16.21 +
   16.22 +# Rules to configure and make the package.
   16.23 +compile_rules()
   16.24 +{
   16.25 +	# http://www.linuxfromscratch.org/blfs/view/stable/gnome/vte.html (for gtk+3 version)
   16.26 +
   16.27 +	case "$ARCH" in
   16.28 +		i?86) ARCH_ARGS="--enable-introspection=yes";;
   16.29 +		arm)  ARCH_ARGS="--enable-introspection=no";;
   16.30 +	esac
   16.31 +
   16.32 +	./configure \
   16.33 +		--sysconfdir=/etc \
   16.34 +		--disable-static \
   16.35 +		$CONFIGURE_ARGS $ARCH_ARGS &&
   16.36 +	make -j1 && make install
   16.37 +
   16.38 +	# add 'Home' and 'End' keys
   16.39 +	#sed -i '9i\ \ \ \ :kh=\\E[H:@7=\\E[F:\\' $install/usr/share/vte/termcap-0.0/xterm
   16.40 +}
   16.41 +
   16.42 +# Rules to gen a SliTaz package suitable for Tazpkg.
   16.43 +genpkg_rules()
   16.44 +{
   16.45 +	case $PACKAGE in
   16.46 +		vte-gtk2-terminal)
   16.47 +			copy bin/
   16.48 +			CAT="development|X Terminal"
   16.49 +			DEPENDS="vte-gtk2"
   16.50 +			;;
   16.51 +		vte-gtk2-python)
   16.52 +			copy vtemodule.so vte.defs
   16.53 +			CAT="development|Python bindings"
   16.54 +			DEPENDS="python vte-gtk2"
   16.55 +			PROVIDE="python-vte"
   16.56 +			;;
   16.57 +		vte-gtk2)
   16.58 +			copy @std
   16.59 +			remove_already_packed
   16.60 +			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+ \
   16.61 +			libffi libharfbuzz liblzma libpng16 libxml2 ncurses pango pcre \
   16.62 +			util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 \
   16.63 +			xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb \
   16.64 +			xorg-pixman zlib"
   16.65 +			;;
   16.66 +		vte-gtk2-dev)
   16.67 +			copy @dev
   16.68 +			DEPENDS="vte-gtk2 vte-gtk2-terminal vte-gtk2-python \
   16.69 +			atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \
   16.70 +			gdk-pixbuf-dev glib-dev gtk+-dev harfbuzz-dev libffi-dev \
   16.71 +			libpng16-dev libxml2-dev ncurses-dev pango-dev pcre-dev \
   16.72 +			util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \
   16.73 +			xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
   16.74 +			xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev"
   16.75 +			;;
   16.76 +	esac
   16.77 +}

    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/vte-gtk2/stuff/patches/AltKey.patch	Fri Aug 25 15:45:11 2017 +0300
    17.3 @@ -0,0 +1,50 @@
    17.4 +From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001
    17.5 +From: Christian Persch <chpe@gnome.org>
    17.6 +Date: Sat, 12 May 2012 18:48:05 +0200
    17.7 +Subject: [PATCH] keymap: Treat ALT as META
    17.8 +
    17.9 +https://bugzilla.gnome.org/show_bug.cgi?id=663779
   17.10 +---
   17.11 + src/vte.c |   23 ++++++++++++++---------
   17.12 + 1 files changed, 14 insertions(+), 9 deletions(-)
   17.13 +
   17.14 +diff --git a/src/vte.c b/src/vte.c
   17.15 +index dd27e9a..0657921 100644
   17.16 +--- a/src/vte.c
   17.17 ++++ b/src/vte.c
   17.18 +@@ -5170,19 +5170,24 @@ static void
   17.19 + vte_terminal_read_modifiers (VteTerminal *terminal,
   17.20 + 			     GdkEvent *event)
   17.21 + {
   17.22 ++        GdkKeymap *keymap;
   17.23 + 	GdkModifierType modifiers;
   17.24 + 
   17.25 + 	/* Read the modifiers. */
   17.26 +-	if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
   17.27 +-		GdkKeymap *keymap;
   17.28 +-#if GTK_CHECK_VERSION (2, 90, 8)
   17.29 +-                keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
   17.30 +-#else
   17.31 +-                keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window));
   17.32 ++	if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
   17.33 ++                return;
   17.34 ++
   17.35 ++        keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
   17.36 ++
   17.37 ++        gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
   17.38 ++
   17.39 ++#if 1
   17.40 ++        /* HACK! Treat ALT as META; see bug #663779. */
   17.41 ++        if (modifiers & GDK_MOD1_MASK)
   17.42 ++                modifiers |= VTE_META_MASK;
   17.43 + #endif
   17.44 +-                gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
   17.45 +-		terminal->pvt->modifiers = modifiers;
   17.46 +-	}
   17.47 ++
   17.48 ++        terminal->pvt->modifiers = modifiers;
   17.49 + }
   17.50 + 
   17.51 + /* Read and handle a keypress event. */
   17.52 +-- 
   17.53 +1.7.5.1.217.g4e3aa.dirty
   17.54 \ No newline at end of file

    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/vte-gtk2/stuff/patches/series	Fri Aug 25 15:45:11 2017 +0300
    18.3 @@ -0,0 +1,1 @@
    18.4 +AltKey.patch

    19.1 --- a/vte/receipt	Wed Aug 23 17:19:53 2017 +0300
    19.2 +++ b/vte/receipt	Fri Aug 25 15:45:11 2017 +0300
    19.3 @@ -6,30 +6,27 @@
    19.4  SHORT_DESC="Terminal capabilities for GTK+ widgets"
    19.5  MAINTAINER="pankso@slitaz.org"
    19.6  LICENSE="GPL2"
    19.7 -WEB_SITE="http://www.gnome.org/"
    19.8 +WEB_SITE="https://www.gnome.org/"
    19.9  HOST_ARCH="i486 arm"
   19.10  
   19.11  TARBALL="$PACKAGE-$VERSION.tar.xz"
   19.12  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
   19.13  
   19.14 -BUILD_DEPENDS="pygtk-dev python-dev gobject-introspection-dev perl \
   19.15 -perl-xml-parser ncurses-dev"
   19.16  BUILD_DEPENDS_arm="gtk+-dev ncurses-dev"
   19.17 -SPLIT="vte-terminal python-vte vte-dev"
   19.18 -
   19.19  BUILD_DEPENDS="automake gettext gobject-introspection-dev vala intltool \
   19.20  pango-dev gtk+3-dev pcre2-dev gnutls-dev"
   19.21 -
   19.22 -# Handle cross compilation.
   19.23 -case "$ARCH" in
   19.24 -	i?86) ARCH_ARGS="--enable-introspection=yes";;
   19.25 -	arm)  ARCH_ARGS="--enable-introspection=no";;
   19.26 -esac
   19.27 +SPLIT="vte-terminal vte vte-dev"
   19.28  
   19.29  # Rules to configure and make the package.
   19.30  compile_rules()
   19.31  {
   19.32  	# http://www.linuxfromscratch.org/blfs/view/stable/gnome/vte.html
   19.33 +
   19.34 +	case "$ARCH" in
   19.35 +		i?86) ARCH_ARGS="--enable-introspection=yes";;
   19.36 +		arm)  ARCH_ARGS="--enable-introspection=no";;
   19.37 +	esac
   19.38 +
   19.39  	sed -i '/Werror/d' configure.ac &&
   19.40  	autoreconf &&
   19.41  
   19.42 @@ -47,20 +44,32 @@
   19.43  genpkg_rules()
   19.44  {
   19.45  	case $PACKAGE in
   19.46 -		vte)
   19.47 -			copy @std
   19.48 -			DEPENDS="gtk+ ncurses xorg-libXdamage"
   19.49 -			;;
   19.50  		vte-terminal)
   19.51  			copy bin/
   19.52  			CAT="development|X Terminal"
   19.53 -			DEPENDS="expat vte"
   19.54 -			;;
   19.55 -		python-vte)
   19.56 -			copy python*/ pygtk/
   19.57 -			CAT="development|terminal capabilities for GTK+ widgets"
   19.58  			DEPENDS="vte"
   19.59  			;;
   19.60 -		vte-dev) copy @dev;;
   19.61 +		vte)
   19.62 +			copy @std
   19.63 +			remove_already_packed
   19.64 +			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gmp \
   19.65 +			gtk+3 libffi libgnutls libharfbuzz libidn liblzma libpng16 \
   19.66 +			libtasn1 libunistring libxml2 nettle p11-kit pango pcre pcre2 \
   19.67 +			util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 \
   19.68 +			xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb \
   19.69 +			xorg-pixman zlib"
   19.70 +			;;
   19.71 +		vte-dev)
   19.72 +			copy @dev
   19.73 +			DEPENDS="vte vte-terminal \
   19.74 +			atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \
   19.75 +			gdk-pixbuf-dev glib-dev gmp-dev gnutls-dev gtk+3-dev harfbuzz-dev \
   19.76 +			libffi-dev libidn-dev libpng16-dev libtasn1-dev libunistring-dev \
   19.77 +			libxml2-dev nettle-dev p11-kit-dev pango-dev pcre-dev pcre2-dev \
   19.78 +			util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \
   19.79 +			xorg-libX11-dev xorg-libXau-dev xorg-libxcb-dev xorg-libXdmcp-dev \
   19.80 +			xorg-libXext-dev xorg-libXrender-dev xorg-pixman-dev xz-dev \
   19.81 +			zlib-dev"
   19.82 +			;;
   19.83  	esac
   19.84  }

    20.1 --- a/wpa_supplicant/receipt	Wed Aug 23 17:19:53 2017 +0300
    20.2 +++ b/wpa_supplicant/receipt	Fri Aug 25 15:45:11 2017 +0300
    20.3 @@ -1,48 +1,43 @@
    20.4 -# SliTaz package receipt.
    20.5 +# SliTaz package receipt v2.
    20.6  
    20.7  PACKAGE="wpa_supplicant"
    20.8 -VERSION="2.1"
    20.9 +VERSION="2.6"
   20.10  CATEGORY="utilities"
   20.11  SHORT_DESC="WPA Supplicant with support for WPA and WPA2"
   20.12  MAINTAINER="0dddba11@googlemail.com"
   20.13  LICENSE="GPL2"
   20.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
   20.15 -WEB_SITE="http://hostap.epitest.fi/wpa_supplicant/"
   20.16 -WGET_URL="http://hostap.epitest.fi/releases/$TARBALL"
   20.17 -CONFIG_FILES="/etc/wpa/wpa_supplicant.conf"
   20.18 -TAGS="wireless wifi network"
   20.19 +WEB_SITE="http://w1.fi/wpa_supplicant/"
   20.20  HOST_ARCH="i486 arm"
   20.21  
   20.22 -DEPENDS="libssl libcrypto libnl dbus"
   20.23 -BUILD_DEPENDS="openssl-dev libcrypto-dev libnl-dev dbus-dev"
   20.24 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   20.25 +WGET_URL="http://w1.fi/releases/$TARBALL"
   20.26  
   20.27 -# Arch install
   20.28 -case "$SLITAZ_ARCH" in
   20.29 -	arm*) DEPENDS="libssl libcrypto libnl" ;;
   20.30 -esac
   20.31 -
   20.32 -# Cross compile
   20.33 -case "$ARCH" in
   20.34 -	arm*) BUILD_DEPENDS="openssl-dev libcrypto-dev libnl-dev" ;;
   20.35 -esac
   20.36 +BUILD_DEPENDS_arm="openssl-dev libcrypto-dev libnl-dev"
   20.37 +BUILD_DEPENDS="libnl-dev dbus-dev openssl-dev readline-dev"
   20.38  
   20.39  # Rules to configure and make the package.
   20.40 -compile_rules()
   20.41 -{
   20.42 -	cd $src/$PACKAGE
   20.43 -	cp -a ./defconfig ./.config
   20.44 -	sed 's/-lnl/-lnl-3/g' -i ../src/drivers/drivers.mak
   20.45 -	sed 's/-lnl-3-genl/-lnl-genl-3/g' -i ../src/drivers/drivers.mak
   20.46 +compile_rules() {
   20.47 +	# http://www.linuxfromscratch.org/blfs/view/stable/basicnet/wpa_supplicant.html
   20.48 +
   20.49 +	cd $src/wpa_supplicant
   20.50 +	cp -a defconfig .config
   20.51 +
   20.52  	# Main build configs
   20.53 -	cat >> .config << EOT
   20.54 +	cat >> .config <<EOT
   20.55 +CONFIG_DEBUG_FILE=y
   20.56 +CONFIG_DEBUG_SYSLOG=y
   20.57 +CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
   20.58 +CONFIG_IPV6=y
   20.59 +CONFIG_LIBNL32=y
   20.60 +CONFIG_READLINE=y
   20.61 +CONFIG_WPS=y
   20.62  CONFIG_AP=y
   20.63  CONFIG_BGSCAN_SIMPLE=y
   20.64 -CONFIG_LIBNL20=y
   20.65  EOT
   20.66 -	# Dont use DBUS on ARM arch
   20.67 +	# Don't use DBUS on ARM arch
   20.68  	case "$ARCH" in
   20.69  		i?86)
   20.70 -			cat >> .config << EOT
   20.71 +			cat >> .config <<EOT
   20.72  CFLAGS += -I/usr/include/libnl3
   20.73  CONFIG_CTRL_IFACE_DBUS=y
   20.74  CONFIG_CTRL_IFACE_DBUS_NEW=y
   20.75 @@ -50,56 +45,63 @@
   20.76  EOT
   20.77  			;;
   20.78  		arm)
   20.79 -			cat >> .config << EOT
   20.80 +			cat >> .config <<EOT
   20.81  CFLAGS += -I${sysroot}/usr/include/libnl3
   20.82  CFLAGS += -I${sysroot}/usr/include/openssl
   20.83  LIBS += -L${sysroot}/usr/lib
   20.84  EOT
   20.85  			;;
   20.86  	esac
   20.87 -	make BINDIR=/usr/bin LIBDIR=/lib
   20.88 +	make BINDIR=/sbin LIBDIR=/lib || exit 1
   20.89 +
   20.90 +	# commands
   20.91 +	bindir="$install/sbin"
   20.92 +	mkdir -p $bindir
   20.93 +	install -vm755 wpa_cli        $bindir
   20.94 +	install -vm755 wpa_passphrase $bindir
   20.95 +	install -vm755 wpa_supplicant $bindir
   20.96 +
   20.97 +	cook_pick_manpages \
   20.98 +		doc/docbook/wpa_supplicant.conf.5 \
   20.99 +		doc/docbook/wpa_cli.8 \
  20.100 +		doc/docbook/wpa_passphrase.8 \
  20.101 +		doc/docbook/wpa_supplicant.8
  20.102 +
  20.103 +	mkdir -p $install/usr/share/dbus-1/system-services
  20.104 +	install -vm644 dbus/*.service $install/usr/share/dbus-1/system-services/
  20.105 +
  20.106 +	mkdir -p $install/etc/dbus-1/system.d
  20.107 +	install -vm644 dbus/dbus-wpa_supplicant.conf \
  20.108 +		$install/etc/dbus-1/system.d/wpa_supplicant.conf
  20.109 +
  20.110 +	# Startup script and cleaned up wpa_empty.conf
  20.111 +	cp -a $stuff/etc $install
  20.112 +	install -vm644 $src/wpa_supplicant/wpa_supplicant.conf $install/etc/wpa
  20.113 +	chown -R root:root $install/etc
  20.114  }
  20.115  
  20.116  # Rules to gen a SliTaz package suitable for Tazpkg.
  20.117 -genpkg_rules()
  20.118 -{
  20.119 -	# commands
  20.120 -	mkdir -p $fs/usr/bin
  20.121 -	install -v -m755 $src/$PACKAGE/wpa_cli $fs/usr/bin
  20.122 -	install -v -m755 $src/$PACKAGE/wpa_supplicant $fs/usr/bin
  20.123 -	install -v -m755 $src/$PACKAGE/wpa_passphrase $fs/usr/bin
  20.124 -
  20.125 -	# D-Bus control
  20.126 -	mkdir -p $fs/usr/share/dbus-1/system-services
  20.127 -	install -v -m644 \
  20.128 -		$src/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service \
  20.129 -		$fs/usr/share/dbus-1/system-services
  20.130 -	install -v -m644 \
  20.131 -		$src/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service \
  20.132 -		$fs/usr/share/dbus-1/system-services
  20.133 -
  20.134 -	mkdir -p $fs/etc/dbus-1/system.d
  20.135 -	install -v -m644 \
  20.136 -		$src/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
  20.137 -		$fs/etc/dbus-1/system.d/wpa_supplicant.conf
  20.138 -
  20.139 -	# Startup script and cleaned up wpa_empty.conf
  20.140 -	cp -a $stuff/etc $fs
  20.141 -	install -m644 -oroot -groot $src/$PACKAGE/wpa_supplicant.conf $fs/etc/wpa
  20.142 +genpkg_rules() {
  20.143 +	copy @std
  20.144 +	DEPENDS="dbus libcrypto libnl libssl ncurses readline"
  20.145 +	CONFIG_FILES="/etc/wpa/wpa_supplicant.conf"
  20.146 +	TAGS="wireless wifi network"
  20.147 +	case "$SLITAZ_ARCH" in
  20.148 +		arm*) DEPENDS="libssl libcrypto libnl";;
  20.149 +	esac
  20.150  }
  20.151  
  20.152  # Pre and post install commands for Tazpkg.
  20.153 -post_install()
  20.154 -{
  20.155 -	grep -qs ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> "$1/etc/daemons.conf" << EOT
  20.156 +post_install() {
  20.157 +	grep -qs ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> "$1/etc/daemons.conf" <<"EOT"
  20.158  
  20.159  # wpa_supplicant daemon options
  20.160 -WPA_OPTIONS="-B -u -P /var/run/wpa_supplicant.pid -c /etc/wpa/wpa.conf -i \$(. /etc/network.conf ; echo \$WIFI_INTERFACE)"
  20.161 +WPA_OPTIONS="-B -u -P /var/run/wpa_supplicant.pid -c /etc/wpa/wpa.conf -i $(. /etc/network.conf; echo $WIFI_INTERFACE)"
  20.162  
  20.163  EOT
  20.164  	# We use /etc/wpa/wpa.conf from SliTaz 5.0
  20.165 -	sed -i s'#/etc/wpa_supplicant.conf#/etc/wpa/wpa.conf#'/ "$1/etc/daemons.conf" 2> /dev/null
  20.166 -	# 'w' option dont exist anymore with < 0.6.9
  20.167 -	sed -i s/'-Bw'/'-B'/ "$1/etc/daemons.conf" 2> /dev/null
  20.168 -	sed -i s/'-B -w'/'-B'/g "$1/etc/init.d/network.sh" 2> /dev/null
  20.169 +	sed -i 's|/etc/wpa_supplicant.conf|/etc/wpa/wpa.conf|' "$1/etc/daemons.conf" 2>/dev/null
  20.170 +	# 'w' option don't exist anymore with < 0.6.9
  20.171 +	sed -i 's|-Bw|-B|' "$1/etc/daemons.conf" 2>/dev/null
  20.172 +	sed -i 's|-B -w|-B|g' "$1/etc/init.d/network.sh" 2>/dev/null
  20.173  }