diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-09-03 11:14:31 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-09-07 11:53:55 +0200 |
| commit | a8d560c4a89614a6bd99c9af3e76927d4405dbf7 (patch) | |
| tree | efa883f9146a99d9ec0886ee7fa5d738d7dd3d9a | |
| parent | Revert "tdf#142214: autocomplete: do not search across empty blocks" (diff) | |
| download | core-a8d560c4a89614a6bd99c9af3e76927d4405dbf7.tar.gz core-a8d560c4a89614a6bd99c9af3e76927d4405dbf7.zip | |
Flatpak: Upgrade to 21.08 runtime, disable Skia
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_::<unnamed>’ 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_::<unnamed>’ 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.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121705
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 9d88f11de57bcbeb29fa6f1299d5d0867c1a75a4)
Conflicts:
solenv/flatpak-manifest.in
Change-Id: Ifdc9c23676280caf19db0e9f09df15aaa21eef5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121712
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 92c55f7840267fdbe775897c913c5fc369286368)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121757
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | distro-configs/LibreOfficeFlatpak.conf | 1 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index bef37df46c1b..b864ea3798b7 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -1,4 +1,5 @@ --disable-odk +--disable-skia --enable-release-build --with-ant-home=/run/build/libreoffice/ant --with-extra-buildid=Flatpak diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 4167735133f7..9cd302b2b3f1 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" @@ -656,13 +656,6 @@ "dest-filename": "libatomic_ops-7.6.8.tar.gz" }, { - "url": "https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz", - "sha256": "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d", - "type": "file", - "dest": "external/tarballs", - "dest-filename": "skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz" - }, - { "url": "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz", "sha256": "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4", "type": "file", |