sergiotarxz
/
termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tigervnc: update xstartup script 

* Keep only necessary stuff in default '~/.vnc/xstartup'.
 * Add aterm & xorg-twm to suggested packages.
This commit is contained in:
Leonid Pliushch 2018-10-17 16:49:24 +03:00 committed by Yaksh Bariya
parent 72676a4164
commit 597e04c722
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11-packages/tigervnc/build.sh
View File

@ -2,13 +2,14 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
TERMUX_PKG_HOMEPAGE=http://www.tigervnc.org/
TERMUX_PKG_VERSION=1.9.0
TERMUX_PKG_REVISION=14
TERMUX_PKG_REVISION=15
TERMUX_PKG_DESCRIPTION="Suite of VNC servers. Based on the VNC 4 branch of TightVNC."
TERMUX_PKG_SRCURL=https://github.com/TigerVNC/tigervnc/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=f15ced8500ec56356c3bf271f52e58ed83729118361c7103eab64a618441f740
TERMUX_PKG_DEPENDS="freetype, libandroid-support, libandroid-shmem, libbz2, libc++, libdrm, libexpat, libgnutls, libjpeg-turbo, libpixman, libpng, libuuid, libx11, libxau, libxcb, libxdamage, libxdmcp, libxext, libxxf86vm, libxfixes, libxfont2, libxshmfence, mesa, openssl, perl, xkeyboard-config, xorg-xauth, xorg-xkbcomp"
TERMUX_PKG_BUILD_DEPENDS="xorgproto, xorg-font-util, xorg-util-macros, xorg-server-xvfb, xtrans"
TERMUX_PKG_SUGGESTS="aterm, xorg-twm"
TERMUX_PKG_FOLDERNAME=tigervnc-${TERMUX_PKG_VERSION}
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DBUILD_VIEWER=ON -DENABLE_NLS=OFF -DENABLE_PAM=OFF -DENABLE_GNUTLS=ON"

31
x11-packages/tigervnc/vncserver
View File

@ -60,29 +60,14 @@ $xauthorityFile = "$ENV{XAUTHORITY}" || "$ENV{HOME}/.Xauthority";
$xstartupFile = $vncUserDir . "/xstartup";
$defaultXStartup
= ("#!/data/data/com.termux/files/usr/bin/sh\n\n".
"unset SESSION_MANAGER\n".
"unset DBUS_SESSION_BUS_ADDRESS\n".
"OS=`uname -s`\n".
"if [ \$OS = 'Linux' ]; then\n".
" case \"\$WINDOWMANAGER\" in\n".
" \*gnome\*)\n".
" if [ -e /etc/SuSE-release ]; then\n".
" PATH=\$PATH:/opt/gnome/bin\n".
" export PATH\n".
" fi\n".
" ;;\n".
" esac\n".
"fi\n".
"if [ -x /data/data/com.termux/files/usr/etc/X11/xinit/xinitrc ]; then\n".
" exec /data/data/com.termux/files/usr/etc/X11/xinit/xinitrc\n".
"fi\n".
"if [ -f /data/data/com.termux/files/usr/etc/X11/xinit/xinitrc ]; then\n".
" exec sh /data/data/com.termux/files/usr/etc/X11/xinit/xinitrc\n".
"fi\n".
"[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
"xsetroot -solid grey\n".
"aterm -geometry 80x24+10+10 -ls &\n".
= ("#!/data/data/com.termux/files/usr/bin/sh\n".
"## This file is executed during VNC server\n".
"## startup.\n\n".
"# Launch terminal emulator Aterm.\n".
"# Requires package 'aterm'.\n".
"aterm -geometry 80x24+10+10 -ls &\n\n".
"# Launch Tab Window Manager.\n".
"# Requires package 'xorg-twm'.\n".
"twm &\n");
$defaultConfig