diff options
Diffstat (limited to 'office/LibreOffice/LibreOffice.SlackBuild')
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index 14fd0f2042..c984e6e079 100644 --- a/office/LibreOffice/LibreOffice.SlackBuild +++ b/office/LibreOffice/LibreOffice.SlackBuild @@ -4,7 +4,7 @@ # Slackware build script for LibreOffice -# Copyright 2015-2019 Christoph Willing Brisbane, Australia +# Copyright 2015-2021 Christoph Willing Brisbane, Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,11 +26,10 @@ PRGNAM=LibreOffice SRCNAM=libreoffice -VERSION=${VERSION:-6.2.8.2} +VERSION=${VERSION:-7.1.2.2} SHORT_VERSION=${VERSION%.*.*} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -PACKAGER=${PACKAGER:-"AnonymousCoward"} HAVE_SRCS_TARBALL=${HAVE_SRCS_TARBALL:-1} @@ -91,16 +90,22 @@ jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true # If PARALLEL environment variable is set, use that to override everything. [ "${PARALLEL:-0}" != "0" ] && parallel="--with-parallelism=$PARALLEL" -JAVA=${JAVA:-openjdk7} -if [ "$JAVA" = "openjdk7" ]; then - . /etc/profile.d/openjdk7.sh - use_java="--with-java=java" -elif [ "$JAVA" = "openjdk8" ]; then - . /etc/profile.d/openjdk8.sh - use_java="--with-java=java" -elif [ "$JAVA" = "jdk" ]; then - . /etc/profile.d/jdk.sh - use_java="--with-java=java" +JAVA=${JAVA:-jdk11} +if [ "$JAVA" = "jdk11" ]; then + . /etc/profile.d/jdk11.sh + use_java="--with-jdk-home=$JAVA_HOME" +elif [ "$JAVA" = "jdk12" ]; then + . /etc/profile.d/jdk12.sh + use_java="--with-jdk-home=$JAVA_HOME" +elif [ "$JAVA" = "jdk13" ]; then + . /etc/profile.d/jdk13.sh + use_java="--with-jdk-home=$JAVA_HOME" +elif [ "$JAVA" = "jdk14" ]; then + . /etc/profile.d/jdk14.sh + use_java="--with-jdk-home=$JAVA_HOME" +elif [ "$JAVA" = "jdk15" ]; then + . /etc/profile.d/jdk15.sh + use_java="--with-jdk-home=$JAVA_HOME" elif [ "$JAVA" = "no" ]; then use_java="--with-java=no" fi @@ -154,7 +159,6 @@ if pkg-config --exists python3 ; then Python3="--enable-python=system" ; else Py if pkg-config --exists Qt5 ; then qt5="--enable-qt5" ; else qt5="" ; fi if pkg-config --exists valgrind ; then valgrind="--with-valgrind" ; else valgrind="" ; fi -kde4="--enable-kde4" ; [ "${KDE4:-yes}" != "yes" ] && kde4="--disable-kde4" use_ccache="--disable-ccache" ; [ "${USE_CCACHE:-no}" != "no" ] && use_ccache="" # Extensions @@ -175,7 +179,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & --libdir=/usr/lib$LIBDIRSUFFIX \ --sysconfdir=/etc \ --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 \ @@ -188,7 +191,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & $avahi \ $Python3 \ $vlc \ - $kde4 \ $use_ccache \ $use_java \ $parallel \ @@ -225,7 +227,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & --with-system-openldap \ --with-system-openssl \ --with-system-poppler \ - --with-system-redland \ --with-system-sane \ --with-system-zlib \ $coinmp \ @@ -273,6 +274,13 @@ fi patch -p0 < $CWD/no-check-if-root.diff +# GCC10 requirements (Tx alienBOB) +sed -i external/libcdr/ExternalProject_libcdr.mk \ + -e '/configure /i \\t\t&& sed -i "s/TRUE/true/g" src/lib/libcdr_utils.cpp \\' +sed -i external/libebook/ExternalProject_libebook.mk \ + -e '/configure /i \\t\t&& sed -i "s/TRUE/true/g" src/lib/EBOOKCharsetConverter.cpp \\' +sed -i i18npool/source/calendar/calendar_gregorian.cxx -e 's/TRUE/true/' + export LDFLAGS="-lboost_system" make build-nocheck make distro-pack-install DESTDIR=$PKG |