distro-configs/LibreOfficeFlatpak.conf | 1 - solenv/flatpak-manifest.in | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit 6a4015b636f99adb58ad91e0caa3add0ef73a936 Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Feb 28 14:55:37 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Mar 1 16:26:32 2023 +0000 Re-enable Skia in Flatpak builds ...as requested at <https://github.com/flathub/org.libreoffice.LibreOffice/issues/213> "Can Skia be reenabled in the Flatpak build?" and implemented on Flathub for now with <https://github.com/flathub/org.libreoffice.LibreOffice/commit/372d036e9113b6080780669ad44fc11a172356ed> "Re-enable Skia". (This partially reverts 9d88f11de57bcbeb29fa6f1299d5d0867c1a75a4 "Flatpak: Upgrade to 21.08 runtime, disable Skia".) Change-Id: I50039d431fd3e6ba4c0d859d71e42e744433806b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148054 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index ae525e61cdb8..636d723b4c75 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -1,5 +1,4 @@ --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 1afc41a64060..85553af0430a 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -606,6 +606,13 @@ "dest": "external/tarballs", "dest-filename": "@LIBATOMIC_OPS_TARBALL@" }, + { + "url": "https://dev-www.libreoffice.org/src/@SKIA_TARBALL@";, + "sha256": "@SKIA_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@SKIA_TARBALL@" + }, { "url": "https://dev-www.libreoffice.org/src/@DRAGONBOX_TARBALL@";, "sha256": "@DRAGONBOX_SHA256SUM@",
