mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enable Skia in Flatpak builds

Browse Source 
...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
<372d036e91>
"Re-enable Skia".  (This partially reverts
9d88f11de5 "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>
This commit is contained in:
Stephan Bergmann
2023-02-28 14:55:37 +01:00
parent bccd3f299f
commit 6a4015b636
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distro-configs/LibreOfficeFlatpak.conf
View File

@@ -1,5 +1,4 @@
--disable-odk --disable-odk
--disable-skia
--enable-release-build --enable-release-build
--with-ant-home=/run/build/libreoffice/ant --with-ant-home=/run/build/libreoffice/ant
--with-extra-buildid=Flatpak --with-extra-buildid=Flatpak

7
solenv/flatpak-manifest.in
View File

@@ -606,6 +606,13 @@
"dest": "external/tarballs", "dest": "external/tarballs",
"dest-filename": "@LIBATOMIC_OPS_TARBALL@" "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@", "url": "https://dev-www.libreoffice.org/src/@DRAGONBOX_TARBALL@",
"sha256": "@DRAGONBOX_SHA256SUM@", "sha256": "@DRAGONBOX_SHA256SUM@",