office/LibreOffice: Update for version 5.1.0.3

1 files changed, 8 insertions, 22 deletions

diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 4e1fd0fa27..794acc23f0 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=LibreOffice
 SRCNAM=libreoffice
-VERSION=${VERSION:-5.0.4.2}
+VERSION=${VERSION:-5.1.0.3}
 SHORT_VERSION=${VERSION%.*.*}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -36,7 +36,7 @@ HAVE_SRCS_TARBALL=${HAVE_SRCS_TARBALL:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -47,7 +47,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
@@ -74,16 +74,6 @@ if [ "$HAVE_SRCS_TARBALL" = "1" ]; then
   tar xvf $CWD/$SRCNAM-${VERSION}-srcs.tar.xz
 fi
 
-mkdir -p src
-for aname in $SRCNAM-{dictionaries,help,translations}-$VERSION.tar.xz ; do
-  if [ -f $CWD/$aname ]; then
-    cp -p $CWD/$aname src/
-  fi
-done
-# testTdf87924 fails on x?86
-if [ "$ARCH" != "x86_64" ]; then
-  patch -p0 < $CWD/010_testTdf87924.diff
-fi
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -94,6 +84,7 @@ find -L . \
 # Options
 avahi=""    ; [ "${AVAHI:-yes}" != "no" ]      && avahi="--enable-avahi"
 vlc=""      ; [ "${VLC:-no}" != "no" ]         && vlc="--enable-vlc"
+LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"}
 
 # LibreOffice.info REQUIRES jdk
 [ -z $JAVA_HOME ] && . /etc/profile.d/jdk.sh
@@ -110,6 +101,7 @@ vlc=""      ; [ "${VLC:-no}" != "no" ]         && vlc="--enable-vlc"
     --build=$ARCH-slackware-linux \
     --with-build-version="SlackBuild for $PRGNAM-$VERSION by $PACKAGER" \
     --with-vendor="Just Another Slacker" \
+    --with-lang="$LOLANGS" \
     --enable-release-build=yes  \
     --enable-python="system" \
     --enable-gio \
@@ -123,6 +115,7 @@ vlc=""      ; [ "${VLC:-no}" != "no" ]         && vlc="--enable-vlc"
     --without-gssapi \
     --without-junit \
     --with-ant-home=lib$LIBDIRSUFFIX/apache-ant \
+    --with-help=common \
     --with-system-boost \
     --with-system-cairo \
     --with-system-curl \
@@ -140,7 +133,6 @@ vlc=""      ; [ "${VLC:-no}" != "no" ]         && vlc="--enable-vlc"
     --with-system-libwpg \
     --with-system-libxml \
     --with-system-mariadb \
-    --with-system-mesa-headers \
     --with-system-neon \
     --with-system-nss \
     --with-system-openssl \
@@ -151,20 +143,14 @@ vlc=""      ; [ "${VLC:-no}" != "no" ]         && vlc="--enable-vlc"
 
 
 #Create a srcs tarball if we don't already have one
-#
+chmod a+x bin/unpack-sources
 if [ "$HAVE_SRCS_TARBALL" = "0" ]; then
   make fetch
-  tar cvf - external/tarballs \
-	--exclude="external/tarballs/libreoffice-help-${VERSION}*" \
-        --exclude="external/tarballs/libreoffice-dictionaries-${VERSION}*" \
-        --exclude="external/tarballs/libreoffice-binfilter-$VERSION}*" \
-        --exclude="external/tarballs/libreoffice-translations-${VERSION}*" \
-        | xz -c > $CWD/$SRCNAM-$VERSION-srcs.tar.xz
+  tar cvf - external/tarballs | xz -c > $CWD/$SRCNAM-$VERSION-srcs.tar.xz
   echo ; echo "Run build script again with HAVE_SRCS_TARBALL=1"
   exit 0
 fi
 
-
 export LDFLAGS="-lboost_system"
 make build
 make distro-pack-install DESTDIR=$PKG