# HG changeset patch
# User Xander Ziiryanoff <psychomaniak@xakep.ru>
# Date 1476028616 -10800
# Node ID c38559793ba8c129bccfa09668e5b3daddfa3b21
# Parent  8fd5d4c953f6cce0dc293982f28b9794768ee292
compiz-ccsm, xvkbd: check depends, tried to fix startup with some locales

diff -r 8fd5d4c953f6 -r c38559793ba8 compiz-ccsm/receipt
--- a/compiz-ccsm/receipt	Tue Oct 04 15:58:11 2016 +0200
+++ b/compiz-ccsm/receipt	Sun Oct 09 18:56:56 2016 +0300
@@ -19,6 +19,9 @@
 compile_rules()
 {
 	./setup.py install --prefix=/usr --with-gtk=2.0 --root="$DESTDIR"
+
+	find $DESTDIR -name ccsm.desktop | xargs \
+	sed -i 's#Exec=.*#Exec=sh -c \"ccsm \|\| LC_ALL=C LANG=C ccsm\"#'
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -30,7 +33,4 @@
 	cp -a $install/usr/share/locale/ru $fs/usr/share/locale
 	cp -a $install/usr/share/ccsm $fs/usr/share
 	cp -a $install/usr/share/icons $fs/usr/share
-	cd $fs/usr/share
-	mkdir pixmaps
-	ln -s icons/hicolor/32x32/apps/ccsm.png pixmaps/ccsm.png
 }
diff -r 8fd5d4c953f6 -r c38559793ba8 compiz/stuff/compiz-startwm
--- a/compiz/stuff/compiz-startwm	Tue Oct 04 15:58:11 2016 +0200
+++ b/compiz/stuff/compiz-startwm	Sun Oct 09 18:56:56 2016 +0300
@@ -9,6 +9,6 @@
 
 COMPIZ_OPTS='--sm-disable --loose-binding --no-fbo --ignore-desktop-hints'
 
-(lsmod | grep -q nvidia) && OPTS="$OPTS --indirect-rendering"
+(lsmod | grep -q nvidia) && COMPIZ_OPTS="$COMPIZ_OPTS --indirect-rendering"
 
 compiz --replace $COMPIZ_OPTS
diff -r 8fd5d4c953f6 -r c38559793ba8 xvkbd/receipt
--- a/xvkbd/receipt	Tue Oct 04 15:58:11 2016 +0200
+++ b/xvkbd/receipt	Sun Oct 09 18:56:56 2016 +0300
@@ -10,9 +10,9 @@
 WEB_SITE="http://homepage3.nifty.com/tsato/xvkbd/"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS="xorg-xproto xorg-libXaw xorg-libXp xorg-libXtst xorg-libXaw3d"
+DEPENDS="xorg-libXp xorg-libXtst xorg-libXaw3d"
 BUILD_DEPENDS="xorg-imake xorg-libXaw-dev xorg-libXp-dev xorg-libXtst-dev \
-xorg-libXaw3d-dev"
+xorg-libXaw3d-dev xorg-xproto"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 8fd5d4c953f6 -r c38559793ba8 xvkbd/stuff/usr/share/applications/xvkbd.desktop
--- a/xvkbd/stuff/usr/share/applications/xvkbd.desktop	Tue Oct 04 15:58:11 2016 +0200
+++ b/xvkbd/stuff/usr/share/applications/xvkbd.desktop	Sun Oct 09 18:56:56 2016 +0300
@@ -7,6 +7,6 @@
 Name[uk]=Віртуальна клавіатура
 GenericName=Virtual Keyboard
 Comment=Virtual Keyboard for X Window System
-Exec=xvkbd
+Exec=sh -c 'xvkbd || LC_ALL=C LANG=C xvkbd'
 Icon=xvkbd
 Categories=GTK;Utility;