aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@linux.com>2024-07-13 18:54:41 +1000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-07-20 08:09:16 +0700
commit6b9e694eeca60b1ce04cdfe74eab5122459ace6e (patch)
treef6265301110e91d4abc4952ee15ab9e625214f45
parentca1f2521c97a2305c13f390d64ee3b5fbc02079c (diff)
office/LibreOffice: Updated for version 24.2.5.2
Signed-off-by: Christoph Willing <chris.willing@linux.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--office/LibreOffice/LibreOffice.SlackBuild12
-rw-r--r--office/LibreOffice/LibreOffice.info10
2 files changed, 6 insertions, 16 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 3f936d67ecc5..4963b621bf11 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:-24.2.4.2}
+VERSION=${VERSION:-24.2.5.2}
SHORT_VERSION=${VERSION%.*.*}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -203,15 +203,6 @@ extwikipub="--enable-ext-wiki-publisher"; [ "${EXTWIKIPUB:-no}" != "yes" ] &
extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] && extnlpsolver=""
-# Temporary fix for problems with boost > 1.80
-# Results in additional download of compatible boost to use internally
-BOOST_MINOR_VERSION=$(basename $(ls -d /usr/lib${LIBDIRSUFFIX}/cmake/Boost-1.*) | cut -d'.' -f2)
-if [ "$BOOST_MINOR_VERSION" -gt "80" ]; then
- boost="--without-system-boost"
-else
- boost="--with-system-boost"
-fi
-
./configure \
CFLAGS="$SLKCFLAGS" \
@@ -273,7 +264,6 @@ fi
--with-system-poppler \
--with-system-sane \
--with-system-zlib \
- $boost \
$coinmp \
$cppunit \
$glm \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index fb031a546be0..aa436315c099 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,10 +1,10 @@
PRGNAM="LibreOffice"
-VERSION="24.2.4.2"
+VERSION="24.2.5.2"
HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/24.2.4/libreoffice-24.2.4.2.tar.xz \
- https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-24.2.4.2-srcs.tar.xz"
-MD5SUM="ab7051c5dcf61d0cefd792b30e8c7a59 \
- b38369c70774f038709b7f308ee5fdd7"
+DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-24.2.5.2.tar.xz \
+ https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-24.2.5.2-srcs.tar.xz"
+MD5SUM="54f582e82b049f4fbfdc3073551cfea5 \
+ 7a03cd1c29edfdf14735061af1d8229f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="zulu-openjdk17 apache-ant perl-Archive-Zip libcdr libfreehand liblangtag libmspub libzmf"