diff options
Diffstat (limited to 'office/LibreOffice')
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 13 | ||||
| -rw-r--r-- | office/LibreOffice/LibreOffice.info | 12 | ||||
| -rw-r--r-- | office/LibreOffice/README | 28 | ||||
| -rw-r--r-- | office/LibreOffice/no-check-if-root.diff | 30 |
4 files changed, 31 insertions, 52 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index 14fd0f2042..2747bc62a1 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-2020 Christoph Willing Brisbane, Australia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ PRGNAM=LibreOffice SRCNAM=libreoffice -VERSION=${VERSION:-6.2.8.2} +VERSION=${VERSION:-7.0.0.3} SHORT_VERSION=${VERSION%.*.*} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -91,15 +91,15 @@ 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} +JAVA=${JAVA:-jdk11} 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 +elif [ "$JAVA" = "jdk11" ]; then + . /etc/profile.d/jdk11.sh use_java="--with-java=java" elif [ "$JAVA" = "no" ]; then use_java="--with-java=no" @@ -154,7 +154,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 @@ -168,7 +167,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & ./autogen.sh \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ - NSS_CFLAGS="$(pkg-config --cflags-only-I mozilla-nss)"\ --prefix=/usr \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -188,7 +186,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ] & $avahi \ $Python3 \ $vlc \ - $kde4 \ $use_ccache \ $use_java \ $parallel \ diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info index fc9a4c48ec..0bd741bde9 100644 --- a/office/LibreOffice/LibreOffice.info +++ b/office/LibreOffice/LibreOffice.info @@ -1,12 +1,12 @@ PRGNAM="LibreOffice" -VERSION="6.2.8.2" +VERSION="7.0.0.3" HOMEPAGE="https://www.libreoffice.org" -DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/6.2.8/libreoffice-6.2.8.2.tar.xz \ - http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-6.2.8.2-srcs.tar.xz" -MD5SUM="1438fdfae3076b8b1b1460054a318f0b \ - b5d5e57832056d8a5625b1d5dc3aa024" +DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.0.0/libreoffice-7.0.0.3.tar.xz \ + http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.0.0.3-srcs.tar.xz" +MD5SUM="5326d58cf100ec0e9796afe4536f177d \ + 8d05fa43ce5c036d8273982f3d81606a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python3 openjdk7 apache-ant perl-Archive-Zip" +REQUIRES="apache-ant perl-Archive-Zip jdk11" MAINTAINER="Christoph Willing" EMAIL="chris.willing@linux.com" diff --git a/office/LibreOffice/README b/office/LibreOffice/README index dc7ee5981e..12c452a089 100644 --- a/office/LibreOffice/README +++ b/office/LibreOffice/README @@ -35,30 +35,22 @@ Build time environment variables that may be set to vary features are as follows VLC="yes" This requires the vlc package (available from SBo) to be installed. -2. disable kde4 support (enabled by default) with: - KDE4="no" - -3. support additional languages by overriding the LOLANGS variable, whose +2. support additional languages by overriding the LOLANGS variable, whose default setting is LOLANGS="de es fr id it ja nl vi zh-CN". Note that en-US is always added to whatever LOLANGS is set. Thus building with, for example, - LOLANGS="de" sh LibreOffice + LOLANGS="de" sh LibreOffice.SlackBuild would build LibreOffice with support for german and US english languages. Additionally, setting LOLANGS="ALL" will build in support for all available languages. -4. A number of Java Development Kits are suitable for building LibreOffice. - The default JDK for this SlackBuild is openjdk7. Others may be chosen by - setting the JAVA environment variable when running the SlackBuild. Recognised - values are openjdk7 (the default, not explicitly required), openjdk8 and jdk - e.g. JAVA=jdk (to use SBo jdk package with Oracle binary version). Using an - alternate JDK will require presence of the appropriate package when building - LibreOffice. Since the apache-ant package is already required by openjdk7, - hence openjdk8, its listing in the REQUIRES field is redundant in these cases. - However it remains listed to accomodate the case of JAVA=jdk, in which the - apache-ant package is needed to build LibreOffice. - Finally, setting JAVA=no will build LibreOffice without any Java support. +3. Previously, a number of Java Development Kits have been suitable for building + LibreOffice. At the moment however (since, at least, LO version 7.0.0.3) this + build has been tested only with jdk11 - this is now the default. If the jdk11 + prerequisite is not acceptable for some reason, it is still possible to build + LibreOffice (with somewhat reduced capability in LO Base) by running: + JAVA=no sh LibreOffice.SlackBuild -5. The number of parallel make jobs used by the LibreOffice build system defaults +4. The number of parallel make jobs used by the LibreOffice build system defaults to the number of available cpu cores. If the MAKEFLAGS environment variable contains the -j option e.g. MAKEFLAGS=-j6 @@ -69,7 +61,7 @@ Build time environment variables that may be set to vary features are as follows which would limit building to a single make process, overriding any value set with the -j option in MAKEFLAGS. -6. Use of ccache during building is turned off by default to save disk space (and +5. Use of ccache during building is turned off by default to save disk space (and possible build failure due to lack of disk space). It may be reinstated by setting the USE_CCACHE environment to "yes" e.g. USE_CCACHE=yes sh LibreOffice.SlackBuild diff --git a/office/LibreOffice/no-check-if-root.diff b/office/LibreOffice/no-check-if-root.diff index ff63ada2f7..3d1cc6907f 100644 --- a/office/LibreOffice/no-check-if-root.diff +++ b/office/LibreOffice/no-check-if-root.diff @@ -1,20 +1,10 @@ ---- Makefile.orig 2018-02-07 22:18:13.161535968 +1000 -+++ Makefile 2018-02-07 22:17:41.560533422 +1000 -@@ -9,7 +9,7 @@ - - gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot - --.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) -+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) - - MAKECMDGOALS?=all - build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\ -@@ -254,7 +254,7 @@ - # - # Bootstrap - # --bootstrap: check-if-root compilerplugins -+bootstrap: compilerplugins - - # - # Build +--- Makefile.orig 2020-08-24 20:32:27.135000000 +1000 ++++ Makefile 2020-08-24 20:33:56.988000000 +1000 +@@ -63,7 +63,6 @@ + echo; \ + echo 'Building LibreOffice as root is a very bad idea, use a regular user.'; \ + echo; \ +- exit 1; \ + fi + + gb_Side ?= host |