Also build the java applet

1 files changed, 73 insertions, 59 deletions

diff --git a/tigervnc/build/tigervnc.SlackBuild b/tigervnc/build/tigervnc.SlackBuild
index e0addcd1..d63cb740 100755
--- a/tigervnc/build/tigervnc.SlackBuild
+++ b/tigervnc/build/tigervnc.SlackBuild
@@ -28,7 +28,7 @@
 # For:        tigervnc
 # Descr:      VNC server and client
 # URL:        http://tigervnc.org/
-# Needs:      
+# Needs:      jdk (only during building the java applet)
 # Changelog:  
 # r4126-1:    31/Aug/2010 by Eric Hameleers <alien@slackware.com>
 #             * Initial build.
@@ -52,8 +52,8 @@ TAG=${TAG:-alien}
 XORG=${XORG:-$(X -version 2>&1 | grep "^X.Org X Server " | cut -f4 -d' ')}
 
 # This covers most filenames you'd want as documentation. Change if needed.
-DOCS="ABOUT* AUTHORS BUGS ChangeLog* COPYING CREDITS FAQ GPL* HACKING \
-      LICENSE MAINTAINERS NEWS README* TODO"
+DOCS="LICENCE.TXT doc/TODO doc/*.txt doc/*.odt"
+DOCS_XORG="COPYING ChangeLog"
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -196,25 +196,34 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
 done
 cd ${PRGNAM}-${VERSION}
 
-# Move the X.Org server sources into the TigerVNC tree:
+# Move the xorg-server sources into the TigerVNC tree:
 mv unix/xserver/hw/vnc ../xorg-server-${XORG}/hw/
 rm -rf unix/xserver/hw
 mv ../xorg-server-${XORG}/* unix/xserver/
 
+# Patch the xorg-server source to include building vnc driver:
+cd unix/xserver
+  cat ../xserver19.patch | patch -p1 --verbose \
+    2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+cd -
+
+# Explicitly put the java applet into a directory named 'tigervnc':
+sed -i -e 's#/vnc/class#/tigervnc/class#'g $(grep -rl vnc/class .)
+
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 echo Building ...
-export LDFLAGS="$SLKLDFLAGS -lpthreads"
+export LDFLAGS="$SLKLDFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
 
+echo "*** Building tigervnc ***"
 autoreconf -vif 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --localstatedir=/var \
   --sysconfdir=/etc \
@@ -224,55 +233,70 @@ autoreconf -vif 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
   --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
+make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+
 cd unix/xserver
-autoreconf -vif 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+  echo "*** Building xserver ***"
+  autoreconf -vif 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+
+  # 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"
+
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --disable-static \
+    --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+    --disable-xwin --disable-xephyr --disable-kdrive \
+    --disable-xinerama --disable-composite \
+    --enable-install-libxf86config \
+    --enable-xcsecurity \
+    --enable-glx-tls \
+    --with-pic \
+    --with-int10=x86emu \
+    --with-default-font-path="${DEF_FONTPATH}" \
+    --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
+    --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
+    --with-xkb-path=/etc/X11/xkb \
+    --with-xkb-output=/var/lib/xkb \
+    --disable-config-dbus \
+    --disable-config-hal \
+    --with-os-name="Slackware 13.1" \
+    --with-os-vendor="Slackware Linux Project" \
+    --with-builderstring="Built by Alien BOB on $(date -u)" \
+    --build=$ARCH-slackware-linux \
+    2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+    # For future versions of xorg-server:
+    #--disable-config-udev \
+
+  make $NUMJOBS 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+  make -C hw/vnc DESTDIR=$PKG install 2>&1 | tee -a $OUTPUT/install-${PRGNAM}.log
+cd -
 
-# 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"
+# Compile the java applet (needs the sdk... jre is not enough):
+cd java/src/com/tigervnc/vncviewer
+  make 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+cd -
 
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --infodir=/usr/info \
-  --mandir=/usr/man \
-  --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
-  --disable-xwin --disable-xephyr --disable-kdrive \
-  --disable-xinerama --disable-composite \
-  --disable-xorgcfg \
-  --disable-xprint \
-  --disable-static \
-  --enable-install-libxf86config \
-  --enable-xcsecurity \
-  --enable-glx-tls \
-  --with-pic \
-  --with-int10=x86emu \
-  --with-default-font-path="${DEF_FONTPATH}" \
-  --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
-  --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
-  --with-rgb-path=/usr/share/X11/rgb \
-  --with-xkb-path=/etc/X11/xkb \
-  --with-xkb-output=/var/lib/xkb \
-  --disable-config-dbus \
-  --disable-config-hal \
-  --with-os-name="Slackware 13.1" \
-  --with-os-vendor="Slackware Linux Project" \
-  --with-builderstring="Built by Alien BOB on $(date -u)" \
-  --build=$ARCH-slackware-linux \
-  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-  # For future versions of xorg-server:
-  #--disable-config-udev \
+# Create .png icons from the .svg file:
+make -C media 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 
-make $NUMJOBS 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-make -C hw/vnc DESTDIR=$PKG install 2>&1 | tee -a $OUTPUT/install-${PRGNAM}.log
+#  Install the java applet:
+cd java/src/com/tigervnc/vncviewer
+  mkdir -p $PKG/usr/share/tigervnc/classes
+  install -m0755 VncViewer.jar $PKG/usr/share/tigervnc/classes/
+  install -m0644 index.vnc $PKG/usr/share/tigervnc/classes/
+  install -m0644 *.class $PKG/usr/share/tigervnc/classes/
 cd -
 
 # Install menu entry:
-mkdir -p $PKG/usr/share/{applications,icons/hicolor/{16x16,24x24,48x48}/apps}
-cd media/icons
-for PSIZE in 16 24 48; do
-  install -m644 tigervnc_${PSIZE}.png \
+mkdir -p $PKG/usr/share/{applications,icons/hicolor/{16x16,24x24,32x32,48x48}/apps}
+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
@@ -301,21 +325,17 @@ if [ -x usr/bin/update-desktop-database ]; then
   chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
 fi
 
-! [ -d $PKG/install ] && mkdir -p $PKG/install
-cat <<EOT >> $PKG/install/doinst.sh
 # Update the mime database:
 if [ -x usr/bin/update-mime-database ]; then
   chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
-# Import .info files into the info database:
-#chroot . install-info /usr/info/XXXXX.info.gz /usr/info/dir 2> /dev/null
-
 EOT
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+for FIL in $(echo $DOCS_XORG); do cp -a unix/xserver/$FIL $PKG/usr/doc/$PRGNAM-$VERSION/${FIL}.xorg ; done || true
 cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
@@ -326,12 +346,6 @@ if [ -d $PKG/usr/man ]; then
   for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 fi
 
-# Compress info pages and remove the package's dir file:
-if [ -d $PKG/usr/info ]; then
-  rm -f $PKG/usr/info/dir
-  gzip -9f $PKG/usr/info/*.info*
-fi
-
 # Strip binaries (if any):
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true