Skip to content
Jump to bottom

update: libreoffice to 7.6.2.1 #3012

Merged
merged 1 commit into from
Oct 26, 2023
+15 −7
Merged

update: libreoffice to 7.6.2.1 #3012

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 15 additions & 7 deletions libreoffice.be0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@

#export BEE_TMP_TMPDIR=/scratch/local2 BEE_TMP_BUILDROOT=/scratch/local2/bee-root BEE_MAKEFLAGS='-j80'

# BEE_VERSION libreoffice-7.5.1.1-0
# BEE_VERSION libreoffice-7.6.2.1-0

#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"
#SRCURL[0]="https://beehive.molgen.mpg.de/17a8cc75753475b6e8ed7eda4ae66e43/libreoffice-7.5.7.1.tar.xz"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

next time

SRCURL[0]="https://beehive.molgen.mpg.de/13fca0b5df68b445340d7c5f8373e99c/libreoffice-7.6.2.1.tar.xz"

# 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"

# from download Makefile.fetch tar -cf tarballs-${PKGVERSION}.tar source/external/tarballs
#SRCURL[1]="https://beehive.molgen.mpg.de/af267a5a83ef17e843a0a71f35e37f59/tarballs-7.5.7.1.tar"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

next time

SRCURL[1]="https://beehive.molgen.mpg.de/1958345c1501c9e8cd648fa4a16c33b1/tarballs-7.6.2.1.tar"

PATCHURL+=("https://beehive.molgen.mpg.de/7d4b97aa2077236456a837fc4c36ca7a/libassuan_autoheader.patch")
PATCHURL+=("https://beehive.molgen.mpg.de/40fa10212ec76ad2fa19b144e7621cc6/fix_install_error.patch")
#PATCHURL+=("https://beehive.molgen.mpg.de/40fa10212ec76ad2fa19b144e7621cc6/fix_install_error.patch")

# build_in_sourcedir

Expand All @@ -31,8 +34,8 @@ mee_extract_post() {

mee_configure() {

. /pkg/openjdk-17.0.2.8-0/profile
. /pkg/apache-ant-1.10.12-0/profile
p=/pkg/openjdk-17.0.2.8-0/profile; [ -e $p ] && . $p
p=/pkg/apache-ant-1.10.12-0/profile; [ -e $p ] && . $p

#checking for number of processors to use... ./configure: line 44675: test: -j80: integer expression expected
if [[ ${BEE_MAKEFLAGS:: 2} == "-j" ]]; then
Expand All @@ -51,6 +54,7 @@ mee_configure() {
--disable-epm \
--disable-odk \
--disable-skia \
--disable-dependency-tracking \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the record:

  --disable-dependency-tracking
                          Disables generation of dependency information.
                          Speed up one-time builds.],

--enable-release-build \
--enable-python=internal \
--with-system-cairo \
Expand All @@ -75,6 +79,10 @@ mee_configure() {
ln -s ${S}/src/libreoffice-help-${PKGVERSION}/helpcontent2 ${S}/helpcontent2
ln -s ${S}/src/libreoffice-translations-${PKGVERSION}/translations ${S}/translations

if [ -d ${TMPDIR}/Libreoffice ]; then
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are files from TMPDIR moved into the package?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you build it again with a different user ( build <=> schrader ), you get a error in the installation part

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, libreoffice write some logfiles into the TMPDIR.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and I had the only 7.6. not with 7.5

start_cmd rm -rf ${TMPDIR}/Libreoffice || exit 1
fi

}

mee_build() {
Expand Down