diff options
Diffstat (limited to 'extra/source/tigervnc/tigervnc.SlackBuild')
| -rwxr-xr-x | extra/source/tigervnc/tigervnc.SlackBuild | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/extra/source/tigervnc/tigervnc.SlackBuild b/extra/source/tigervnc/tigervnc.SlackBuild index bc0b8d8b9..ea80ca233 100755 --- a/extra/source/tigervnc/tigervnc.SlackBuild +++ b/extra/source/tigervnc/tigervnc.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # $Id: tigervnc.SlackBuild,v 1.25 2015/08/26 18:24:43 root Exp root $ # Copyright 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven. NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -76,9 +76,9 @@ # ----------------------------------------------------------------------------- PKGNAM=tigervnc -VERSION=${VERSION:-1.6.0} -PVER=$(echo $VERSION | cut -f1,2 -d. --output-delimiter=) -BUILD=${BUILD:-3} +VERSION=${VERSION:-1.8.0} +PVER=$(echo $VERSION | cut -f 1,2 -d . | tr -d .) +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:" -j7 "} TAG=${TAG:-} @@ -183,14 +183,14 @@ EOT cd $PKGNAM-$VERSION || exit 1 -# Explicitly link against libpng to prevent linking errors: -cat $CWD/patches/tigervnc13_link_png.patch | patch -p1 --verbose || exit 1 +# HACK! Force protocol 3.3 for UVNCSC +patch -p1 < $CWD/patches/force_protocol_3.3_for_UVNCSC.patch -# Allow compiling for xorg-server-1.18.x: -cat $CWD/patches/tigervnc.support.xorg.118.patch | patch -p1 --verbose || exit 1 +# Patch to support x.org 1.20 +cat $CWD/patches/tigervnc-support-xorg120.patch | patch -p1 --verbose || exit 1 -# Fix a compile error with xorg-server-1.18.x: -cat $CWD/patches/tigervnc-xorg118-QueueKeyboardEvents.patch | patch -p1 --verbose || exit 1 +# Explicitly link against libpng to prevent linking errors: +cat $CWD/patches/tigervnc13_link_png.patch | patch -p1 --verbose || exit 1 [ "$DO_APPLET" = "YES" ] && CMAKE_JAVA="ON" || CMAKE_JAVA="OFF" # Explicitly put the java applet into a directory named 'tigervnc': @@ -244,7 +244,7 @@ cd build/unix/xserver/ # Default font paths to be used by the X server DEF_FONTPATH="/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic" - CFLAGS="$CFLAGS -std=c99" \ + CFLAGS="$CFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ |