office/LibreOffice: Support new mdds, liborcus

Signed-off-by: Christoph Willing <chris.willing@linux.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index a13ada40e12a8..1df7c946bfb1d 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -28,7 +28,7 @@ PRGNAM=LibreOffice
 SRCNAM=libreoffice
 VERSION=${VERSION:-6.1.3.2}
 SHORT_VERSION=${VERSION%.*.*}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PACKAGER=${PACKAGER:-"AnonymousCoward"}
 
@@ -70,8 +70,12 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
 cd $SRCNAM-$VERSION
 
+# Required for updates to mdds, liborcus (needs autogen.sh)
+patch -p1 < $CWD/0001-Update-mdds-to-1.4.1.patch
+patch -p1 < $CWD/0001-Update-orcus-to-0.14.0.patch
+
 if [ "$HAVE_SRCS_TARBALL" = "1" ]; then
-  tar xvf $CWD/$SRCNAM-${VERSION}-srcs.tar.xz
+  tar xvf $CWD/$SRCNAM-${VERSION}-srcs_2.tar.xz
 fi
 
 chown -R root:root .
@@ -122,7 +126,7 @@ if pkg-config --exists libfreehand-0.1 ; then libfreehand="--with-system-libfree
 if pkg-config --exists libmspub-0.1 ; then libmspub="--with-system-libmspub" ; else libmspub="" ; fi
 if pkg-config --exists libmwaw-0.3 ; then libmwaw="--with-system-libmwaw" ; else libmwaw="" ; fi
 if pkg-config --exists libnumbertext ; then libnumbertext="--with-system-libnumbertext" ; else libnumbertext="" ; fi
-if pkg-config --exists liborcus-0.13 ; then liborcus="--with-system-orcus" ; else liborcus="" ; fi
+if pkg-config --exists liborcus-0.14 ; then liborcus="--with-system-orcus" ; else liborcus="" ; fi
 if pkg-config --exists libpagemaker-0.0 ; then libpagemaker="--with-system-libpagemaker" ; else libpagemaker="" ; fi
 if pkg-config --exists libqxp-0.0 ; then libqxp="--with-system-libqxp" ; else libqxp="" ; fi
 if pkg-config --exists libstaroffice-0.0 ; then libstaroffice="--with-system-libstaroffice" ; else libstaroffice="" ; fi
@@ -132,7 +136,7 @@ if pkg-config --exists libzmf-0.0 ; then libzmf="--with-system-libzmf" ; else li
 if pkg-config --exists libpq ; then postgresql="--with-system-postgresql" ; else postgresql="" ; fi
 if pkg-config --exists libucpp ; then ucpp="--with-system-ucpp" ; else ucpp="" ; fi
 if test -e /usr/include/lpsolve ; then lpsolve="--with-system-lpsolve" ; else lpsolve="" ; fi
-if pkg-config --exists mdds-1.2 ; then mdds="--with-system-mdds" ; else mdds="" ; fi
+if pkg-config --exists mdds-1.4 ; then mdds="--with-system-mdds" ; else mdds="" ; fi
 if test -e /usr/include/mysql_connection.h ; then mysql="--with-system-mysql-cppconn" ; else mysql="" ; fi
 if pkg-config --exists mythes ; then mythes="--with-system-mythes" ; else mythes="" ; fi
 if test -x /usr/bin/odbc_config ; then odbc="--with-system-odbc" ; else odbc="" ; fi
@@ -161,7 +165,7 @@ extwikipub="--enable-ext-wiki-publisher"; [ "${EXTWIKIPUB:-no}" != "yes" ]     &
 extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ]     && extnlpsolver=""
 extmariadb="--enable-ext-mariadb-connector"; [ "${EXTMARIADB:-yes}" != "yes" ]     && extmariadb=""
 
-./configure \
+./autogen.sh \
     CFLAGS="$SLKCFLAGS" \
     CXXFLAGS="$SLKCFLAGS" \
     NSS_CFLAGS="$(pkg-config --cflags-only-I mozilla-nss)"\
@@ -266,7 +270,7 @@ extmariadb="--enable-ext-mariadb-connector"; [ "${EXTMARIADB:-yes}" != "yes" ]
 chmod a+x bin/unpack-sources
 if [ "$HAVE_SRCS_TARBALL" = "0" ]; then
   make fetch
-  tar cvf - external/tarballs | xz -c > $CWD/$SRCNAM-$VERSION-srcs.tar.xz
+  tar cvf - external/tarballs | xz -c > $CWD/$SRCNAM-$VERSION-srcs_2.tar.xz
   echo ; echo "Run build script again with HAVE_SRCS_TARBALL=1"
   exit 0
 fi