From 9b61c0974324eae8e97f1ea1495c00ae31da137619942c21629d75de1cd86259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 24 Jun 2020 11:33:02 +0000 Subject: [PATCH] - Enable skia build; building with gcc atm OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=899 --- libreoffice.changes | 5 +++++ libreoffice.spec | 5 +++-- skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz diff --git a/libreoffice.changes b/libreoffice.changes index a8fa14b..94aa6fb 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 24 11:32:28 UTC 2020 - Tomáš Chvátal + +- Enable skia build; building with gcc atm + ------------------------------------------------------------------- Fri Jun 19 12:38:18 UTC 2020 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 68220b7..a8bbcb3 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -93,6 +93,8 @@ Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SN Source2008: %{external_url}/pdfium-4137.tar.bz2 # Single C file with patches from LO Source2009: %{external_url}/dtoa-20180411.tgz +# Skia is part of chromium and bundled everywhere as by google only way is monorepo way +Source2010: %{external_url}/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build Patch1: scp2-user-config-suse.diff @@ -1116,8 +1118,7 @@ export NOCONFIGURE=yes --enable-symbols \ --with-gdrive-client-secret="${google_default_client_secret}" \ --with-gdrive-client-id="${google_default_client_id}" \ - --disable-skia -# no reason to build skia at the moment for us with gtk ui + --enable-skia # no coinormp packages for coinmp # just call make here as we added the jobs in configure diff --git a/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz b/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz new file mode 100644 index 0000000..825d4ec --- /dev/null +++ b/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0 +size 8335144