This version works for Slackware 13.37 ... now back to testing on 14

1 files changed, 21 insertions, 13 deletions

diff --git a/tigervnc/build/tigervnc.SlackBuild b/tigervnc/build/tigervnc.SlackBuild
index ba4f8018..ace63606 100755
--- a/tigervnc/build/tigervnc.SlackBuild
+++ b/tigervnc/build/tigervnc.SlackBuild
@@ -61,7 +61,7 @@ TAG=${TAG:-alien}
 # TigerVNC needs to use source of the X.Org server whose version matches
 # that of your installed X.Org package:
 XORG=${XORG:-$(X -version 2>&1 | grep "^X.Org X Server " | cut -f4 -d' ')}
-#PATCHVER="$(echo $XORG | cut -f1,2 -d. | tr -d '.')"
+MAXPATCHVER="$(echo $XORG | cut -f1,2 -d. | tr -d '.')"
 
 # OS Stamp into the binaries:
 OSNAME="$(head -1 /etc/slackware-version)"
@@ -231,11 +231,6 @@ mv ../xorg-server-${XORG}/* unix/xserver/
 
 touch $OUTPUT/patch-$PRGNAM.log
 
-# The sed magic in the hw/vnc Makefile needs some love:
-# ... taken care of in the xserver113 patch if we ever move to X.Org 1.13.
-cat $SRCDIR/xorg_headers_fix_reservedwords.patch | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
-
 # We have patches for X.Org later than 1.10 which tigervnc does not have:
 for PATCHVER in 111 112 113 ; do
   if [ -e $SRCDIR/tigervnc$(echo $VERSION | cut -f1,2 -d. --output-delimiter=)-xorg${PATCHVER}.patch ]; then
@@ -243,15 +238,28 @@ for PATCHVER in 111 112 113 ; do
   fi
 done
 
+if [ $MAXPATCHVER -gt 110 ]; then
+  # The sed magic in the hw/vnc Makefile needs some love:
+  # ... taken care of in the xserver113 patch if we ever move to X.Org 1.13.
+  cat $SRCDIR/xorg_headers_fix_reservedwords.patch | patch -p1 --verbose \
+    2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+fi
+
 # Patch the xorg-server source to include building the vnc driver
-# (these patches are incremental and must be applied in order):
 cd unix/xserver
-  for PATCHVER in 110 111 112 ; do
-    if [ -e ../xserver${PATCHVER}.patch ]; then
-      cat ../xserver${PATCHVER}.patch | patch -p1 --verbose \
-        2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
-    fi
-  done
+  if [ $MAXPATCHVER -le 110 ]; then
+    # apply one of the tigervnc-provided patches:
+    cat ../xserver${MAXPATCHVER}.patch | patch -p1 --verbose \
+      2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+  else
+    # these external patches are incremental and must be applied in order:
+    for PATCHVER in 110 111 112 ; do
+      if [ $PATCHVER -le $MAXPATCHVER -a -e ../xserver${PATCHVER}.patch ]; then
+        cat ../xserver${PATCHVER}.patch | patch -p1 --verbose \
+          2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+      fi
+    done
+  fi
 cd -
 
 # Explicitly put the java applet into a directory named 'tigervnc':