From 66512d949c46d0270e3fb334dbcbdcc726758d38 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 17 May 2017 11:36:18 +0200 Subject: [PATCH 1/4] libreoffice: Update version from 5.3.0.3 to 5.3.3.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The book *Linux From Scratch* doesn’t contain the latest version of LibreOffice [1]. So update to version 5.3.3.2 [2][3][4]. > Berlin, May 11, 2017 – The Document Foundation (TDF) announces > LibreOffice 5.3.3, focused on bleeding edge features, and as such > targeted at technology enthusiasts, early adopters, and power users. > LibreOffice 5.3.3 integrates over 70 patches, with an update of the > Sifr monochrome icon set and several fixes for interoperability with > Microsoft Office documents. [1] http://www.linuxfromscratch.org/blfs/view/svn/xsoft/libreoffice.html [2] https://blog.documentfoundation.org/blog/2017/05/11/libreoffice-5-3-3/ [3] https://wiki.documentfoundation.org/Releases/5.3.3/RC1 [4] https://wiki.documentfoundation.org/Releases/5.3.3/RC2 --- libreoffice.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index 82d12776e..dafea45ce 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libreoffice-5.3.0.3-0 +# BEE_VERSION libreoffice-5.3.3.2-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 4c78a0c1324cbec90a15849652cbe76d6cb656d9 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 17 May 2017 11:47:32 +0200 Subject: [PATCH 2/4] libreoffice: Add command `openoffice` for backward compatibilty See *[libreoffice] openoffice symlink not found* in the helpdesk inbox. --- libreoffice.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreoffice.be0 b/libreoffice.be0 index dafea45ce..332166a0c 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -100,6 +100,8 @@ mee_build() { mee_install() { start_cmd make ${BEE_MAKEFLAGS} distro-pack-install DESTDIR=${D} + # message *[libreoffice] openoffice symlink not found* in helpdesk + start_cmd ln -sv ${D}${BINDIR}/libreoffice ${D}${BINDIR}/openoffice } ## by default this may be 'make install DESTDIR="${D}"' From 9400b6ff8ee7259ab6ccedf42c8664b9a609d951 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 17 May 2017 12:13:34 +0200 Subject: [PATCH 3/4] libreoffice: Remove outdated workaround The issue [1] is fixed upstream. [1] https://bugs.documentfoundation.org/show_bug.cgi?id=100453 --- libreoffice.be0 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index 332166a0c..7f09baedc 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -92,11 +92,9 @@ mee_configure() { sed -i 's/bootstrap: check-if-root compilerplugins/all: compilerplugins/g' ${B}/Makefile } -mee_build() { - # https://bugs.documentfoundation.org/show_bug.cgi?id=100453 - chmod 755 ${S}/bin/unpack-sources - bee_build -} +#mee_build() { +# bee_build +#} mee_install() { start_cmd make ${BEE_MAKEFLAGS} distro-pack-install DESTDIR=${D} From 516a0ce1224c60d062e7d4fa9f81e595cf5dccac Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 17 May 2017 12:14:57 +0200 Subject: [PATCH 4/4] libreoffice: Remove unneeded debug code --- libreoffice.be0 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index 7f09baedc..240c2cfdb 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -49,11 +49,9 @@ SRCURL[0]="https://download.documentfoundation.org/libreoffice/src/${PKGVERSION[ # bee_extract "${@}" #} -mee_patch() { - bee_patch "${@}" - sed -e "/gzip -f/s/echo/set -x; echo/" \ - -i bin/distro-install-desktop-integration -} +#mee_patch() { +# bee_patch "${@}" +#} mee_configure() { bee_configure \