Updated for the new X.Org 1.14.3 in Slackware 14.1

1 files changed, 11 insertions, 6 deletions

diff --git a/tigervnc/build/tigervnc.SlackBuild b/tigervnc/build/tigervnc.SlackBuild
index 1c8ae48d..237c6972 100755
--- a/tigervnc/build/tigervnc.SlackBuild
+++ b/tigervnc/build/tigervnc.SlackBuild
@@ -48,11 +48,15 @@
 # 1.1.0-3:    22/may/2013 by Eric Hameleers <alien@slackware.com>
 #             * Build 1.1.0 again, on slackware-current (nee 14.1) with new
 #               X.Org 1.13 patches.
-# -----------------------------------------------------------------------------
+# 1.1.0-4:    11/oct/2013 by Eric Hameleers <alien@slackware.com>
+#             * Build 1.1.0 again, on slackware-current (nee 14.1) with new
+#               X.Org 1.14 patches.
+# ----------------------------------------------------------------------------
+
 
 PKGNAM=tigervnc
 VERSION=${VERSION:-1.1.0}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
@@ -114,12 +118,13 @@ esac
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/pkg-$PKGNAM
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
+rm -rf xorg-server-${XORG}
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
 tar xvf $CWD/xorg-server-${XORG}.tar.?z* || exit 1
 cd $PKGNAM-$VERSION || exit 1
@@ -130,7 +135,7 @@ rm -rf unix/xserver/hw
 mv ../xorg-server-${XORG}/* unix/xserver/
 
 # We have patches for X.Org later than 1.10 which tigervnc does not have:
-for PATCHVER in 111 112 113 ; do
+for PATCHVER in 111 112 113 114 ; do
   if [ -e $CWD/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg${PATCHVER}.patch ]; then
     cp $CWD/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg${PATCHVER}.patch unix/xserver${PATCHVER}.patch
   fi
@@ -154,7 +159,7 @@ cd unix/xserver
     cat ../xserver${MAXPATCHVER}.patch | patch -p1 --verbose || exit 1
   else
     # these external patches are incremental and must be applied in order:
-    for PATCHVER in 110 111 112 113 ; do
+    for PATCHVER in 110 111 112 113 114 ; do
       if [ $PATCHVER -le $MAXPATCHVER -a -e ../xserver${PATCHVER}.patch ]; then
         cat ../xserver${PATCHVER}.patch | patch -p1 --verbose || exit 1
       fi
@@ -243,7 +248,7 @@ cd unix/xserver
 cd -
 
 if [ "$DO_APPLET" = "YES" ]; then
-  # Compile the java applet (needs the sdk... jre is not enough):
+  # Compile the java applet (needs the JDK... JRE is not enough):
   cd java/src/com/tigervnc/vncviewer
     make || exit 1
   cd -