Merge pull request #2855 from mariux64/libreoffice-update-7.5

Libreoffice update 7.5
mariux64 · Feb 23, 2023 · 0e37889 · 0e37889
2 parents 12f8f97 + 6a37472
commit 0e37889
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/libreoffice.be0 b/libreoffice.be0
@@ -1,15 +1,17 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION libreoffice-7.2.2.2-0
+#export BEE_TMP_TMPDIR=/scratch/local2 BEE_TMP_BUILDROOT=/scratch/local2/bee-root BEE_MAKEFLAGS='-j80'
 
-# SRCURL[0]="https://download.documentfoundation.org/libreoffice/src/${PKGVERSION[3]}/libreoffice-${PKGVERSION}.tar.xz"
-SRCURL[0]="https://beehive.molgen.mpg.de/e99925407daf562d0a996b6812df718c/libreoffice-7.2.2.2.tar.xz"
+# BEE_VERSION libreoffice-7.5.1.1-0
 
-# 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/f3aac35cc060c5d6dd14477aa94ad16e/tarballs-7.2.2.2.tar"
+#SRCURL[0]="https://download.documentfoundation.org/libreoffice/src/${PKGVERSION[3]}/libreoffice-${PKGVERSION}.tar.xz"
+SRCURL[0]="https://beehive.molgen.mpg.de/58c11da34e85fcc294408fd78deb74d1/libreoffice-7.5.1.1.tar.xz"
 
-# PATCHURL+=()
+# from download Makefile.fetch tar -cf tarballs-${PKGVERSION}.tar external/tarballs
+SRCURL[1]="https://beehive.molgen.mpg.de/880c058f7a4a841e1457d3d4dbf03d9c/tarballs-7.5.1.1.tar"
+
+PATCHURL+=("https://beehive.molgen.mpg.de/7d4b97aa2077236456a837fc4c36ca7a/libassuan_autoheader.patch")
+PATCHURL+=("https://beehive.molgen.mpg.de/40fa10212ec76ad2fa19b144e7621cc6/fix_install_error.patch")
 
 # build_in_sourcedir
 
@@ -29,25 +31,31 @@ mee_extract_post() {
 
 mee_configure() {
 
-    . /pkg/jdk-9.0.1-0/profile
+    . /pkg/openjdk-17.0.2.8-0/profile
+    . /pkg/apache-ant-1.10.12-0/profile
+
+    #checking for number of processors to use... ./configure: line 44675: test: -j80: integer expression expected
+    if [[ ${BEE_MAKEFLAGS:: 2} == "-j" ]]; then
+      LALA=${BEE_MAKEFLAGS: 2}
+    fi
 
-    bee_configure \
+    ${S}/autogen.sh \
+        --prefix=${PREFIX} \
         --with-lang=de \
+        --with-vendor=MarIuX \
         --with-help \
-        --with-jdk-home=/pkg/jdk-9.0.1-0 \
-        --with-ant-home=/package/mariux64/ant \
+        --with-jdk-home=/pkg/openjdk-17.0.2.8-0 \
         --without-doxygen \
         --without-junit \
         --disable-dconf \
         --disable-epm \
         --disable-odk \
+        --disable-skia \
         --enable-release-build \
         --enable-python=internal \
-        --with-system-apr \
         --with-system-cairo \
         --with-system-curl \
         --with-system-expat \
-        --with-system-harfbuzz \
         --with-system-icu \
         --with-system-jpeg \
         --with-system-lcms2 \
@@ -59,13 +67,13 @@ mee_configure() {
         --with-system-openssl \
         --with-system-poppler \
         --with-system-postgresql \
-        --with-system-serf \
-        --with-system-zlib
+        --with-system-zlib \
+        --with-parallelism=${LALA}
     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
+    ln -s ${S}/src/libreoffice-help-${PKGVERSION}/helpcontent2 ${S}/helpcontent2
+    ln -s ${S}/src/libreoffice-translations-${PKGVERSION}/translations ${S}/translations
 
 }
 
@@ -75,7 +83,7 @@ mee_build() {
 }
 
 mee_install() {
-    start_cmd make ${BEE_MAKEFLAGS} distro-pack-install DESTDIR=${D}
+    start_cmd make DESTDIR=${D} distro-pack-install
     # message *[libreoffice] openoffice symlink not found* in helpdesk
     start_cmd ln -sv ${D}${BINDIR}/libreoffice ${D}${BINDIR}/openoffice