diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/source/tigervnc/patches/tigervnc.xorg-server-1.20.7.diff | 18 | ||||
| -rwxr-xr-x | extra/source/tigervnc/tigervnc.SlackBuild | 26 |
2 files changed, 24 insertions, 20 deletions
diff --git a/extra/source/tigervnc/patches/tigervnc.xorg-server-1.20.7.diff b/extra/source/tigervnc/patches/tigervnc.xorg-server-1.20.7.diff new file mode 100644 index 00000000..4eff6b66 --- /dev/null +++ b/extra/source/tigervnc/patches/tigervnc.xorg-server-1.20.7.diff @@ -0,0 +1,18 @@ +--- ./unix/xserver/hw/vnc/xvnc.c.orig 2019-12-20 01:02:02.000000000 -0600 ++++ ./unix/xserver/hw/vnc/xvnc.c 2020-02-09 16:48:59.587362042 -0600 +@@ -295,6 +295,15 @@ + } + #endif + ++#if INPUTTHREAD ++/** This function is called in Xserver/os/inputthread.c when starting ++ the input thread. */ ++void ++ddxInputThreadInit(void) ++{ ++} ++#endif ++ + void ddxUseMsg(void) + { + vncPrintBanner(); diff --git a/extra/source/tigervnc/tigervnc.SlackBuild b/extra/source/tigervnc/tigervnc.SlackBuild index e8fa4942..71d6939d 100755 --- a/extra/source/tigervnc/tigervnc.SlackBuild +++ b/extra/source/tigervnc/tigervnc.SlackBuild @@ -77,13 +77,16 @@ # 1.10.0-2: 18/nov/2019 by Patrick Volkerding <volkerdi@slackware.com> # Rebuilt for new xorg-server. # 1.10.1-1: 20/dec/2019 by Patrick Volkerding <volkerdi@slackware.com> +# 1.10.1-2: 09/feb/2020 by Patrick Volkerding <volkerdi@slackware.com> +# Removed redundant .desktop file. Thanks to upnort. +# Patched for latest xorg-server. # # ----------------------------------------------------------------------------- PKGNAM=tigervnc VERSION=${VERSION:-1.10.1} PVER=$(echo $VERSION | cut -f 1,2 -d . | tr -d .) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TAG=${TAG:-} @@ -202,8 +205,8 @@ cd $PKGNAM-$VERSION || exit 1 # HACK! Force protocol 3.3 for UVNCSC zcat $CWD/patches/force_protocol_3.3_for_UVNCSC.patch.gz | patch -p1 || exit 1 -## Patch to support x.org 1.20 (already included in tigervnc-1.9.0): -#zcat $CWD/patches/tigervnc-support-xorg120.patch.gz | patch -p1 --verbose || exit 1 +# Patch to support xorg-server 1.20.7: +zcat $CWD/patches/tigervnc.xorg-server-1.20.7.diff.gz | patch -p1 --verbose || exit 1 # Explicitly link against libpng to prevent linking errors: zcat $CWD/patches/tigervnc13_link_png.patch.gz | patch -p1 --verbose || exit 1 @@ -309,23 +312,6 @@ for PSIZE in 16 24 32 48; do install -m644 media/icons/tigervnc_${PSIZE}.png \ $PKG/usr/share/icons/hicolor/${PSIZE}x${PSIZE}/apps/tigervnc.png done -cat <<EOT > $PKG/usr/share/applications/tigervnc.desktop -[Desktop Entry] -Encoding=UTF-8 -Name=TigerVNC Viewer -GenericName=VNCViewer (RFB Client) -Comment=Connect to remote desktop -SwallowExec= -Exec=vncviewer -MimeType= -Icon=tigervnc -Path= -TerminalOptions= -Terminal=false -Type=Application -Categories=Network; -StartupWMClass=VNC Viewer: Connection Details -EOT # Add this to the doinst.sh: ! [ -d $PKG/install ] && mkdir -p $PKG/install |