From 19b837d65279d9bf3c4fbe5280ba168d267f7713 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 12 Apr 2015 13:48:26 +0000 Subject: Tigervnc: updated to 1.4.3 (includes libjpeg-turbo 1.4.0) --- tigervnc/build/tigervnc.SlackBuild | 73 ++++++++++---------------------------- 1 file changed, 18 insertions(+), 55 deletions(-) diff --git a/tigervnc/build/tigervnc.SlackBuild b/tigervnc/build/tigervnc.SlackBuild index 48524435..6e94eda3 100755 --- a/tigervnc/build/tigervnc.SlackBuild +++ b/tigervnc/build/tigervnc.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash # $Id$ -# Copyright 2010, 2011, 2012, 2013 Eric Hameleers, Eindhoven. NL +# Copyright 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven. NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -57,11 +57,13 @@ # seem to have been addressed in 1.3.0. # Build against private versions of libjpeg-turbo and fltk, # in order to eliminate external dependencies. +# 1.4.3-1: 11/apr/2015 by Eric Hameleers +# * Update. # # ----------------------------------------------------------------------------- PKGNAM=tigervnc -VERSION=${VERSION:-1.3.0} +VERSION=${VERSION:-1.4.3} PVER=$(echo $VERSION | cut -f1,2 -d. --output-delimiter=) BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} @@ -69,7 +71,7 @@ TAG=${TAG:-alien} # We compile static libraries for libjpeg-turbo and fltk so that they do # not conflict with (unpatched) system packages: -JPEG=1.3.0 +JPEG=1.4.0 FLTK=1.3.2 # TigerVNC needs to use source of the X.Org server whose version matches @@ -103,6 +105,10 @@ fi DOCS="BUILDING.txt LICENCE.TXT README.txt doc/TODO doc/*.txt doc/*.odt" DOCS_XORG="COPYING ChangeLog" +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + if [ -e $CWD/machine.conf ]; then . $CWD/machine.conf ] elif [ -e /etc/slackbuild/machine.conf ]; then @@ -142,10 +148,6 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - rm -rf $TMP/tmp-${PKGNAM} $PKG mkdir -p $TMP/tmp-${PKGNAM}/deps/usr $PKG cd $TMP/tmp-${PKGNAM} @@ -195,46 +197,10 @@ EOT cd fltk-${FLTK} || exit 1 - # Essentially these patches are copied from BUILDING.txt - # embedded in the tigervnc source tarball: - - # Export dead key information from FLTK to the apps - # http://www.fltk.org/str.php?L2599 - cat $CWD/patches/fltk-1_v4.3.x-keyboard-x11.patch | patch -p1 --verbose || exit 1 - cat $CWD/patches/fltk-1_v4.3.x-keyboard-win32.patch | patch -p1 --verbose || exit 1 - cat $CWD/patches/fltk-1_v6.3.x-keyboard-osx.patch | patch -p1 --verbose || exit 1 - - # Notify applications of changes to the clipboard - # http://www.fltk.org/str.php?L2636 - cat $CWD/patches/fltk-1.3.x-clipboard.patch | patch -p1 --verbose || exit 1 - cat $CWD/patches/fltk-1_v6.3.x-clipboard-x11.patch | patch -p1 --verbose || exit 1 - cat $CWD/patches/fltk-1_v3.3.x-clipboard-win32-fix.patch | patch -p1 --verbose || exit 1 - cat $CWD/patches/fltk-1_v2.3.x-clipboard-win32.patch | patch -p1 --verbose || exit 1 - cat $CWD/patches/fltk-1_v2.3.x-clipboard-osx.patch | patch -p1 --verbose || exit 1 - - # Ability to convert a Fl_Pixmap to a Fl_RGB_Image - # http://www.fltk.org/str.php?L2659 - cat $CWD/patches/pixmap_v2.patch | patch -p1 --verbose || exit 1 - - # Support for custom cursors - # http://www.fltk.org/str.php?L2660 - cat $CWD/patches/fltk-1_v5.3.x-cursor.patch | patch -p1 --verbose || exit 1 - - # Improve modality interaction with WM - # http://www.fltk.org/str.php?L2802 - cat $CWD/patches/fltk-1_v2.3.0-modal.patch | patch -p1 --verbose || exit 1 - - # Window icons - # http://www.fltk.org/str.php?L2816 - cat $CWD/patches/fltk-1_v3.3.0-icons.patch | patch -p1 --verbose || exit 1 - - # Multihead - # http://fltk.org/str.php?L2860 - cat $CWD/patches/fltk-1.3.x-screen_num.patch | patch -p1 --verbose || exit 1 - cat $CWD/patches/fltk-1_v3.3.x-multihead.patch | patch -p1 --verbose || exit 1 - - # Verbose build output: - sed -i -e '\,^.SILENT:,d' makeinclude.in + # The tigervnc source tarball contains all required patches to fltk: + for PATCH in ../$PKGNAM-$VERSION/contrib/fltk/*.patch ; do + cat $PATCH | patch -p1 --verbose || exit 1 + done ./configure \ --prefix=$TMP/tmp-${PKGNAM}/deps/usr \ @@ -263,11 +229,6 @@ EOT cd $PKGNAM-$VERSION || exit 1 -# Apply some patches from SVN: -cat $CWD/patches/tigervnc${PVER}_screenindex.patch | patch -p2 --verbose || exit 1 -cat $CWD/patches/tigervnc${PVER}_typecast.patch | patch -p2 --verbose || exit 1 -cat $CWD/patches/tigervnc${PVER}_clipboard_probe.patch | patch -p2 --verbose || exit 1 - # Explicitly link against libpng to prevent linking errors: cat $CWD/patches/tigervnc13_link_png.patch | patch -p1 --verbose || exit 1 @@ -279,8 +240,10 @@ sed -i -e 's#DESTINATION vnc/class#DESTINATION share/tigervnc/class#'g $(grep -r export LDFLAGS="$SLKLDFLAGS -ldl -lpthread" export CXXFLAGS="$SLKCFLAGS -fpermissive -I $(pwd)/common" -# Fix the man page installation: -sed -i -e 's,set(MAN_DIR "${DATA_DIR}/man"),set(MAN_DIR "${MAN_INSTALL_DIR}"),' CMakeLists.txt +# Fix the man page and documentation installation: +sed -e 's,set(MAN_DIR "${DATA_DIR}/man"),set(MAN_DIR "${MAN_INSTALL_DIR}"),' \ + -e 's,set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/,set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/,' \ + -i CMakeLists.txt mkdir -p build cd build @@ -371,7 +334,7 @@ done cat < $PKG/usr/share/applications/tigervnc.desktop [Desktop Entry] Encoding=UTF-8 -Name=TigerVNC +Name=TigerVNC Viewer GenericName=VNCViewer (RFB Client) Comment=Connect to remote desktop SwallowExec= -- cgit v1.2.3-65-gdbad