diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-11-22 19:52:11 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-11-23 08:59:58 +0100 |
| commit | ef001ab523d0969f0fe72336a66798bae8fed36f (patch) | |
| tree | 801ade9a35dbbfcc5dd3846a11f79b6ade3cc3c3 /extra/source/tigervnc/tigervnc.SlackBuild | |
| parent | 47129ed59f756b223eb47e3b28088900ad63e21c (diff) | |
| download | current-ef001ab523d0969f0fe72336a66798bae8fed36f.tar.gz | |
Mon Nov 22 19:52:11 UTC 202120211122195211
l/imagemagick-7.1.0_16-x86_64-1.txz: Upgraded.
l/python-Jinja2-3.0.3-x86_64-1.txz: Added.
Added missing dependency of kapidox.
l/python-MarkupSafe-2.0.1-x86_64-1.txz: Added.
Added missing dependency of Mako.
l/python-PyYAML-6.0-x86_64-1.txz: Added.
Added missing dependency of kapidox.
l/python-doxypypy-0.8.8.6-x86_64-1.txz: Added.
Added missing dependency of kapidox.
l/python-doxyqml-0.5.1-x86_64-1.txz: Added.
Added missing dependency of kapidox.
l/python-pbr-5.8.0-x86_64-1.txz: Added.
Added missing dependency of python-pysol_cards.
extra/tigervnc/tigervnc-1.12.0-x86_64-2.txz: Rebuilt.
Use the upstream vncserver script, patched to search in some additional
locations for a startup script: $HOME/.vnc/xstartup, $HOME/.xinitrc, and
/etc/X11/xinit/xinitrc.
Add a symlink for vncserver in the old location (/usr/bin/vncserver).
Thanks to 0XBF.
Diffstat (limited to 'extra/source/tigervnc/tigervnc.SlackBuild')
| -rwxr-xr-x | extra/source/tigervnc/tigervnc.SlackBuild | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/extra/source/tigervnc/tigervnc.SlackBuild b/extra/source/tigervnc/tigervnc.SlackBuild index c123b5ca..7ec61d9a 100755 --- a/extra/source/tigervnc/tigervnc.SlackBuild +++ b/extra/source/tigervnc/tigervnc.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tigervnc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} XORGVER=${XORGVER:-$(echo xorg-server-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Do we build the java applet (needs jdk)? JAVA_APPLET=${JAVA_APPLET:-"OFF"} @@ -194,24 +194,20 @@ for PSIZE in 16 24 32 48; do $PKG/usr/share/icons/hicolor/${PSIZE}x${PSIZE}/apps/tigervnc.png done -# Remove bogus vncserver script and replace it with the last good one (from -# tigervnc-1.10.1): -rm $PKG/usr/libexec/vncserver -rmdir $PKG/usr/libexec -rm $PKG/usr/man/man8/vncserver.8 -cp -a $CWD/vncserver $PKG/usr/bin -chown root:root $PKG/usr/bin/vncserver -chmod 755 $PKG/usr/bin/vncserver -cp -a $CWD/vncserver.1 $PKG/usr/man/man1/vncserver.1 -chown root:root $PKG/usr/man/man1/vncserver.1 -chmod 644 $PKG/usr/man/man1/vncserver.1 - -# This option is not available in recent versions of tigervnc: -( cd $PKG/usr/bin - zcat $CWD/patches/vncserver.no.rfbwait.diff.gz | patch -p1 --verbose || exit 1 +# Check some additional locations for a suitable startup script, in this order: +# 1. $HOME/.vnc/xstartup +# 2. $HOME/.xinitrc +# 3. /etc/X11/xinit/xinitrc +( cd $PKG/usr/libexec + zcat $CWD/patches/vncserver.xinitrc.diff.gz | patch -p1 --verbose || exit 1 rm -f vncserver.orig ) || exit 1 +# Make a symlink for vncserver in the old location: +if [ ! -r $PKG/usr/bin/vncserver ]; then + ( cd $PKG/usr/bin ; ln -sf ../libexec/vncserver . ) +fi + # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la |