wok-next rev 19437
compiz-ccsm, xvkbd: check depends, tried to fix startup with some locales
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Sun Oct 09 18:56:56 2016 +0300 (2016-10-09) |
parents | 8fd5d4c953f6 |
children | 136e6be5a91e |
files | compiz-ccsm/receipt compiz/stuff/compiz-startwm xvkbd/receipt xvkbd/stuff/usr/share/applications/xvkbd.desktop |
line diff
1.1 --- a/compiz-ccsm/receipt Tue Oct 04 15:58:11 2016 +0200 1.2 +++ b/compiz-ccsm/receipt Sun Oct 09 18:56:56 2016 +0300 1.3 @@ -19,6 +19,9 @@ 1.4 compile_rules() 1.5 { 1.6 ./setup.py install --prefix=/usr --with-gtk=2.0 --root="$DESTDIR" 1.7 + 1.8 + find $DESTDIR -name ccsm.desktop | xargs \ 1.9 + sed -i 's#Exec=.*#Exec=sh -c \"ccsm \|\| LC_ALL=C LANG=C ccsm\"#' 1.10 } 1.11 1.12 # Rules to gen a SliTaz package suitable for Tazpkg. 1.13 @@ -30,7 +33,4 @@ 1.14 cp -a $install/usr/share/locale/ru $fs/usr/share/locale 1.15 cp -a $install/usr/share/ccsm $fs/usr/share 1.16 cp -a $install/usr/share/icons $fs/usr/share 1.17 - cd $fs/usr/share 1.18 - mkdir pixmaps 1.19 - ln -s icons/hicolor/32x32/apps/ccsm.png pixmaps/ccsm.png 1.20 }
2.1 --- a/compiz/stuff/compiz-startwm Tue Oct 04 15:58:11 2016 +0200 2.2 +++ b/compiz/stuff/compiz-startwm Sun Oct 09 18:56:56 2016 +0300 2.3 @@ -9,6 +9,6 @@ 2.4 2.5 COMPIZ_OPTS='--sm-disable --loose-binding --no-fbo --ignore-desktop-hints' 2.6 2.7 -(lsmod | grep -q nvidia) && OPTS="$OPTS --indirect-rendering" 2.8 +(lsmod | grep -q nvidia) && COMPIZ_OPTS="$COMPIZ_OPTS --indirect-rendering" 2.9 2.10 compiz --replace $COMPIZ_OPTS
3.1 --- a/xvkbd/receipt Tue Oct 04 15:58:11 2016 +0200 3.2 +++ b/xvkbd/receipt Sun Oct 09 18:56:56 2016 +0300 3.3 @@ -10,9 +10,9 @@ 3.4 WEB_SITE="http://homepage3.nifty.com/tsato/xvkbd/" 3.5 WGET_URL="${WEB_SITE}$TARBALL" 3.6 3.7 -DEPENDS="xorg-xproto xorg-libXaw xorg-libXp xorg-libXtst xorg-libXaw3d" 3.8 +DEPENDS="xorg-libXp xorg-libXtst xorg-libXaw3d" 3.9 BUILD_DEPENDS="xorg-imake xorg-libXaw-dev xorg-libXp-dev xorg-libXtst-dev \ 3.10 -xorg-libXaw3d-dev" 3.11 +xorg-libXaw3d-dev xorg-xproto" 3.12 3.13 # Rules to configure and make the package. 3.14 compile_rules()
4.1 --- a/xvkbd/stuff/usr/share/applications/xvkbd.desktop Tue Oct 04 15:58:11 2016 +0200 4.2 +++ b/xvkbd/stuff/usr/share/applications/xvkbd.desktop Sun Oct 09 18:56:56 2016 +0300 4.3 @@ -7,6 +7,6 @@ 4.4 Name[uk]=Віртуальна клавіатура 4.5 GenericName=Virtual Keyboard 4.6 Comment=Virtual Keyboard for X Window System 4.7 -Exec=xvkbd 4.8 +Exec=sh -c 'xvkbd || LC_ALL=C LANG=C xvkbd' 4.9 Icon=xvkbd 4.10 Categories=GTK;Utility;