Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 792099 - app-office/libreoffice-9999 - skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz needed and freetype-2.11 patch
Summary: app-office/libreoffice-9999 - skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo Office Team
URL:
Whiteboard:
Keywords: PATCH, PullRequest
Depends on:
Blocks:
 
Reported: 2021-05-25 23:00 UTC by jospezial
Modified: 2021-09-07 18:28 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
skia-m90 freetype-2.11 patch (libreoffice-externalskia_m90-freetype-2.11.patch,2.78 KB, patch)
2021-08-15 12:14 UTC, jospezial
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description jospezial 2021-05-25 23:00:47 UTC
S=/var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999 && I=$S/instdir && W=$S/workdir &&  touch $W/Headers/StaticLibrary/libfindsofficepath.a
mkdir -p /var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999/workdir/CustomTarget/tools/string/
S=/var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999 && I=$S/instdir && W=$S/workdir &&  touch $W/Headers/Library/libclewlo.so
touch /var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999/workdir/UnpackedTarball/skia.prepare
make[1]: *** No rule to make target '/var/tmp/portage/app-office/libreoffice-9999/distdir/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz', needed by '/var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999/workdir/UnpackedTarget/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz'.  Stop.
make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory '/var/tmp/portage/app-office/libreoffice-9999/work/libreoffice-9999'
make: *** [Makefile:285: build] Error 2
 * ERROR: app-office/libreoffice-9999::overlay_jl failed (compile phase):
 *   (no error message)
 * 
 * Call stack:
 *     ebuild.sh, line 127:  Called src_compile
 *   environment, line 6093:  Called die
 * The specific snippet of code:
 *       make ${target} || die

https://github.com/LibreOffice/core/search?q=skia&type=commits
https://github.com/LibreOffice/core/commit/302fb4c1ec4a24112f9a2028be4d424891f10b4c
Comment 1 jospezial 2021-08-15 12:14:39 UTC
Created attachment 733102 [details, diff]
skia-m90 freetype-2.11 patch

skia-m90 in app-office/libreoffice-9999 fails to compile if freetype-2.11 is installed.
Maybe the other ebuilds in app-office/libreoffice are hit by this. Did not find reports and did not test them now.
This may become obsolete when libreoffice switches to a recent skia-m93.
See also Bug 803467

I created a patch inspired by
https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-freetype-2.11.patch

This patch creates a patch in
work/libreoffice-9999/external/skia/
and modifies
work/libreoffice-9999/external/skia/UnpackedTarball_skia.mk
to apply this patch.
This way is needed because because the skia tar is extracted in the src_compile make phase.
The work/skia/ folder where src_prepare unpacks skia is not used.
Comment 2 jospezial 2021-08-26 23:13:10 UTC
https://github.com/LibreOffice/core/commit/a0edcc68f94915a78fcc08e70d2cdd752abd9ebb#diff-8bf867f8ad38a0945e29d4aed2b7fb69248110352b28c5ddc60400d28768cbd5
"update Skia to chrome/m94

Updating to m91 or newer required handling the problem with Vulkan
crashing, but that's been finally fixed by the previous commit.

This Skia version also requires at least freetype-2.8.1, so disable
Skia if that's not available (LO's minimum is lower). Additionally
patch out Skia's use of TT_SUPPORT_COLRV1, which seems to be
an unstable freetype API from the git version and it doesn't even
compile with the latest stable 2.9.11 release"

I have to check if it works without my skia-freetype patch.
Comment 3 jospezial 2021-08-27 05:37:05 UTC
libreoffice with skia-m94 does not need the my patch. Compiled with media-libs/freetype-2.11.0-r1.
To compile against an older version of freetype may need a similar patch.
Comment 4 Larry the Git Cow gentoo-dev 2021-09-07 18:28:51 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a77107795dec3091f09a1a064fed25eac68ebb6

commit 8a77107795dec3091f09a1a064fed25eac68ebb6
Author:     Nils Freydank <holgersson@posteo.de>
AuthorDate: 2021-09-07 07:21:37 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2021-09-07 18:28:29 +0000

    app-office/libreoffice: Update live ebuild
    
    Upstream uses media-libs/zxing-cpp now instead of qrcodegen.
    
    This bump reflects this change plus some other bumps like skia and some
    housekeeping. Thanks alot for the hints via bug reports by a fellow
    user!
    
    Thanks-To: jospezial
    Closes: https://bugs.gentoo.org/792093
    Closes: https://bugs.gentoo.org/792096
    Closes: https://bugs.gentoo.org/792099
    Package-Manager: Portage-3.0.22, Repoman-3.0.3
    Signed-off-by: Nils Freydank <holgersson@posteo.de>
    Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

 app-office/libreoffice/Manifest                             |  1 +
 .../libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch   | 13 +++++++++++++
 app-office/libreoffice/libreoffice-9999.ebuild              | 11 ++++-------
 3 files changed, 18 insertions(+), 7 deletions(-)