diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-15 16:00:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-15 17:29:00 +0100 |
| commit | 2799b94bf92c0a928b1076e9320ba5c998b6aa99 (patch) | |
| tree | b63c1a8fba74c80202884bf8ff9187cfba763f89 /distro-configs | |
| parent | c84a1928ea76cf175711942db9ca7bb2f0ec6f0b (diff) | |
Flatpak: Work around patched libpng in org.freedesktop.Sdk
see
<https://github.com/flathub/org.libreoffice.LibreOffice/pull/268/commits/7c79189f674c7cc88f0ab2790d8d198f4a855182>
"Work around patched libpng in org.freedesktop.Sdk":
...which carries
<https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/commit/873b28450476c434a3f6fa86cb1874b11968a479>
"elements/base/libpng.bst: Add support for animated PNGs", thus handles "acTL"
chunks by itself, thus doesn't call the LibreOffice handle_unknown_chunk
function (in vcl/source/filter/png/PngImageReader.cxx) for such chunks, thus
never sets APNGInfo::mbIsApng to true, so causes CppunitTest_vcl_png_test to
fail with
> PngFilterTest.cxx:382:Assertion
> Test name: PngFilterTest::testApng
> assertion failed
> - Expression: aGraphic.IsAnimated()
(<https://buildbot.flathub.org/#/builders/6/builds/92958>) since
<https://git.libreoffice.org/core/+/bf944e33569e4a1d6236a54671b7320cdc6ffaf6%5E%21>
"tdf#104877 Add basic APNG format support".
The patch appears to originate from
<https://sourceforge.net/projects/libpng-apng/>, and it might be possible to
adapt the LibreOffice code to also work with such a patched libpng (whose png.h
defines PNG_APGN_SUPPORTED). However, for now just use LibreOffice's own
external/libpng instead of the patched one.
Change-Id: Ib67056d11dfa6456920a18216a3b2bbec45f3662
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162112
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/LibreOfficeFlatpak.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index 3850269ace0f..911184c337eb 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -41,6 +41,7 @@ --without-system-libnumbertext --without-system-libodfgen --without-system-libpagemaker +--without-system-libpng --without-system-libqxp --without-system-librevenge --without-system-libstaroffice |