wok-6.x rev 12656

tightvnc: fix font path
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Apr 30 16:54:20 2012 +0200 (2012-04-30)
parents e2cc0a6e47fe
children 6b844a12b1c3
files smbbox/receipt tightvnc/receipt
line diff
     1.1 --- a/smbbox/receipt	Mon Apr 30 10:18:35 2012 +0200
     1.2 +++ b/smbbox/receipt	Mon Apr 30 16:54:20 2012 +0200
     1.3 @@ -9,7 +9,7 @@
     1.4  MAINTAINER="shann@slitaz.org"
     1.5  SOURCE="smbbox"
     1.6  TARBALL="$SOURCE-$VERSION.tar.gz"
     1.7 -WGET_URL="http://shannaraserver.free.fr/DATA/smbbox/$PACKAGE-$VERSION.tar.gz"
     1.8 +WGET_URL="http://smbbox.free.fr/src/$TARBALL"
     1.9  WEB_SITE="http://smbbox.free.fr"
    1.10  
    1.11  DEPENDS="smbclient smbfs"
     2.1 --- a/tightvnc/receipt	Mon Apr 30 10:18:35 2012 +0200
     2.2 +++ b/tightvnc/receipt	Mon Apr 30 16:54:20 2012 +0200
     2.3 @@ -12,7 +12,7 @@
     2.4  BUILD_DEPENDS="xorg-imake xorg-gccmakedep xorg-cf-files xorg-libXp \
     2.5  xorg-libXaw-dev xorg-libXt-dev xorg-xproto xorg-libXau-dev xorg-libXdmcp-dev \
     2.6  xorg-libXmu-dev xorg-xextproto xorg-printproto xorg-kbproto xorg-inputproto \
     2.7 -xorg-scrnsaverproto xorg-xauth"
     2.8 +xorg-scrnsaverproto xorg-xauth jpeg-dev zlib-dev"
     2.9  TAGS="remote-desktop"
    2.10  
    2.11  # Rules to configure and make the package.
    2.12 @@ -20,6 +20,7 @@
    2.13  {
    2.14  	[ -d vnc_unixsrc ] && mv vnc_unixsrc $src
    2.15  	cd $src
    2.16 +	sed -i "s| FONTDIR =.*$| FONTDIR = /usr/share/fonts/X11|" Xvnc/config/cf/X11.tmpl
    2.17  	xmkmf &&
    2.18  	make -j1 World &&
    2.19  	cd Xvnc &&
    2.20 @@ -28,9 +29,9 @@
    2.21    	-i programs/Xserver/os/Makefile lib/font/fc/Makefile || return 1
    2.22  	find -name Makefile | xargs sed -i 's|/usr/X11R6/bin|/usr/bin|g'
    2.23  	make -j1 &&
    2.24 -	make -j1 DESTDIR=$PWD/../_pkg install
    2.25 +	make -j1 DESTDIR=$DESTDIR install
    2.26  	cd .. &&
    2.27 -	make -j1 DESTDIR=$PWD/_pkg install
    2.28 +	make -j1 DESTDIR=$DESTDIR install
    2.29  }
    2.30  
    2.31  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.32 @@ -39,4 +40,22 @@
    2.33  	mkdir -p $fs/usr/bin
    2.34  	cp -a $_pkg/usr/bin/Xvnc $fs/usr/bin
    2.35  	cp $src/vncpasswd/vncpasswd $fs/usr/bin
    2.36 +	cat > $fs/usr/bin/startvnc <<EOM
    2.37 +#!/bin/sh
    2.38 +
    2.39 +case "\$1" in
    2.40 +''|:*)	;;
    2.41 +*)	cat <<EOT
    2.42 +Usage: \$0 [display] [geometry] [depth]
    2.43 +Default: \$0 :1 1920x1024 24
    2.44 +EOT
    2.45 +	exit 1
    2.46 +esac
    2.47 +	
    2.48 +. \$HOME/.config/slitaz/applications.conf
    2.49 +Xvnc -ac -geometry \${2:-1920x1024} -depth \${3:-24} :\${1:-1} &
    2.50 +export DISPLAY=:\${1:-1}
    2.51 +exec \$WINDOW_MANAGER
    2.52 +EOM
    2.53 +	chmod +x $fs/usr/bin/startvnc
    2.54  }