From 0ee909f8c03fc890fcaf0ade8d5ad5b5ff68fdc5 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 8 Feb 2023 14:31:10 +0100 Subject: [PATCH 1/9] libreoffice: Update to version 7.5.1.1 remove unrecognize options --- libreoffice.be0 | 2 -- 1 file changed, 2 deletions(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index 95855efd0..de673ddc0 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -43,11 +43,9 @@ mee_configure() { --disable-odk \ --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 \ From ac8eda3545441666df2cb8bcc9d0ccd5c7e0f3ca Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Feb 2023 17:47:53 +0100 Subject: [PATCH 2/9] Libreoffice: Update to version 7.5.1.1 add some hints remove parallel install --- libreoffice.be0 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index de673ddc0..861157544 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -1,15 +1,14 @@ #!/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" # build_in_sourcedir @@ -73,7 +72,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 From b6362b2b89b1631e4fd145d6af9d48795085f1bb Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Feb 2023 17:49:29 +0100 Subject: [PATCH 3/9] Libreoffice: Update to version 7.5.1.1 switch to autogen.sh. because LFS/Arch say so --- libreoffice.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index 861157544..fb4bb30f4 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -30,7 +30,8 @@ mee_configure() { . /pkg/jdk-9.0.1-0/profile - bee_configure \ + ${S}/autogen.sh \ + --prefix=${PREFIX} \ --with-lang=de \ --with-help \ --with-jdk-home=/pkg/jdk-9.0.1-0 \ From ea64db06a6ecfae1dfb276105b0364e2f5ae472c Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Feb 2023 17:51:52 +0100 Subject: [PATCH 4/9] Libreoffice:Update to version 7.5.1.1 disable skia, because we use cairo --- libreoffice.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.be0 b/libreoffice.be0 index fb4bb30f4..238b754b2 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -41,6 +41,7 @@ mee_configure() { --disable-dconf \ --disable-epm \ --disable-odk \ + --disable-skia \ --enable-release-build \ --enable-python=internal \ --with-system-cairo \ From be72905a9f3f3b1bbd2a927de5e2308a6a261f0b Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Feb 2023 17:53:25 +0100 Subject: [PATCH 5/9] Libreoffice:Update to version 7.5.1.1 switch to openjdk and newer ant --- libreoffice.be0 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index 238b754b2..69bc6e89b 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -28,14 +28,16 @@ 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 + ${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 \ From f4a174fe8efd21b7821354eea6863adda28cbce1 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Feb 2023 17:54:32 +0100 Subject: [PATCH 6/9] Libreoffice:Update to version 7.5.1.1 fix problem with autheader PATCHURL+=("https://beehive.molgen.mpg.de/40fa10212ec76ad2fa19b144e7621cc6/fix_install_error.patch") --- libreoffice.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.be0 b/libreoffice.be0 index 69bc6e89b..dd5c750bc 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -10,6 +10,7 @@ SRCURL[0]="https://beehive.molgen.mpg.de/58c11da34e85fcc294408fd78deb74d1/libreo # 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") # build_in_sourcedir # sourcesubdir_append src From 1d0ca8b5c2d324800d348421d4d42ee63fd03c83 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Feb 2023 17:56:05 +0100 Subject: [PATCH 7/9] Libreoffice:Update to version 7.5.1.1 fix install error filelist /scratch/local/bee-schrader/libreoffice/libreoffice-7.5.1.1-0/build/workdir/Package/xmlsec.filelist is empty filelist /scratch/local/bee-schrader/libreoffice/libreoffice-7.5.1.1-0/build/workdir/Package/connectivity_postgresql-sdbc.filelist is empty filelist /scratch/local/bee-schrader/libreoffice/libreoffice-7.5.1.1-0/build/workdir/Package/ure_install.filelist is empty --- libreoffice.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreoffice.be0 b/libreoffice.be0 index dd5c750bc..ef6309cf8 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -11,6 +11,8 @@ SRCURL[0]="https://beehive.molgen.mpg.de/58c11da34e85fcc294408fd78deb74d1/libreo 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 # sourcesubdir_append src From b939e47b85542965229ede12838f2714beb32231 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Feb 2023 17:57:26 +0100 Subject: [PATCH 8/9] Libreoffice:Update to version 7.5.1.1 add parallelism option to configure and fix integer error --- libreoffice.be0 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index ef6309cf8..99c85f1aa 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -34,6 +34,10 @@ mee_configure() { . /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 ${S}/autogen.sh \ --prefix=${PREFIX} \ @@ -63,8 +67,8 @@ 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 From 6a374725f58e85ba73138ab77d359e3632441687 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 Feb 2023 17:58:06 +0100 Subject: [PATCH 9/9] Libreoffice:Update to version 7.5.1.1 replace version with $PKGVERSION --- libreoffice.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index 99c85f1aa..41b0de8c3 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -72,8 +72,8 @@ mee_configure() { 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 }