summaryrefslogtreecommitdiff
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-21 22:20:04 +0200
commit18f4fc547a8c055afdaec4aad69c9fea387696c3 (patch)
tree49512110eae7989a489788c1d681386ef59277ca
parenta42f5faac7c6d4590e632cf40e3ba9eb618e6f56 (diff)
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>
-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 759af2d03bd5..d81256d3afc0 100644
--- a/download.lst
+++ b/download.lst
@@ -206,8 +206,8 @@ export PDFIUM_SHA256SUM := ecb9c2a0d777196949994946e3f24ed251ae5d3db8a9fa1e2827e
export PDFIUM_TARBALL := pdfium-5298.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 LIBTIFF_SHA256SUM := 49307b510048ccc7bc40f2cba6e8439182fe6e654057c1a1683139bf2ecb1dc1
export LIBTIFF_TARBALL := tiff-4.4.0.tar.xz
export POPPLER_SHA256SUM := d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e
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 && \