# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1448847886 -7200
# Node ID fa19801b8f781da06a350c73e84f05493776a12c
# Parent  bb8fe72f8f3a795100decb6dec1f8c6687fa2565
libzen, xvkbd: simplify depends; xvkdb: process .desktop file, pixmaps -> icons

diff -r bb8fe72f8f3a -r fa19801b8f78 libzen/receipt
--- a/libzen/receipt	Mon Nov 30 02:55:10 2015 +0200
+++ b/libzen/receipt	Mon Nov 30 03:44:46 2015 +0200
@@ -11,7 +11,7 @@
 WGET_URL="${WEB_SITE}download/source/$PACKAGE/$VERSION/$TARBALL"
 
 DEPENDS=""
-BUILD_DEPENDS="libtool automake autoconf"
+BUILD_DEPENDS="libtool"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r bb8fe72f8f3a -r fa19801b8f78 xvkbd/receipt
--- a/xvkbd/receipt	Mon Nov 30 02:55:10 2015 +0200
+++ b/xvkbd/receipt	Mon Nov 30 03:44:46 2015 +0200
@@ -10,37 +10,37 @@
 WEB_SITE="http://homepage3.nifty.com/tsato/xvkbd/"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS="xorg-libXt xorg-libX11  xorg-xproto xorg-libSM xorg-libXaw \
-xorg-libICE xorg-libXp xorg-libXtst  xorg-libXmu xorg-libXpm xorg-libXext \
-xorg-libXau xorg-libXdmcp xorg-libXaw3d"
-BUILD_DEPENDS="xorg-imake xorg-cf-files xorg-libXt-dev xorg-libX11-dev \
-xorg-xproto xorg-libSM-dev xorg-libXaw-dev xorg-libICE-dev xorg-libXp-dev \
-xorg-libXtst-dev xorg-xextproto xorg-inputproto xorg-libXmu-dev xorg-libXaw3d-dev"
+DEPENDS="xorg-xproto xorg-libXaw xorg-libXp xorg-libXtst xorg-libXaw3d"
+BUILD_DEPENDS="xorg-imake xorg-libXaw-dev xorg-libXp-dev xorg-libXtst-dev \
+xorg-libXaw3d-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-
 	# delete Xaw3d
 	# sed -i '/#define XAW3D/d' Imakefile
 	xmkmf &&
 	make install
+
+	# Add .desktop file
+	mkdir -p $install/usr/share/applications
+	cp $stuff/usr/share/applications/xvkbd.desktop $install/usr/share/applications
+
+	# Add icon
+	mkdir -p $install/usr/share/icons/hicolor/32x32/apps
+	cp $stuff/usr/share/pixmaps/xvkbd.png $install/usr/share/icons/hicolor/32x32/apps
+
+	cp -f $stuff/etc/X11/app-defaults/XVkbd-russian $install/etc/X11/app-defaults
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/etc
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/etc/X11 $fs/etc
-	# Add .desktop file
-	cp -a $stuff/* $fs
+	cp -a $install/* $fs
 }
 
 post_install()
-{ 
+{
 	# .Xdefaults file
 	lang=$(echo $LANG | awk '{FS="_"} {print $1}')
 	find $1/home -maxdepth 2 -name ".Xdefaults" > /tmp/listeXdefaults
@@ -53,9 +53,8 @@
 !
 xvkbd*Font: -misc-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1
 EOT
-echo "xvkbd.Layout : $lang" >> $line	
+echo "xvkbd.Layout : $lang" >> $line
 	fi
 	done </tmp/listeXdefaults
 	rm -f /tmp/listeXdefaults
 }
-
diff -r bb8fe72f8f3a -r fa19801b8f78 xvkbd/stuff/usr/share/applications/xvkbd.desktop
--- a/xvkbd/stuff/usr/share/applications/xvkbd.desktop	Mon Nov 30 02:55:10 2015 +0200
+++ b/xvkbd/stuff/usr/share/applications/xvkbd.desktop	Mon Nov 30 03:44:46 2015 +0200
@@ -1,11 +1,12 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Virtual keyboard
 Name[pt]=Teclado Virtual
 Name[pt_BR]=Teclado Virtual
+Name[ru]=Виртуальная клавиатура
+Name[uk]=Віртуальна клавіатура
 GenericName=Virtual Keyboard
 Comment=Virtual Keyboard for X Window System
 Exec=xvkbd
 Icon=xvkbd
-Type=Application
 Categories=GTK;Utility;