summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild8
-rw-r--r--office/LibreOffice/LibreOffice.info10
2 files changed, 8 insertions, 10 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 89cbf2653c..c47ac8694d 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=LibreOffice
SRCNAM=libreoffice
-VERSION=${VERSION:-7.3.5.2}
+VERSION=${VERSION:-7.4.0.3}
SHORT_VERSION=${VERSION%.*.*}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -189,7 +189,7 @@ extwikipub="--enable-ext-wiki-publisher"; [ "${EXTWIKIPUB:-no}" != "yes" ] &
extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] && extnlpsolver=""
-./autogen.sh \
+./configure \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
NSS_CFLAGS="$(pkg-config --cflags-only-I mozilla-nss)"\
@@ -221,7 +221,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] &
--without-gssapi \
--without-junit \
--with-help \
- --with-system-apr \
--with-system-bluez \
--with-system-boost \
--with-system-bzip2 \
@@ -243,7 +242,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] &
--with-system-libwpg \
--with-system-libxml \
--with-system-mariadb \
- --with-system-neon \
--with-system-nss \
--with-system-openldap \
--with-system-openssl \
@@ -302,7 +300,7 @@ sed -i external/libebook/ExternalProject_libebook.mk \
export LDFLAGS="-lboost_system"
-make build-nocheck
+make build
make distro-pack-install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index 2014591731..0eb25bf999 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,10 +1,10 @@
PRGNAM="LibreOffice"
-VERSION="7.3.5.2"
+VERSION="7.4.0.3"
HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.3.5/libreoffice-7.3.5.2.tar.xz \
- https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.3.5.2-srcs.tar.xz"
-MD5SUM="4dc75caa0eed5ade12275fc1663a764c \
- b654ccaf602d8348e6b1a03e00441248"
+DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.4.0/libreoffice-7.4.0.3.tar.xz \
+ https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.4.0.3-srcs.tar.xz"
+MD5SUM="5bfb607d302a21315faa5bb49c57cebe \
+ 6bbabc7b207a3ffb2a36ad7bb9cddc2a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="zulu-openjdk11 apache-ant perl-Archive-Zip"