diff options
| author |   Christoph Willing <chris.willing@linux.com> | 2024-03-11 23:26:47 +1000 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-03-16 10:22:30 +0700 |
| commit | ee23de24928d901feef51186675ebd37f66c56dc (patch) | |
| tree | 95b1c2b0996bb65da0680a56bb239117225e560f /office/LibreOffice/LibreOffice.SlackBuild | |
| parent | ba2116183b0f9180dee757a997b6bb86fd23ad68 (diff) | |
| download | slackbuilds-ee23de24928d901feef51186675ebd37f66c56dc.tar.gz slackbuilds-ee23de24928d901feef51186675ebd37f66c56dc.tar.xz | |
office/LibreOffice: Updated for version 24.2.1.2
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'office/LibreOffice/LibreOffice.SlackBuild')
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index fdd2094554..b50cf374e4 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -4,7 +4,7 @@ # Slackware build script for LibreOffice -# Copyright 2015-2023 Christoph Willing Brisbane, Australia +# Copyright 2015-2024 Christoph Willing Sydney, Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,9 +28,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=LibreOffice SRCNAM=libreoffice -VERSION=${VERSION:-7.6.4.1} +VERSION=${VERSION:-24.2.1.2} SHORT_VERSION=${VERSION%.*.*} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -69,6 +69,18 @@ else LIBDIRSUFFIX="" fi +if [ -x /usr/bin/gcc-11.* ]; +then + echo Slackware-15.0 + export CC=/usr/bin/clang + export CXX=/usr/bin/clang++ + CXXCLANGFLAGS="-Wno-c++11-narrowing" +else + echo Slackware-15.0++ + export CC=/usr/bin/gcc + export CXX=/usr/bin/g++ +fi + set -e rm -rf $PKG @@ -203,7 +215,8 @@ fi ./configure \ CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS $CXXCLANGFLAGS" \ + LDFLAGS="-lz" \ NSS_CFLAGS="$(pkg-config --cflags-only-I mozilla-nss)"\ --prefix=/usr \ --mandir=/usr/man \ @@ -243,7 +256,6 @@ fi --with-system-epoxy \ --with-system-expat \ --with-system-hunspell \ - --with-system-icu \ --with-system-jpeg \ --with-system-lcms2 \ --with-system-libodfgen \ @@ -306,6 +318,7 @@ if [ "$HAVE_SRCS_TARBALL" = "0" ]; then fi patch -p0 < $CWD/no-check-if-root.diff +patch -p0 < $CWD/narrowing_0f5dfae.diff # GCC10 requirements (Tx alienBOB) sed -i external/libebook/ExternalProject_libebook.mk \ |