summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaichi Haradaguchi <20001722@ymail.ne.jp>2022-09-21 17:17:35 +0900
committerCaolán McNamara <caolanm@redhat.com>2022-09-23 12:24:01 +0200
commit50a79cc175852f1058f454b0662dc79ed3a818d0 (patch)
tree160d057cd75ee5a4017c7c13c7e10190129d0d82
parentFix string length assertion and handle parentheses in multi-line formula (diff)
downloadcore-50a79cc175852f1058f454b0662dc79ed3a818d0.tar.gz
core-50a79cc175852f1058f454b0662dc79ed3a818d0.zip
libpng: update to release 1.6.38
Change-Id: Ife594699cc8736ffdfc8f68e462d11416d7930e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140311 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 18f4fc547a8c055afdaec4aad69c9fea387696c3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140377 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140476
-rw-r--r--download.lst4
-rw-r--r--external/libpng/libpng-osx.patch.12
2 files changed, 3 insertions, 3 deletions
diff --git a/download.lst b/download.lst
index eb7a3880ab83..5a2e57a10af8 100644
--- a/download.lst
+++ b/download.lst
@@ -212,8 +212,8 @@ export PDFIUM_SHA256SUM := ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789
export PDFIUM_TARBALL := pdfium-4699.tar.bz2
export PIXMAN_SHA256SUM := 6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
export PIXMAN_TARBALL := pixman-0.40.0.tar.gz
-export LIBPNG_SHA256SUM := 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
-export LIBPNG_TARBALL := libpng-1.6.37.tar.xz
+export LIBPNG_SHA256SUM := b3683e8b8111ebf6f1ac004ebb6b0c975cd310ec469d98364388e9cedbfa68be
+export LIBPNG_TARBALL := libpng-1.6.38.tar.xz
export POPPLER_SHA256SUM := d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e
export POPPLER_TARBALL := poppler-22.09.0.tar.xz
export POPPLER_DATA_SHA256SUM := 2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c
diff --git a/external/libpng/libpng-osx.patch.1 b/external/libpng/libpng-osx.patch.1
index 0e9d7336a762..387b3a8cc613 100644
--- a/external/libpng/libpng-osx.patch.1
+++ b/external/libpng/libpng-osx.patch.1
@@ -4,7 +4,7 @@ Avoid warning: 'inflateValidate' is only available on macOS 10.13 or newer [-Wun
--- a/pngrutil.c
+++ b/pngrutil.c
-@@ -419,7 +419,8 @@
+@@ -422,7 +422,8 @@
}
#if ZLIB_VERNUM >= 0x1290 && \