diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-02-28 14:55:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-03-01 16:26:32 +0000 |
| commit | 6a4015b636f99adb58ad91e0caa3add0ef73a936 (patch) | |
| tree | 7ec49e79627212710cb923d1fce2b33216fc67e6 | |
| parent | bccd3f299f3e29578d1a0f041aeeba3bf28f778f (diff) | |
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 <sbergman@redhat.com>
| -rw-r--r-- | distro-configs/LibreOfficeFlatpak.conf | 1 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 7 |
2 files changed, 7 insertions, 1 deletions
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 @@ -607,6 +607,13 @@ "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@", "type": "file", |