From 9d88f11de57bcbeb29fa6f1299d5d0867c1a75a4 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 3 Sep 2021 11:14:31 +0200 Subject: Flatpak: Upgrade to 21.08 runtime, disable Skia MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For whatever reason, building Skia against the 21.08 SDK would fail with > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp: In function ‘void {anonymous}::colrv1_draw_paint(SkCanvas*, const FT_Color*, FT_Face, FT_COLR_Paint)’: > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:668:14: error: ‘FT_COLR_PAINTFORMAT_TRANSFORMED’ was not declared in this scope; did you mean ‘FT_COLR_PAINTFORMAT_TRANSFORM’? > 668 | case FT_COLR_PAINTFORMAT_TRANSFORMED: { > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | FT_COLR_PAINTFORMAT_TRANSFORM > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:669:60: error: ‘union FT_COLR_Paint_::’ has no member named ‘transformed’; did you mean ‘transform’? > 669 | SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine); > | ^~~~~~~~~~~ > | transform > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp: In function ‘bool {anonymous}::colrv1_traverse_paint(SkCanvas*, const FT_Color*, FT_Face, FT_OpaquePaint)’: > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:763:14: error: ‘FT_COLR_PAINTFORMAT_TRANSFORMED’ was not declared in this scope; did you mean ‘FT_COLR_PAINTFORMAT_TRANSFORM’? > 763 | case FT_COLR_PAINTFORMAT_TRANSFORMED: > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > | FT_COLR_PAINTFORMAT_TRANSFORM > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:768:74: error: ‘union FT_COLR_Paint_::’ has no member named ‘transformed’; did you mean ‘transform’? > 768 | colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint); > | ^~~~~~~~~~~ > | transform > make[1]: *** [/run/build/libreoffice/solenv/gbuild/LinkTarget.mk:347: /run/build/libreoffice/workdir/GenCxxObject/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.o] Error 1 But including Skia in the Linux flatpak isn't too useful anyway (and just happened to be on by default): First, it is disabled by default on Linux, cf. UseSkia in officecfg/registry/data/org/openoffice/Office/Common.xcu. And second, on Linux it can only be enabled for SAL_USE_VCLPLUGIN=gen, but not for the gtk3 plugin that the flatpak normally uses, cf. OfaViewTabPage::UpdateSkiaStatus in cui/source/options/optgdlg.cxx. Change-Id: Ifdc9c23676280caf19db0e9f09df15aaa21eef5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121705 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- solenv/flatpak-manifest.in | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'solenv') diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 79ad81783359..2312670edf87 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -1,7 +1,7 @@ { "id": "org.libreoffice.LibreOffice", "runtime": "org.freedesktop.Platform", - "runtime-version": "20.08", + "runtime-version": "21.08", "sdk": "org.freedesktop.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.openjdk11" @@ -655,13 +655,6 @@ "dest": "external/tarballs", "dest-filename": "libatomic_ops-7.6.8.tar.gz" }, - { - "url": "https://dev-www.libreoffice.org/src/skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz", - "sha256": "f69f9164ee982a8254722e1100aa7d31f78a5cd5e084418a3e202b55104fc3e2", - "type": "file", - "dest": "external/tarballs", - "dest-filename": "skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz" - }, { "url": "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz", "sha256": "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4", -- cgit