Date: Saturday, September 19, 2020 @ 16:45:41 Author: spupykin Revision: 710886
upgpkg: tigervnc 1.11.0-5 Added: tigervnc/trunk/Xsession Modified: tigervnc/trunk/PKGBUILD tigervnc/trunk/more-xsessions.patch ----------------------+ PKGBUILD | 11 +++++--- Xsession | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ more-xsessions.patch | 5 ++- 3 files changed, 76 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-09-19 16:45:35 UTC (rev 710885) +++ PKGBUILD 2020-09-19 16:45:41 UTC (rev 710886) @@ -3,7 +3,7 @@ pkgname=tigervnc pkgver=1.11.0 -pkgrel=4 +pkgrel=5 _xorgver=1.20.8 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC." arch=('x86_64') @@ -24,11 +24,13 @@ etc/tigervnc/vncserver.users) source=($pkgname-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v${pkgver}.tar.gz ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2 + Xsession more-xsessions.patch remove-selinux.patch) sha256sums=('3648eca472a92a4e8fe55b27cd397b1bf16bad0b24a3a1988661f44553f5e2c3' 'd17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146' - '5606c12553b9891e295bacede6c58f726527ec3eb916efa0c436bb156067ff41' + 'c9276f6ea277cf9654fb2cc3bc9dadbb2e596b5cf8ca867ee906c0080cf7f810' + 'cb57dece026b29d7019a3e1e42fd2fb201d37fc60a70c885d2a50acffb808c06' '71efc3bedd5be49089f4ca93517fb7fb6fadf002319cd9c8b3ac032ff3cadab0') prepare() { @@ -69,6 +71,7 @@ install -Dm0644 java/VncViewer.jar "${pkgdir}"/usr/share/vnc/classes/VncViewer.jar cd unix/xserver/hw/vnc make DESTDIR="$pkgdir" install - install -Dm0644 "$srcdir"/${pkgname}-${pkgver}/unix/vncserver/vncserver@.service \ - "$pkgdir"/usr/lib/systemd/user/vncserver@.service + install -Dm0755 "$srcdir"/Xsession "$pkgdir"/etc/X11/tigervnc/Xsession +# install -Dm0644 "$srcdir"/${pkgname}-${pkgver}/unix/vncserver/vncserver@.service \ +# "$pkgdir"/usr/lib/systemd/user/vncserver@.service } Added: Xsession =================================================================== --- Xsession (rev 0) +++ Xsession 2020-09-19 16:45:41 UTC (rev 710886) @@ -0,0 +1,66 @@ +#!/bin/sh +# +# Wrapper to run around X sessions. +# Based on lightdm +# + +echo "Running X session wrapper" + +# Load profile +for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do + if [ -f "$file" ]; then + echo "Loading profile from $file"; + . "$file" + fi +done + +# Load resources +for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do + if [ -f "$file" ]; then + echo "Loading resource: $file" + xrdb -merge "$file" + fi +done + +# Load keymaps +for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do + if [ -f "$file" ]; then + echo "Loading keymap: $file" + setxkbmap `cat "$file"` + XKB_IN_USE=yes + fi +done + +# Load xmodmap if not using XKB +if [ -z "$XKB_IN_USE" ]; then + for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do + if [ -f "$file" ]; then + echo "Loading modmap: $file" + xmodmap "$file" + fi + done +fi + +unset XKB_IN_USE + +# Run all system xinitrc shell scripts +xinitdir="/etc/X11/xinit/xinitrc.d" +if [ -d "$xinitdir" ]; then + for script in $xinitdir/*; do + echo "Loading xinit script $script" + if [ -x "$script" -a ! -d "$script" ]; then + . "$script" + fi + done +fi + +# Run user xsession shell script +script="$HOME/.xsession" +if [ -x "$script" -a ! -d "$script" ]; then + echo "Loading xsession script $script" + . "$script" +fi + +echo "X session wrapper complete, running session $@" + +exec $@ Modified: more-xsessions.patch =================================================================== --- more-xsessions.patch 2020-09-19 16:45:35 UTC (rev 710885) +++ more-xsessions.patch 2020-09-19 16:45:41 UTC (rev 710886) @@ -1,7 +1,7 @@ diff -wbBur tigervnc-1.11.0/unix/vncserver/vncserver.in tigervnc-1.11.0.my/unix/vncserver/vncserver.in --- tigervnc-1.11.0/unix/vncserver/vncserver.in 2020-09-08 15:16:08.000000000 +0300 +++ tigervnc-1.11.0.my/unix/vncserver/vncserver.in 2020-09-11 15:39:59.980775388 +0300 -@@ -438,7 +438,12 @@ +@@ -438,7 +438,13 @@ die "$prog: couldn't find \"$cmd\" on your PATH.\n"; } @@ -11,7 +11,8 @@ + "/usr/share/sddm/scripts/Xsession", + "/etc/gdm/Xsession", + "/etc/lightdm/Xsession", -+ "/etc/lxdm/Xsession") { ++ "/etc/lxdm/Xsession", ++ "/etc/X11/tigervnc/Xsession") { if (-x "$cmd") { $Xsession = $cmd; last;