From c3abd3b0cf872a5e4215b263d9a9c28c0eefaca8 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Tue, 2 Nov 2021 10:37:30 +0100 Subject: [PATCH] libreoffice: update 6.1.6.3 to 7.2.2.2 - update --- libreoffice.be0 | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index 57c50fa2c..95855efd0 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -1,11 +1,13 @@ #!/usr/bin/env beesh -# BEE_VERSION libreoffice-6.1.6.3-3 +# BEE_VERSION libreoffice-7.2.2.2-0 # SRCURL[0]="https://download.documentfoundation.org/libreoffice/src/${PKGVERSION[3]}/libreoffice-${PKGVERSION}.tar.xz" -SRCURL[0]="https://beehive.molgen.mpg.de/6e0f907156186477c7e465c37cefe69e/libreoffice-6.1.6.3.tar.xz" +SRCURL[0]="https://beehive.molgen.mpg.de/e99925407daf562d0a996b6812df718c/libreoffice-7.2.2.2.tar.xz" + # from download Makefile.fetch -SRCURL[1]="https://beehive.molgen.mpg.de/e82420258eb92722652cbe6764365155/tarballs-6.1.6.3.tar" +# SRCURL[1]="https://beehive.molgen.mpg.de/e82420258eb92722652cbe6764365155/tarballs-6.1.6.3.tar" +SRCURL[1]="https://beehive.molgen.mpg.de/f3aac35cc060c5d6dd14477aa94ad16e/tarballs-7.2.2.2.tar" # PATCHURL+=() @@ -26,10 +28,13 @@ mee_extract_post() { #} mee_configure() { + + . /pkg/jdk-9.0.1-0/profile + bee_configure \ --with-lang=de \ --with-help \ - --with-jdk-home=/usr/local/java \ + --with-jdk-home=/pkg/jdk-9.0.1-0 \ --with-ant-home=/package/mariux64/ant \ --without-doxygen \ --without-junit \ @@ -49,7 +54,6 @@ mee_configure() { --with-system-libatomic_ops \ --with-system-libpng \ --with-system-libxml \ - --with-system-neon \ --with-system-nss \ --with-system-openldap \ --with-system-openssl \ @@ -59,6 +63,10 @@ mee_configure() { --with-system-zlib sed -i 's/all: check-if-root build/all: build/g' ${B}/Makefile sed -i 's/bootstrap: check-if-root compilerplugins/all: compilerplugins/g' ${B}/Makefile + + ln -s ${S}/src/libreoffice-help-7.2.2.2/helpcontent2 ${S}/helpcontent2 + ln -s ${S}/src/libreoffice-translations-7.2.2.2/translations ${S}/translations + } mee_build() {