icedtea-web: update to 1.8.3

1 files changed, 47 insertions, 37 deletions

diff --git a/icedtea-web/build/icedtea-web.SlackBuild b/icedtea-web/build/icedtea-web.SlackBuild
index 1588261b..03ef1d78 100755
--- a/icedtea-web/build/icedtea-web.SlackBuild
+++ b/icedtea-web/build/icedtea-web.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017  Eric Hameleers, Eindhoven, The Netherlands
+# Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2019  Eric Hameleers, Eindhoven, The Netherlands
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -21,44 +21,43 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=icedtea-web
-VERSION=${VERSION:-1.7}
+SRCNAM=IcedTea-Web-${PKGNAM}
+VERSION=${VERSION:-1.8.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-"alien"}
 
-NUMJOBS=${NUMJOBS:--j6}
+NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+case "$ARCH" in
+  i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  x86_64)    SLKCFLAGS="-O2 -fPIC"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+             ;;
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
+  *)         SLKCFLAGS=${SLKCFLAGS:-"-O2"}
+             SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
+             ;;
+esac
 
 case "$ARCH" in
     arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
@@ -68,10 +67,10 @@ esac
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
-rm -rf $PKGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
 echo Extracting...
-tar xf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
+tar xf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -81,8 +80,13 @@ find . \
 
 [ ! -x configure  ] && ./autogen.sh
 
-# We use seamonkey, not xulrunner:
-sed -i -e 's/mozilla-plugin/seamonkey-plugin/g' configure
+if pkg-config --exists seamonkey-plugin 1>/dev/null ; then
+  # We use seamonkey, not xulrunner:
+  sed -i -e 's/mozilla-plugin/seamonkey-plugin/g' configure
+  PLUGIN_OPTS=""
+else
+  PLUGIN_OPTS="--disable-native-plugin"
+fi
 
 # IcedTea Web 1.1 and later do not install into the JDK/JRE directory but
 # straight into /usr/lib
@@ -95,20 +99,25 @@ LDFLAGS="$SLKLDFLAGS" \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
   --sysconfdir=/etc/ \
+  --with-itw-libs=BUNDLED \
   --with-jdk-home=/usr/lib${LIBDIRSUFFIX}/java \
   --with-jre-home=/usr/lib${LIBDIRSUFFIX}/java/jre \
   --with-pkgversion=$(cat /etc/slackware-version |tr ' ' '-')-$ARCH \
+  --without-browser-tests \
   --disable-docs \
+  ${PLUGIN_OPTS} \
   --build=$TARGET
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Provide a link to the plugin for browsers:
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-  ln -sf /usr/lib${LIBDIRSUFFIX}/IcedTeaPlugin.so
-)
+if pkg-config --exists seamonkey-plugin 1>/dev/null ; then
+  # Provide a link to the plugin for browsers:
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+  ( cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+    ln -sf /usr/lib${LIBDIRSUFFIX}/IcedTeaPlugin.so
+  )
+fi
 
 # Install desktop files:
 mkdir -p $PKG/usr/share/{applications,pixmaps}
@@ -129,14 +138,15 @@ fi
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog NEWS README \
+  AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS NEW_LINE_IFS README \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # Add package description and post-install script:
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# Create the package:
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD${TAG}.txz